Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12546] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-05-23 19:49:55
|
Revision: 12546
http://sourceforge.net/p/xoops/svn/12546
Author: txmodxoops
Date: 2014-05-23 19:49:52 +0000 (Fri, 23 May 2014)
Log Message:
-----------
Added missing files/language_help.php
Updated
Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/formelements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/repository.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_help.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -73,6 +73,7 @@
}
$GLOBALS['xoopsTpl']->append('builds', $builds);
}
+ unset($builds);
// Directory to saved all files
$GLOBALS['xoopsTpl']->assign('building_directory', sprintf(_AM_TDMCREATE_BUILDING_DIRECTORY, str_replace(' ', '', strtolower($mod_name))));
// Copy this module in root modules
@@ -86,13 +87,13 @@
$template_main = 'building.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
// Redirect if there aren't modules
- $nb_modules = $modulesHandler->getCount();
+ $nb_modules = $tdmcreate->getHandler('repository')->getCount();
if ( $nb_modules == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
}
unset($nb_modules);
// Redirect if there aren't tables
- $nb_tables = $tablesHandler->getCount();
+ $nb_tables = $tdmcreate->getHandler('tables')->getCount();
if ($nb_tables == 0) {
redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -62,13 +62,13 @@
$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
// Redirect if there aren't modules
- $nb_modules = $modulesHandler->getCount();
+ $nb_modules = $tdmcreate->getHandler('repository')->getCount();
if ( $nb_modules == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
}
unset($nb_modules);
// Redirect if there aren't tables
- $nb_tables = $tablesHandler->getCount();
+ $nb_tables = $tdmcreate->getHandler('tables')->getCount();
if ($nb_tables == 0) {
redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
}
@@ -79,8 +79,8 @@
$criteria->add(new Criteria('table_id', $field_tid));
$criteria->setSort('table_id ASC, table_name');
$criteria->setOrder('ASC');
- $nb_tables = $tablesHandler->getCount($criteria);
- $tables_arr = $tablesHandler->getAll($criteria);
+ $nb_tables = $tdmcreate->getHandler('tables')->getCount($criteria);
+ $tables_arr = $tdmcreate->getHandler('tables')->getAll($criteria);
unset($criteria);
if ($nb_tables > 0)
{
@@ -102,8 +102,8 @@
$criteria->add(new Criteria('field_tid', $t));
$criteria->setSort('field_id ASC, field_name');
$criteria->setOrder('ASC');
- $nb_fields = $fieldsHandler->getCount($criteria);
- $fields_arr = $fieldsHandler->getAll($criteria);
+ $nb_fields = $tdmcreate->getHandler('fields')->getCount($criteria);
+ $fields_arr = $tdmcreate->getHandler('fields')->getAll($criteria);
unset($criteria);
// Display fields list
$fields = array();
@@ -152,8 +152,8 @@
$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
- $obj =& $fieldsHandler->create();
- $form = $obj->getForm($field_mid, $field_tid, $field_numb, $field_name);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->create();
+ $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb, $field_name);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
@@ -165,59 +165,59 @@
$fieldelement_fid = TDMCreateRequest::getInt('fieldelement_fid');
//
if (isset($field_id)) {
- $obj =& $fieldsHandler->get($field_id);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
if (isset($fieldelement_fid)) {
- $objfieldelement =& $fieldelementsHandler->get($fieldelement_fid);
+ $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->get($fieldelement_fid);
}
} else {
- $obj =& $fieldsHandler->create();
- $objfieldelement =& $fieldelementsHandler->create();
+ $fieldsObj =& $tdmcreate->getHandler('fields')->create();
+ $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
}
//
if ($field_numb > 0) {
for( $i = 1; $i <= $field_numb; $i++ ) {
//
- $obj->setVar( 'field_mid', $field_mid );
- $obj->setVar( 'field_tid', $field_tid );
- $obj->setVar( 'field_numb', (isset($_POST['field_numb'][$i]) ? $_POST['field_numb'][$i] : 0) );
- $obj->setVar( 'field_name', (isset($_POST['field_name'][$i]) ? $_POST['field_name'][$i] : '') );
- $obj->setVar( 'field_type', (isset($_POST['field_type'][$i]) ? $_POST['field_type'][$i] : '') );
- $obj->setVar( 'field_value', (isset($_POST['field_value'][$i]) ? $_POST['field_value'][$i] : '') );
- $obj->setVar( 'field_attribute', (isset($_POST['field_attribute'][$i]) ? $_POST['field_attribute'][$i] : '') );
- $obj->setVar( 'field_null', (isset($_POST['field_null'][$i]) ? $_POST['field_null'][$i] : '') );
- $obj->setVar( 'field_default', (isset($_POST['field_default'][$i]) ? $_POST['field_default'][$i] : '') );
- $obj->setVar( 'field_key', (isset($_POST['field_key'][$i]) ? $_POST['field_key'][$i] : '') );
- $obj->setVar( 'field_element', (isset($_POST['field_element'][$i]) ? $_POST['field_element'][$i] : '') );
- $obj->setVar( 'field_parent', (($i == isset($_REQUEST['field_parent'])) ? '1' : '0') );
- $obj->setVar( 'field_inlist', ((isset($_REQUEST['field_inlist'][$i]) == 1) ? '1' : '0') );
- $obj->setVar( 'field_inform', ((isset($_REQUEST['field_inform'][$i]) == 1) ? '1' : '0') );
- $obj->setVar( 'field_admin', ((isset($_REQUEST['field_admin'][$i]) == 1) ? '1' : '0') );
- $obj->setVar( 'field_user', ((isset($_REQUEST['field_user'][$i]) == 1) ? '1' : '0') );
- $obj->setVar( 'field_block', ((isset($_REQUEST['field_block'][$i]) == 1) ? '1' : '0') );
- $obj->setVar( 'field_main', (($i == isset($_REQUEST['field_main'])) ? '1' : '0') );
- $obj->setVar( 'field_search', ((isset($_REQUEST['field_search'][$i]) == 1) ? '1' : '0') );
- $obj->setVar( 'field_required', ((isset($_REQUEST['field_required'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_mid', $field_mid );
+ $fieldsObj->setVar( 'field_tid', $field_tid );
+ $fieldsObj->setVar( 'field_numb', $field_numb );
+ $fieldsObj->setVar( 'field_name', (isset($_POST['field_name'][$i]) ? $_POST['field_name'][$i] : '') );
+ $fieldsObj->setVar( 'field_type', (isset($_POST['field_type'][$i]) ? $_POST['field_type'][$i] : '') );
+ $fieldsObj->setVar( 'field_value', (isset($_POST['field_value'][$i]) ? $_POST['field_value'][$i] : '') );
+ $fieldsObj->setVar( 'field_attribute', (isset($_POST['field_attribute'][$i]) ? $_POST['field_attribute'][$i] : '') );
+ $fieldsObj->setVar( 'field_null', (isset($_POST['field_null'][$i]) ? $_POST['field_null'][$i] : '') );
+ $fieldsObj->setVar( 'field_default', (isset($_POST['field_default'][$i]) ? $_POST['field_default'][$i] : '') );
+ $fieldsObj->setVar( 'field_key', (isset($_POST['field_key'][$i]) ? $_POST['field_key'][$i] : '') );
+ $fieldsObj->setVar( 'field_element', (isset($_POST['field_element'][$i]) ? $_POST['field_element'][$i] : '') );
+ $fieldsObj->setVar( 'field_parent', (($i == isset($_REQUEST['field_parent'])) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_inlist', ((isset($_REQUEST['field_inlist'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_inform', ((isset($_REQUEST['field_inform'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_admin', ((isset($_REQUEST['field_admin'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_user', ((isset($_REQUEST['field_user'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_block', ((isset($_REQUEST['field_block'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_main', (($i == isset($_REQUEST['field_main'])) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_search', ((isset($_REQUEST['field_search'][$i]) == 1) ? '1' : '0') );
+ $fieldsObj->setVar( 'field_required', ((isset($_REQUEST['field_required'][$i]) == 1) ? '1' : '0') );
// Insert Data
- $fieldsHandler->insert($obj);
+ $tdmcreate->getHandler('fields')->insert($fieldsObj);
}
}
- $objfieldelement->setVar( 'fieldelement_mid', $field_mid );
- $objfieldelement->setVar( 'fieldelement_tid', $field_tid );
- $objfieldelement->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
- $objfieldelement->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
+ $fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
+ $fieldelementObj->setVar( 'fieldelement_tid', $field_tid );
+ $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
+ $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
// Insert new table name
- if (!$fieldelementsHandler->insert($objfieldelement) ) {
- $GLOBALS['xoopsTpl']->assign('error', $objfieldelement->getHtmlErrors() . ' Field element');
+ if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) {
+ $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
}
//
- if ($obj->isNew()) {
+ if ($fieldsObj->isNew()) {
redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $table_name));
} else {
redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $table_name));
}
//
- $GLOBALS['xoopsTpl']->assign('error', $obj->getHtmlErrors());
- $form = $obj->getForm($field_mid, $field_tid, $field_numb);
+ $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
+ $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
@@ -230,8 +230,8 @@
$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
- $obj = $fieldsHandler->get( $field_id );
- $form = $obj->getForm($field_mid, $field_tid, $field_numb);
+ $fieldsObj = $tdmcreate->getHandler('fields')->get( $field_id );
+ $form = $fieldsObj->getForm($field_mid, $field_tid, $field_numb);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Get the list of fields
@@ -240,8 +240,8 @@
$criteria->add(new Criteria('field_tid', $field_tid));
$criteria->setSort('field_id ASC, field_name');
$criteria->setOrder('ASC');
- $nb_fields = $fieldsHandler->getCount($criteria);
- $fields_arr = $fieldsHandler->getAll($criteria);
+ $nb_fields = $tdmcreate->getHandler('fields')->getCount($criteria);
+ $fields_arr = $tdmcreate->getHandler('fields')->getAll($criteria);
unset($criteria);
if ( $nb_fields > 0 )
{
@@ -259,9 +259,9 @@
case 'drag':
$side = TDMCreate_CleanVars( $_POST, 'field_id', 0, 'int' );
if ( $field_id > 0 ) {
- $fieldsObj = $fieldsHandler->get( $field_id );
+ $fieldsObj = $tdmcreate->getHandler('fields')->get( $field_id );
$fieldsObj->setVar('field_id', $side);
- if (!$fieldsHandler->insert( $fieldsObj )) {
+ if (!$tdmcreate->getHandler('fields')->insert( $fieldsObj )) {
redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_SIDE_ERROR);
}
}
@@ -272,9 +272,9 @@
$i = 0;
foreach($_POST['field_id'] as $order) {
if( $order > 0 ) {
- $fieldsObj = $fieldsHandler->get( $order );
+ $fieldsObj = $tdmcreate->getHandler('fields')->get( $order );
$fieldsObj->setVar('field_id', $i);
- if (!$fieldsHandler->insert( $fieldsObj )) {
+ if (!$tdmcreate->getHandler('fields')->insert( $fieldsObj )) {
redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR);
}
$i++;
@@ -290,50 +290,50 @@
if (isset($_GET['field_parent'])) {
$fld_parent = intval($_GET['field_parent']);
$field_parent = ($fld_parent == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_parent', $field_parent);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_parent', $field_parent);
} elseif (isset($_GET['field_inlist'])) {
$fld_inlist = intval($_GET['field_inlist']);
$field_inlist = ($fld_inlist == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_inlist', $field_inlist);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_inlist', $field_inlist);
} elseif (isset($_GET['field_inform'])) {
$fld_inform = intval($_GET['field_inform']);
$field_inform = ($fld_inform == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_inform', $field_inform);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_inform', $field_inform);
} elseif (isset($_GET['field_admin'])) {
$fld_admin = intval($_GET['field_admin']);
$field_admin = ($fld_admin == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_admin', $field_admin);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_admin', $field_admin);
} elseif (isset($_GET['field_user'])) {
$fld_user = intval($_GET['field_user']);
$field_user = ($fld_user == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_user', $field_user);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_user', $field_user);
} elseif (isset($_GET['field_block'])) {
$fld_block = intval($_GET['field_block']);
$field_block = ($fld_block == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_block', $field_block);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_block', $field_block);
} elseif (isset($_GET['field_main'])) {
$fld_main = intval($_GET['field_main']);
$field_main = ($fld_main == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_main', $field_main);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_main', $field_main);
} elseif (isset($_GET['field_search'])) {
$fld_search = intval($_GET['field_search']);
$field_search = ($fld_search == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_search', $field_search);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_search', $field_search);
} elseif (isset($_GET['field_required'])) {
$fld_required = intval($_GET['field_required']);
$field_required = ($fld_required == 1) ? 0 : 1;
- $obj =& $fieldsHandler->get($field_id);
- $obj->setVar('field_required', $field_required);
+ $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+ $fieldsObj->setVar('field_required', $field_required);
}
- if ($fieldsHandler->insert($obj, true)) {
+ if ($tdmcreate->getHandler('fields')->insert($fieldsObj, true)) {
redirect_header('fields.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
} else {
redirect_header('fields.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/header.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -21,7 +21,6 @@
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
include_once dirname(dirname(__FILE__)) . '/include/common.php';
include_once dirname(dirname(__FILE__)) . '/include/functions.php';
-//include_once 'includes.php';
//
$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
// Link System Icons
@@ -33,16 +32,7 @@
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
// TDMCreate Instance
$tdmcreate = TDMCreate::getInstance();
-// Get class handler
-$modulesHandler =& $tdmcreate->getHandler('repository');
-$tablesHandler =& $tdmcreate->getHandler('tables');
-$fieldsHandler =& $tdmcreate->getHandler('fields');
-$fieldtypeHandler =& $tdmcreate->getHandler('fieldtype');
-$fieldattributesHandler =& $tdmcreate->getHandler('fieldattributes');
-$fieldnullHandler =& $tdmcreate->getHandler('fieldnull');
-$fieldkeyHandler =& $tdmcreate->getHandler('fieldkey');
-$fieldelementsHandler =& $tdmcreate->getHandler('fieldelements');
-//
+// MyTextSanitizer
$myts =& MyTextSanitizer::getInstance();
if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
include_once(XOOPS_ROOT_PATH."/class/template.php");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/index.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -20,9 +20,9 @@
*/
include 'header.php';
$criteria = new CriteriaCompo();
-$count_modules = $modulesHandler->getCount($criteria);
-$count_tables = $tablesHandler->getCount($criteria);
-$count_fields = $fieldsHandler->getCount($criteria);
+$count_modules = $tdmcreate->getHandler('repository')->getCount($criteria);
+$count_tables = $tdmcreate->getHandler('tables')->getCount($criteria);
+$count_fields = $tdmcreate->getHandler('fields')->getCount($criteria);
unset($criteria);
$template_main = 'index.tpl';
$adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/fields.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -44,7 +44,7 @@
public function __construct()
{
$this->tdmcreate = TDMCreate::getInstance();
- $this->table = TDMCreateTables::getInstance();
+ //$this->table = TDMCreateTables::getInstance();
$this->initVar('field_id', XOBJ_DTYPE_INT);
$this->initVar('field_mid', XOBJ_DTYPE_INT);
$this->initVar('field_tid', XOBJ_DTYPE_INT);
@@ -65,6 +65,9 @@
$this->initVar('field_main', XOBJ_DTYPE_INT);
$this->initVar('field_search', XOBJ_DTYPE_INT);
$this->initVar('field_required', XOBJ_DTYPE_INT);
+ //
+ $this->initVar('mod_id', XOBJ_DTYPE_INT);
+ $this->initVar('table_id', XOBJ_DTYPE_INT);
}
/**
@@ -293,7 +296,7 @@
public function __construct(&$db)
{
$this->tdmcreate = TDMCreate::getInstance();
- $this->table = TDMCreateTables::getInstance();
+ //$this->table = TDMCreateTables::getInstance();
parent::__construct($db, 'mod_tdmcreate_fields', 'tdmcreatefields', 'field_id', 'field_tid');
}
@@ -369,313 +372,28 @@
return false;
}
return true;
- }
+ }
/*
- * @public function getFieldModuleId
- * @param integer $field_id
- */
- public function getFieldModuleId($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- return $obj[0]['field_mid'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldTableId
- * @param integer $field_id
- */
- public function getFieldTableId($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- return $obj[0]['field_tid'];
- } else {
- return false;
- }
- }
-
- /*
* @public function getFieldName
* @param integer $field_id
+ * @param integer $field_option
*/
- public function getFieldName($field_id)
+ public function getFieldOption($field_id, $field_option = '')
{
$criteria = new Criteria('field_id', $field_id );
if ($this->getCount($criteria) > 0) {
$obj = $this->getObjects($criteria, false, false );
- if (!empty($obj[0]['field_name']))
- return strtolower($obj[0]['field_name']);
- else
- return false;
+ if (is_string($field_option)) {
+ if (!empty($obj[0][$field_option]))
+ return strtolower($obj[0][$field_option]);
+ } else {
+ if (!empty($obj[0][$field_option]) && is_numeric($obj[0][$field_option]))
+ return intval($obj[0][$field_option]);
+ }
} else {
return false;
}
- }
-
- /*
- * @public function getFieldType
- * @param integer $field_id
- */
- public function getFieldType($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_type']))
- return $obj[0]['field_type'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldValue
- * @param integer $field_id
- */
- public function getFieldValue($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (!empty($obj[0]['field_value']) && is_numeric($obj[0]['field_value']))
- return intval($obj[0]['field_value']);
- else
- return false;
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldAttribute
- * @param integer $field_id
- */
- public function getFieldAttribute($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_attribute']))
- return $obj[0]['field_attribute'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldNull
- * @param integer $field_id
- */
- public function getFieldNull($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_null']))
- return $obj[0]['field_null'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldDefault
- * @param integer $field_id
- */
- public function getFieldDefault($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (!empty($obj[0]['field_default']))
- return strtolower($obj[0]['field_default']);
- else
- return false;
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldKey
- * @param integer $field_id
- */
- public function getFieldKey($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_key']))
- return $obj[0]['field_key'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldAutoIncrement
- * @param integer $field_id
- */
- public function getFieldAutoIncrement($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_autoincrement']))
- return $obj[0]['field_autoincrement'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldElement
- * @param integer $field_id
- */
- public function getFieldElement($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_element']))
- return $obj[0]['field_element'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldInLst
- * @param integer $field_id
- */
- public function getFieldInLst($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_inlist']))
- return $obj[0]['field_inlist'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldInForm
- * @param integer $field_id
- */
- public function getFieldInForm($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_inform']))
- return $obj[0]['field_inform'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldAdmin
- * @param integer $field_id
- */
- public function getFieldAdmin($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_admin']))
- return $obj[0]['field_admin'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldUser
- * @param integer $field_id
- */
- public function getFieldUser($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_user']))
- return $obj[0]['field_user'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldBlock
- * @param integer $field_id
- */
- public function getFieldBlock($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_block']))
- return $obj[0]['field_block'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldMain
- * @param integer $field_id
- */
- public function getFieldMain($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_main']))
- return $obj[0]['field_main'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldSearch
- * @param integer $field_id
- */
- public function getFieldSearch($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_search']))
- return $obj[0]['field_search'];
- } else {
- return false;
- }
- }
-
- /*
- * @public function getFieldRequired
- * @param integer $field_id
- */
- public function getFieldRequired($field_id)
- {
- $criteria = new Criteria('field_id', $field_id );
- if ($this->getCount($criteria) > 0) {
- $obj = $this->getObjects($criteria, false, false );
- if (isset($obj[0]['field_required']))
- return $obj[0]['field_required'];
- } else {
- return false;
- }
- }
+ unset($criteria);
+ }
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -232,7 +232,19 @@
$ret[] = $languageMain->render();
// Language Modinfo File
$languageModinfo = LanguageModinfo::getInstance($module, $table, $tables, 'modinfo.php');
- $ret[] = $languageModinfo->render();
+ $ret[] = $languageModinfo->render();
+ // Language Help File
+ $languageHelp = LanguageHelp::getInstance($module, 'help.html');
+ $ret[] = $languageHelp->render();
+ // Templates Footer File
+ $templatesFooter = TemplatesFooter::getInstance($module, $table, 'footer.tpl');
+ $ret[] = $templatesFooter->render();
+ // Templates Header File
+ $templatesHeader = TemplatesHeader::getInstance($module, $tables, 'header.tpl');
+ $ret[] = $templatesHeader->render();
+ // Templates Index File
+ $templatesIndex = TemplatesIndex::getInstance($module, $table, 'index.tpl');
+ $ret[] = $templatesIndex->render();
// User Footer File
$userFooter = UserFooter::getInstance($module, 'footer.php');
$ret[] = $userFooter->render();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/class_files.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -186,11 +186,10 @@
\$title = \$this->isNew() ? sprintf({$lang_add}) : sprintf({$lang_edit});
- include_once(XOOPS_ROOT_PATH.'/class/xoopsformloader.php');
-
+ xoops_load('XoopsFormLoader');
\$form = new XoopsThemeForm(\$title, 'form', \$action, 'post', true);
\$form->setExtra('enctype="multipart/form-data"');\n
- {$elements_form}
+ {$elements_form}\n
EOT;
return $ret;
}
@@ -243,7 +242,8 @@
*/
public function getFootFunctionForm() {
$ret = <<<EOT
- \n\$form->addElement(new XoopsFormHidden('op', 'save'));
+ \n
+ \$form->addElement(new XoopsFormHidden('op', 'save'));
\$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return \$form;
}
@@ -290,14 +290,14 @@
$table_name = $this->table->getVar('table_name');
//$fields = $this->getFields();
$filename = $this->getFileName();
- $module_name = $module->getVar('mod_name');
+ $module_name = strtolower($module->getVar('mod_name'));
$initvar = $this->getInitVars($table_nbfields);
$fpif = ''; $fpmf = '';
$initvar_functions = array();
foreach(array_keys($this->fields) as $f)
{
$field_name = $this->fields[$f]->getVar('field_name');
- if($f == 0) {
+ if($f == 1) {
$fpif = $field_name;
}
if($this->fields[$f]->getVar('field_main') == 1) {
@@ -310,7 +310,9 @@
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getHeadClass($module_name, $table_name, $initvar);
$content .= $this->getHeadFunctionForm($module_name, $elements_form);
- $content .= $this->getPermissionsInFunctionForm($module_name, $fpif);
+ if ($this->table->getVar('table_permissions') == 1) {
+ $content .= $this->getPermissionsInFunctionForm($module_name, $fpif);
+ }
$content .= $this->getFootFunctionForm();
$content .= $this->getClassHandler($module_name, $table_name, $fpif, $fpmf);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/formelements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/formelements.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/formelements.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -81,7 +81,7 @@
*/
public function getXoopsFormText($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormText({$language}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')), {$required});
+ \$form->addElement(new XoopsFormText({$language}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')), {$required});\n
EOT;
return $ret;
}
@@ -93,7 +93,7 @@
*/
public function getXoopsFormTextArea($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormTextArea({$language}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47), {$required});
+ \$form->addElement(new XoopsFormTextArea({$language}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47), {$required});\n
EOT;
return $ret;
}
@@ -114,7 +114,7 @@
\$editor_configs['width'] = '100%';
\$editor_configs['height'] = '400px';
\$editor_configs['editor'] = xoops_getModuleOption('{$module_name}_editor', '{$module_name}');
- \$form->addElement( new XoopsFormEditor({$language}, '{$field_name}', \$editor_configs), {$required} );
+ \$form->addElement( new XoopsFormEditor({$language}, '{$field_name}', \$editor_configs), {$required} );\n
EOT;
return $ret;
}
@@ -129,7 +129,7 @@
\${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
\$check_{$field_name} = new XoopsFormCheckBox({$language}, '{$field_name}', \${$field_name});
\$check_{$field_name}->addOption(1, " ");
- \$form->addElement(\$check_{$field_name}, {$required});
+ \$form->addElement(\$check_{$field_name}, {$required});\n
EOT;
return $ret;
}
@@ -139,7 +139,7 @@
*/
public function getXoopsFormHidden($field_name) {
$ret = <<<EOT
- \$form->addElement(new XoopsFormHidden('{$field_name}', \$this->getVar('{$field_name}')));
+ \$form->addElement(new XoopsFormHidden('{$field_name}', \$this->getVar('{$field_name}')));\n
EOT;
return $ret;
}
@@ -151,7 +151,7 @@
*/
public function getXoopsFormUploadFile($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormUploadFile({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
+ \$form->addElement(new XoopsFormUploadFile({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});\n
EOT;
return $ret;
}
@@ -163,7 +163,7 @@
*/
public function getXoopsFormUploadImage($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormUploadImage({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
+ \$form->addElement(new XoopsFormUploadImage({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});\n
EOT;
return $ret;
}
@@ -175,7 +175,7 @@
*/
public function getXoopsFormColorPicker($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormColorPicker({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});
+ \$form->addElement(new XoopsFormColorPicker({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']), {$required});\n
EOT;
return $ret;
}
@@ -187,7 +187,7 @@
*/
public function getXoopsFormSelectUser($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormSelectUser({$language}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false), {$required});
+ \$form->addElement(new XoopsFormSelectUser({$language}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false), {$required});\n
EOT;
return $ret;
}
@@ -200,7 +200,7 @@
public function getXoopsFormRadioYN($language, $field_name, $required = 'false') {
$ret = <<<EOT
${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
- \$form->addElement(new XoopsFormRadioYN({$language}, '{$field_name}', ${$field_name}), {$required});
+ \$form->addElement(new XoopsFormRadioYN({$language}, '{$field_name}', ${$field_name}), {$required});\n
EOT;
return $ret;
}
@@ -212,7 +212,7 @@
*/
public function getXoopsFormTextDateSelect($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormTextDateSelect({$language}, '{$field_name}', '', \$this->getVar('{$field_name}')), {$required});
+ \$form->addElement(new XoopsFormTextDateSelect({$language}, '{$field_name}', '', \$this->getVar('{$field_name}')), {$required});\n
EOT;
return $ret;
}
@@ -236,7 +236,7 @@
\${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
\${$field_name}_select = new XoopsFormSelect({$language}, '{$field_name}', \$this->getVar('{$field_name}'));
\${$field_name}_select->addOptionArray(\${$field_name}Handler->getList());
- \$form->addElement(\${$field_name}_select, {$required});
+ \$form->addElement(\${$field_name}_select, {$required});\n
XFT;
return $ret;
}
@@ -253,13 +253,13 @@
{
$field_name = $this->fields[$f]->getVar('field_name');
if($this->fields[$f]->getVar('field_id') == 1) {
- $field_id = $this->fields[$f]->getVar('field_name');
+ $field_id = $field_name;
}
if($this->fields[$f]->getVar('field_parent') == 1) {
- $field_pid = $this->fields[$f]->getVar('field_name');
+ $field_pid = $field_name;
}
if($this->fields[$f]->getVar('field_main') == 1) {
- $field_main = $this->fields[$f]->getVar('field_name');
+ $field_main = $field_name;
}
}
$ret = <<<XFT
@@ -271,7 +271,7 @@
\${$table_name}_tree = new XoopsObjectTree( \${$table_name}, '{$field_id}', '{$field_pid}' );
\${$field_pid} = \${$table_name}_tree->makeSelBox( '{$field_pid}', '{$field_main}','--', \$this->getVar('{$field_pid}', 'e' ), true );
\$form->addElement( new XoopsFormLabel ( {$language}, \${$field_pid} ), {$required} );
- }
+ }\n
XFT;
return $ret;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_admin.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -74,7 +74,7 @@
$module_name = $module->getVar('mod_name');
$table_name = $this->table->getVar('table_name');
- $language = $this->getLanguage($module_name, 'AM', '_');
+ $language = $this->getLanguage($module_name, 'AM');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
\n//Admin
Added: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_help.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_help.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language_help.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -0,0 +1,96 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: 1.91 language_help.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class LanguageHelp extends TDMCreateFile
+{
+ /*
+ * @var string
+ */
+ private $tdmcfile = null;
+
+ /*
+ * @public function constructor
+ * @param string $module
+ * @param string $filename
+ */
+ public function __construct($module, $filename) {
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->setModule($module);
+ $this->setFileName($filename);
+ }
+ /*
+ * @static function &getInstance
+ * @param string $module
+ * @param string $filename
+ */
+ public static function &getInstance($module, $filename)
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self($module, $filename);
+ }
+ return $instance;
+ }
+ /*
+ * @public function render
+ * @param null
+ */
+ public function render() {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $module_name = $module->getVar('mod_name');
+ $stl_module_name = strtolower($module_name);
+ $module_donations = $module->getVar('mod_donations');
+ //$content = $this->getHeaderFilesComments($module, $filename);
+ $content = <<<EOT
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<\{\$xoops_url\}>/modules/$stl_module_name/admin/index.php"
+ title="Back to the administration of $module_name"> $module_name <img src="<{xoAdminIcons home.png}>"
+ alt="Back to the Administration of $module_name"/>
+ </a></h1>
+ <!-- -----Help Content ---------- -->
+ <h4 class="odd">Description</h4>
+ <p class="even">
+ The $module_name module can be used to modules in XOOPS<br /><br />
+ </p>
+ <h4 class="odd">Install/uninstall</h4>
+ <p class="even">
+No special measures necessary, follow the standard installation process and extract the $module_name folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. <br /><br />
+Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a>
+ </p>
+ <h4 class="odd">Features</h4>
+ <p class="even">
+ The TDMCreate module continues to expand, to get to the conditions to create modules, more and more sophisticated.<br />
+ For this reason, I invite all developers to report and send in svn any changes or additions to this module, so that we can jointly contribute to the development <br /><br />
+ </p>
+ <h4 class="odd">Tutorial</h4>
+ <p class="even">
+ You can find a more detailed to this Video Tutorial <a href="http://www.youtube.com/watch?v=dg7zGFCopxY" rel="external">here</a>
+ </p>
+ <!-- -----Help Content ---------- -->
+</div>
+EOT;
+ $this->tdmcfile->create($module_name, 'language/'.$GLOBALS['xoopsConfig']['language'].'/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ return $this->tdmcfile->renderFile();
+ }
+}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql_files.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -232,22 +232,22 @@
switch( $key ) {
case 1:
$ret = $ret = <<<EOT
- PRIMARY KEY (`$field_name`)',
+ PRIMARY KEY (`$field_name`)'
EOT;
break;
case 2:
$ret = <<<EOT
- KEY `$field_name` (`$field_name`)',
+ KEY `$field_name` (`$field_name`)'
EOT;
break;
case 3:
$ret = <<<EOT
- INDEX (`$field_name`)',
+ INDEX (`$field_name`)'
EOT;
break;
case 4:
$ret = <<<EOT
- FULLTEXT KEY `$field_name` (`$field_name`)',
+ FULLTEXT KEY `$field_name` (`$field_name`)'
EOT;
break;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_footer.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -26,8 +26,11 @@
* @var string
*/
private $tdmcfile = null;
-
/*
+ * @var string
+ */
+ private $table = null;
+ /*
* @public function constructor
* @param string $module
* @param mixed $table
@@ -36,8 +39,9 @@
public function __construct($module, $table, $filename) {
$this->tdmcfile = TDMCreateFile::getInstance();
$this->setModule($module);
- $this->setTable($table);
+ //$this->setTable($table);
$this->setFileName($filename);
+ $this->table = $table;
}
/*
@@ -60,13 +64,14 @@
*/
public function render() {
$module = $this->getModule();
- $table = $this->getTable();
- $fields = $this->getFields();
+ //$table = $this->getTable();
+ //$fields = $this->getFields();
$filename = $this->getFileName();
- $module_name = $module->getVar('mod_name');
- $language = $this->getLanguage($module_name, 'MA', '_');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
+ $module_name = $module->getVar('mod_name');
+ $table_name = $this->table->getVar('table_name');
+ $language = $this->getLanguage($module_name, 'MA');
+ //$content = $this->getHeaderFilesComments($module, $filename);
+ $content = <<<EOT
<{if \$bookmarks != 0}>
<{include file="db:system_bookmarks.html"}>
<{/if}>
@@ -75,7 +80,7 @@
<{/if}>
\n<div class="left"><{\$copyright}></div>
EOT;
- if($table->getVar('table_name') != null){
+ if( !empty($table_name) ) {
$content .= <<<EOT
\n<{if \$pagenav != ''}>
<div class="right"><{\$pagenav}></div>
@@ -88,7 +93,7 @@
<div class="center bold"><a href="<{\$admin}>"><{\$smarty.const.{$language}ADMIN}></a></div>
<{/if}>
EOT;
- if ( $module->getVar('mod_comments') != 0 ) {
+ if ( $module->getVar('mod_comments') != 0 && $this->table->getVar('table_comments') != 0 ) {
$content .= <<<EOT
\n<div class="pad2 marg2">
<{if \$comment_mode == "flat"}>
@@ -101,7 +106,7 @@
</div>
EOT;
}
- if ( $module->getVar('mod_notifications') != 0 ) {
+ if ( $module->getVar('mod_notifications') != 0 && $this->table->getVar('table_notifications') != 0 ) {
$content .= <<<EOT
\n<{include file='db:system_notification_select.html'}>
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_header.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -26,31 +26,35 @@
* @var string
*/
private $tdmcfile = null;
-
/*
+ * @var string
+ */
+ private $tables = null;
+ /*
* @public function constructor
* @param string $module
- * @param mixed $table
+ * @param mixed $tables
* @param string $filename
*/
- public function __construct($module, $table, $filename) {
+ public function __construct($module, $tables, $filename) {
$this->tdmcfile = TDMCreateFile::getInstance();
$this->setModule($module);
- $this->setTable($table);
+ //$this->setTable($table);
$this->setFileName($filename);
+ $this->tables = $tables;
}
/*
* @static function &getInstance
* @param string $module
- * @param mixed $table
+ * @param mixed $tables
* @param string $filename
*/
- public static function &getInstance($module, $table, $filename)
+ public static function &getInstance($module, $tables, $filename)
{
static $instance = false;
if (!$instance) {
- $instance = new self($module, $table, $filename);
+ $instance = new self($module, $tables, $filename);
}
return $instance;
}
@@ -60,13 +64,13 @@
*/
public function render() {
$module = $this->getModule();
- $table = $this->getTable();
- $fields = $this->getFields();
+ //$table = $this->getTable();
+ //$fields = $this->getFields();
$filename = $this->getFileName();
$module_name = $module->getVar('mod_name');
- $language = $this->getLanguage($module_name, 'MA', '_');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
+ $language = $this->getLanguage($module_name, 'MA');
+ //$content = $this->getHeaderFilesComments($module, $filename);
+ $content = <<<EOT
<div class="header">
<span class="left"><b><{\$smarty.const.{$language}TITLE}></b>: </span>
<span class="left"><{\$smarty.const.{$language}DESC}></span><br />
@@ -89,9 +93,9 @@
<li><a href="<{\${$module_name}_url}>"><{\$smarty.const.{$language}INDEX}></a></li>\n
EOT;
- foreach (array_keys($table) as $i)
+ foreach (array_keys($this->tables) as $i)
{
- $table_name = $table[$i]->getVar('table_name');
+ $table_name = $this->tables[$i]->getVar('table_name');
$stu_table_name = strtoupper($table_name);
$content .= <<<EOT
\n\t\t\t<li> | </li>
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates_index.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -62,9 +62,9 @@
$module = $this->getModule();
$filename = $this->getFileName();
$module_name = $module->getVar('mod_name');
- $language = $this->getLanguage($module_name, 'MA', '_');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
+ $language = $this->getLanguage($module_name, 'MA');
+ //$content = $this->getHeaderFilesComments($module, $filename);
+ $content = <<<EOT
<{include file="db:{$module_name}_header.html"}>
<table class="outer {$module_name}" cellspacing="0" cellpadding="0">
<tbody>
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/repository.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/repository.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/repository.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -200,7 +200,7 @@
}
$iconSelect->setExtra( "onchange='showImgSelected2(\"image4\", \"tables_img\", \"" . $uploadirectory . "\", \"\", \"" . '' . "\")'" );
$createLogoTray->addElement($iconSelect);
- $createLogoTray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . $uploadirectory . "/" . $tables_img . "' name='image4' id='image4' alt='' />" ) );
+ $createLogoTray->addElement( new XoopsFormLabel( '', "<br /><img src='" . $uploadirectory . "/" . $tables_img . "' name='image4' id='image4' alt='' />" ) );
// Create preview and submit buttons
$buttonLogoGenerator4= new XoopsFormButton('', 'button4', "Create New Logo", 'button');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/request.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -939,9 +939,6 @@
$source = preg_replace('/&#x([a-f0-9]+);/mei', "chr(0x\\1)", $source); // hex notation
return $source;
*/
-
-
-
// url decode
$charset = defined('_CHARSET') ? constant('_CHARSET') : 'utf-8';
$source = html_entity_decode($source, ENT_QUOTES, $charset);
@@ -959,9 +956,5 @@
); // hex notation
return $source;
-
-
-
-
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/tables.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -58,6 +58,8 @@
$this->initVar('table_comments',XOBJ_DTYPE_INT);
$this->initVar('table_notifications',XOBJ_DTYPE_INT);
$this->initVar('table_permissions',XOBJ_DTYPE_INT);
+ //
+ $this->initVar('mod_id', XOBJ_DTYPE_INT);
}
/**
@@ -104,7 +106,7 @@
$form = new XoopsThemeForm($title, 'tableform', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
//
- $modules = $this->tdmcreate->getHandler('modules')->getObjects(null);
+ $modules = $this->tdmcreate->getHandler('repository')->getObjects(null);
$mods_select = new XoopsFormSelect(_AM_TDMCREATE_TABLE_MODULES, 'table_mid', $table_mid);
$mods_select->addOption($action, _AM_TDMCREATE_TABLE_MODSELOPT);
foreach ($modules as $mod) {//$mods_select->addOptionArray();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -66,6 +66,7 @@
include_once TDMC_PATH . $cf .'include_search.php';
include_once TDMC_PATH . $cf .'language_admin.php';
include_once TDMC_PATH . $cf .'language_blocks.php';
+include_once TDMC_PATH . $cf .'language_help.php';
include_once TDMC_PATH . $cf .'language_main.php';
include_once TDMC_PATH . $cf .'language_modinfo.php';
include_once TDMC_PATH . $cf .'sql_files.php';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -370,4 +370,4 @@
define('_AM_TDMCREATE_NOTOK_ARCHITECTURE', "<span class='red'>Problems: Creating the structure of the module (index.html, folders, icons, docs files)</span>");
define('_AM_TDMCREATE_FILE_NOTCREATED', "Problems: Creating file <b class='red'>%s</b> in the <span class='red bold'>%s</span> folder");
//
-define('_AM_TDMCREATE_BUILDING_DIRECTORY', "Files created in the directory <span class='bold'>uploads/tdmcreate/modules/</span> of the module <span class='bold green'>%s</span>");
\ No newline at end of file
+define('_AM_TDMCREATE_BUILDING_DIRECTORY', "Files created in the directory <span class='bold'>uploads/tdmcreate/repository/</span> of the module <span class='bold green'>%s</span>");
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-05-23 10:25:36 UTC (rev 12545)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php 2014-05-23 19:49:52 UTC (rev 12546)
@@ -413,5 +413,5 @@
$modversion['config'][$i]['description'] = "";
$modversion['config'][$i]['formtype'] = "textbox";
$modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12540';
+$modversion['config'][$i]['default'] = '12545';
unset($i);
\ No newline at end of file
|
