Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12732] XoopsModules/TDMCreate/branches/timgno/1.91/ tdmcreate
|
From: <txm...@us...> - 2014-07-28 17:13:40
|
Revision: 12732
http://sourceforge.net/p/xoops/svn/12732
Author: txmodxoops
Date: 2014-07-28 17:13:26 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
- Updated
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_fields.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_modules.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_tables.tpl
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -22,14 +22,14 @@
// Recovered value of arguments op in the URL $
$op = XoopsRequest::getString('op', 'list');
// Get fields Variables
-$field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
+/*$fieldMid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
$fieldTid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
$fieldNumb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
-$fieldName = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');/**/
-/*$field_mid = XoopsRequest::getInt('field_mid');
+$fieldName = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');*/
+$fieldMid = XoopsRequest::getInt('field_mid');
$fieldTid = XoopsRequest::getInt('field_tid');
$fieldNumb = XoopsRequest::getInt('field_numb');
-$fieldName = XoopsRequest::getString('field_name', ''); */
+$fieldName = XoopsRequest::getString('field_name'); /**/
//
switch ($op)
{
@@ -53,66 +53,67 @@
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
//var_dump($sysPathIcon32);
// Redirect if there aren't modules
- $nb_modules = $tdmcreate->getHandler('modules')->getCount();
- if ( $nb_modules == 0 ) {
+ $countModules = $tdmcreate->getHandler('modules')->getCount();
+ if ( $countModules == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
}
- unset($nb_modules);
+ unset($countModules);
// Redirect if there aren't tables
- $nb_tables = $tdmcreate->getHandler('tables')->getCount();
- if ($nb_tables == 0) {
+ $countTables = $tdmcreate->getHandler('tables')->getCount();
+ if ($countTables == 0) {
redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES );
}
- unset($nb_tables);
+ unset($countTables);
// Get the list of tables
$criteria = new CriteriaCompo();
$criteria->setSort('table_id ASC, table_name');
$criteria->setOrder('ASC');
- $nb_tables = $tdmcreate->getHandler('tables')->getCount($criteria);
- $tables_arr = $tdmcreate->getHandler('tables')->getAll($criteria);
+ $countTables = $tdmcreate->getHandler('tables')->getCount($criteria);
+ $tablesAll = $tdmcreate->getHandler('tables')->getAll($criteria);
unset($criteria);
- if ($nb_tables > 0)
+ if ($countTables > 0)
{
- foreach (array_keys($tables_arr) as $tid)
+ foreach (array_keys($tablesAll) as $tid)
{
// Display tables list
$table['id'] = $tid;
- $table['mid'] = $tables_arr[$tid]->getVar('table_mid');
- $table['name'] = ucfirst($tables_arr[$tid]->getVar('table_name'));
- $table['image'] = $tables_arr[$tid]->getVar('table_image');
- $table['nbfields'] = $tables_arr[$tid]->getVar('table_nbfields');
- $table['autoincrement'] = $tables_arr[$tid]->getVar('table_autoincrement');
- $table['blocks'] = $tables_arr[$tid]->getVar('table_blocks');
- $table['admin'] = $tables_arr[$tid]->getVar('table_admin');
- $table['user'] = $tables_arr[$tid]->getVar('table_user');
- $table['search'] = $tables_arr[$tid]->getVar('table_search');
+ $table['mid'] = $tablesAll[$tid]->getVar('table_mid');
+ $table['name'] = ucfirst($tablesAll[$tid]->getVar('table_name'));
+ $table['image'] = $tablesAll[$tid]->getVar('table_image');
+ $table['nbfields'] = $tablesAll[$tid]->getVar('table_nbfields');
+ $table['autoincrement'] = $tablesAll[$tid]->getVar('table_autoincrement');
+ $table['blocks'] = $tablesAll[$tid]->getVar('table_blocks');
+ $table['admin'] = $tablesAll[$tid]->getVar('table_admin');
+ $table['user'] = $tablesAll[$tid]->getVar('table_user');
+ $table['search'] = $tablesAll[$tid]->getVar('table_search');
// Get the list of fields
$criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('field_mid', $table['mid']));
$criteria->add(new Criteria('field_tid', $tid));
$criteria->setSort('field_id ASC, field_name');
$criteria->setOrder('ASC');
- $nb_fields = $tdmcreate->getHandler('fields')->getCount($criteria);
- $fields_arr = $tdmcreate->getHandler('fields')->getObjects($criteria);
+ $countFields = $tdmcreate->getHandler('fields')->getCount($criteria);
+ $fieldsAll = $tdmcreate->getHandler('fields')->getObjects($criteria);
unset($criteria);
// Display fields list
$fields = array();
$lid = 1;
- if ( $nb_fields > 0 )
+ if ( $countFields > 0 )
{
- foreach (array_keys($fields_arr) as $fid)
+ foreach (array_keys($fieldsAll) as $fid)
{
$field['id'] = $fid;
$field['lid'] = $lid;
- $field['name'] = str_replace('_', ' ', ucfirst($fields_arr[$fid]->getVar('field_name')));
- $field['parent'] = $fields_arr[$fid]->getVar('field_parent');
- $field['inlist'] = $fields_arr[$fid]->getVar('field_inlist');
- $field['inform'] = $fields_arr[$fid]->getVar('field_inform');
- $field['admin'] = $fields_arr[$fid]->getVar('field_admin');
- $field['user'] = $fields_arr[$fid]->getVar('field_user');
- $field['block'] = $fields_arr[$fid]->getVar('field_block');
- $field['main'] = $fields_arr[$fid]->getVar('field_main');
- $field['search'] = $fields_arr[$fid]->getVar('field_search');
- $field['required'] = $fields_arr[$fid]->getVar('field_required');
+ $field['name'] = str_replace('_', ' ', ucfirst($fieldsAll[$fid]->getVar('field_name')));
+ $field['parent'] = $fieldsAll[$fid]->getVar('field_parent');
+ $field['inlist'] = $fieldsAll[$fid]->getVar('field_inlist');
+ $field['inform'] = $fieldsAll[$fid]->getVar('field_inform');
+ $field['admin'] = $fieldsAll[$fid]->getVar('field_admin');
+ $field['user'] = $fieldsAll[$fid]->getVar('field_user');
+ $field['block'] = $fieldsAll[$fid]->getVar('field_block');
+ $field['main'] = $fieldsAll[$fid]->getVar('field_main');
+ $field['search'] = $fieldsAll[$fid]->getVar('field_search');
+ $field['required'] = $fieldsAll[$fid]->getVar('field_required');
$fields[] = $field;
unset($field);
$lid++;
@@ -123,14 +124,18 @@
$GLOBALS['xoopsTpl']->append('tables_list', $table);
unset($table);
}
- if ( $nb_tables > $limit ) {
+ if ( $countTables > $limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($nb_tables, $limit, $start, 'start', 'op=list&limit=' . $limit);
+ $pagenav = new XoopsPageNav($countTables, $limit, $start, 'start', 'op=list&limit=' . $limit);
$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
}
} else {
$GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_FIELDS);
- }
+ }
+ var_dump($fieldMid);
+ var_dump($fieldTid);
+ var_dump($fieldNumb);
+ var_dump($fieldName);
break;
case 'new':
@@ -144,10 +149,10 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
// Form Add
$fieldsObj =& $tdmcreate->getHandler('fields')->create();
- $form = $fieldsObj->getFormNew($field_mid, $fieldTid, $fieldNumb, $fieldName);
+ $form = $fieldsObj->getFormNew($fieldMid, $fieldTid, $fieldNumb, $fieldName);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Test -> Will be removed
- var_dump($field_mid);
+ var_dump($fieldMid);
var_dump($fieldTid);
var_dump($fieldNumb);
var_dump($fieldName);
@@ -172,9 +177,9 @@
$fieldsObj =& $fields->get($value);
break;
}
- if (isset($field_mid) && isset($fieldTid) && !empty($_POST['field_name'][$key])) {
+ if (isset($fieldMid) && isset($fieldTid) && !empty($_POST['field_name'][$key])) {
// Set Data
- $fieldsObj->setVar( 'field_mid', $field_mid );
+ $fieldsObj->setVar( 'field_mid', $fieldMid );
$fieldsObj->setVar( 'field_tid', $fieldTid );
$fieldsObj->setVar( 'field_numb', $fieldNumb );
$fieldsObj->setVar( 'field_name', (isset($_POST['field_name'][$key]) ? $_POST['field_name'][$key] : '') );
@@ -205,7 +210,7 @@
if ($fieldsObj->isNew()) {
// Fields Elements Handler
$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
- $fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
+ $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid );
$fieldelementObj->setVar( 'fieldelement_tid', $fieldTid );
$fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
$fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
@@ -234,7 +239,7 @@
// Form Edit
$fieldId = XoopsRequest::getInt('field_id');
$fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId );
- $form = $fieldsObj->getFormEdit($field_mid, $fieldTid);
+ $form = $fieldsObj->getFormEdit($fieldMid, $fieldTid);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Test -> Will be removed
var_dump($fieldTid);
@@ -270,61 +275,46 @@
exit;
break;
- case 'display':
- $fieldId = XoopsRequest::getInt('field_id');
- // Get the list of fields
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $fieldTid));
- $fields = $tdmcreate->getHandler('fields')->getObjects($criteria);
- $fieldsObj =& $tdmcreate->getHandler('fields')->get($fieldId);
- if (isset($_GET['field_tid'])) {
- if (isset($_GET['field_parent'])) {
- foreach ($fields as $field) {
- $fld_parent = $field->getVar('field_parent');
- $field_parent = ($field->getVar('field_id') == $fld_parent) ? '1' : '0';
- $fieldsObj->setVar('field_parent', $field_parent);
- }
- } elseif (isset($_GET['field_inlist'])) {
- $fld_inlist = intval($_GET['field_inlist']);
- $field_inlist = ($fld_inlist == 1) ? '0' : '1';
- $fieldsObj->setVar('field_inlist', $field_inlist);
- } elseif (isset($_GET['field_inform'])) {
- $fld_inform = intval($_GET['field_inform']);
- $field_inform = ($fld_inform == 1) ? '0' : '1';
- $fieldsObj->setVar('field_inform', $field_inform);
- } elseif (isset($_GET['field_admin'])) {
- $fld_admin = intval($_GET['field_admin']);
- $field_admin = ($fld_admin == 1) ? '0' : '1';
- $fieldsObj->setVar('field_admin', $field_admin);
- } elseif (isset($_GET['field_user'])) {
- $fld_user = intval($_GET['field_user']);
- $field_user = ($fld_user == 1) ? '0' : '1';
- $fieldsObj->setVar('field_user', $field_user);
- } elseif (isset($_GET['field_block'])) {
- $fld_block = intval($_GET['field_block']);
- $field_block = ($fld_block == 1) ? '0' : '1';
- $fieldsObj->setVar('field_block', $field_block);
- } elseif (isset($_GET['field_main'])) {
- foreach ($fields as $field) {
- $fld_main = $field->getVar('field_main');
- $field_main = ($field->getVar('field_id') == $fld_main) ? '1' : '0';
- $fieldsObj->setVar('field_main', $field_main);
- }
- } elseif (isset($_GET['field_search'])) {
- $fld_search = intval($_GET['field_search']);
- $field_search = ($fld_search == 1) ? '0' : '1';
- $fieldsObj->setVar('field_search', $field_search);
- } elseif (isset($_GET['field_required'])) {
- $fld_required = intval($_GET['field_required']);
- $field_required = ($fld_required == 1) ? '0' : '1';
- $fieldsObj->setVar('field_required', $field_required);
- }
- if ($tdmcreate->getHandler('fields')->insert($fieldsObj, true)) {
- redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
- } else {
- redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_FAILED);
- }
- }
+ case 'display':
+ //
+ $fields = $tdmcreate->getHandler('fields');
+ // Fields Handler
+ foreach($_REQUEST['field_id'] as $key => $value)
+ {
+ /*$fieldId = XoopsRequest::getInt('field_id');
+ $fieldParent = XoopsRequest::getInt('field_parent');
+ $fieldInlist = XoopsRequest::getInt('field_inlist');
+ $fieldInform = XoopsRequest::getInt('field_inform');
+ $fieldAdmin = XoopsRequest::getInt('field_admin');
+ $fieldUser = XoopsRequest::getInt('field_user');
+ $fieldBlock = XoopsRequest::getInt('field_block');
+ $fieldMain = XoopsRequest::getInt('field_main');
+ $fieldSearch = XoopsRequest::getInt('field_search');
+ $fieldRequired = XoopsRequest::getInt('field_required');*/
+
+ $fieldsObj =& $fields->get($value);
+ /*$fieldsObj->setVar('field_parent', $fieldParent);
+ $fieldsObj->setVar('field_inlist', $fieldInlist);
+ $fieldsObj->setVar('field_inform', $fieldInform);
+ $fieldsObj->setVar('field_admin', $fieldAdmin);
+ $fieldsObj->setVar('field_user', $fieldUser);
+ $fieldsObj->setVar('field_block', $fieldBlock);
+ $fieldsObj->setVar('field_main', $fieldMain);
+ $fieldsObj->setVar('field_search', $fieldSearch);
+ $fieldsObj->setVar('field_required', $fieldRequired);*/
+ $fieldsObj->setVar( 'field_parent', $_POST['field_parent'][$key]);
+ $fieldsObj->setVar( 'field_inlist', $_POST['field_inlist'][$key]);
+ $fieldsObj->setVar( 'field_inform', $_POST['field_inform'][$key]);
+ $fieldsObj->setVar( 'field_admin', $_POST['field_admin'][$key]);
+ $fieldsObj->setVar( 'field_user', $_POST['field_user'][$key]);
+ $fieldsObj->setVar( 'field_block', $_POST['field_block'][$key]);
+ $fieldsObj->setVar( 'field_main', $_POST['field_main'][$key]);
+ $fieldsObj->setVar( 'field_search', $_POST['field_search'][$key]);
+ $fieldsObj->setVar( 'field_required', $_POST['field_required'][$key]);
+ //
+ $fields->insert($fieldsObj, true);
+ }
+ redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS);
break;
}
include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/modules.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -61,7 +61,8 @@
$mod['release'] = $mods_arr[$i]->getVar('mod_release');
$mod['status'] = $mods_arr[$i]->getVar('mod_status');
$mod['admin'] = $mods_arr[$i]->getVar('mod_admin');
- $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['blocks'] = $mods_arr[$i]->getVar('mod_blocks');
$mod['search'] = $mods_arr[$i]->getVar('mod_search');
$mod['comments'] = $mods_arr[$i]->getVar('mod_comments');
$mod['notifications'] = $mods_arr[$i]->getVar('mod_notifications');
@@ -205,19 +206,32 @@
break;
case 'display':
- $mod_admin = XoopsRequest::getInt('mod_admin');
- $mod_user = XoopsRequest::getInt('mod_user');
- $mod_search = XoopsRequest::getInt('mod_search');
- $mod_comments = XoopsRequest::getInt('mod_comments');
- $mod_notifications = XoopsRequest::getInt('mod_notifications');
- $mod_permissions = XoopsRequest::getInt('mod_permissions');
-
- if ( $mod_id > 0 ) {
+ //if ( $mod_id > 0 ) {
+ $mod_admin = XoopsRequest::getInt('mod_admin');
+ $mod_user = XoopsRequest::getInt('mod_user');
+ $mod_blocks = XoopsRequest::getInt('mod_blocks');
+ $mod_search = XoopsRequest::getInt('mod_search');
+ $mod_comments = XoopsRequest::getInt('mod_comments');
+ $mod_notifications = XoopsRequest::getInt('mod_notifications');
+ $mod_permissions = XoopsRequest::getInt('mod_permissions');
+
+ //foreach($_POST['mod_id'] as $key => $value)
+ //{
+ /*$mod_admin = TDMCreate_CleanVars($_REQUEST, 'mod_admin');
+ $mod_user = TDMCreate_CleanVars($_REQUEST, 'mod_user');
+ $mod_blocks = TDMCreate_CleanVars($_REQUEST, 'mod_blocks');
+ $mod_search = TDMCreate_CleanVars($_REQUEST, 'mod_search');
+ $mod_comments = TDMCreate_CleanVars($_REQUEST, 'mod_comments');
+ $mod_notifications = TDMCreate_CleanVars($_REQUEST, 'mod_notifications');
+ $mod_permissions = TDMCreate_CleanVars($_REQUEST, 'mod_permissions'); */
+
$modulesObj =& $tdmcreate->getHandler('modules')->get($mod_id);
- if(isset($mod_adminm)) {
+ if(isset($mod_admin)) {
$modulesObj->setVar('mod_admin', $mod_admin);
} elseif(isset($mod_user)) {
$modulesObj->setVar('mod_user', $mod_user);
+ } elseif(isset($mod_blocks)) {
+ $modulesObj->setVar('mod_blocks', $mod_blocks);
} elseif(isset($mod_search)) {
$modulesObj->setVar('mod_search', $mod_search);
} elseif(isset($mod_comments)) {
@@ -232,7 +246,7 @@
} else {
redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
}
- }
+ //}
break;
}
include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/tables.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -76,7 +76,8 @@
$mod['name'] = $mods_arr[$i]->getVar('mod_name');
$mod['image'] = $mods_arr[$i]->getVar('mod_image');
$mod['admin'] = $mods_arr[$i]->getVar('mod_admin');
- $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['user'] = $mods_arr[$i]->getVar('mod_user');
+ $mod['blocks'] = $mods_arr[$i]->getVar('mod_blocks');
$mod['search'] = $mods_arr[$i]->getVar('mod_search');
$mod['comments'] = $mods_arr[$i]->getVar('mod_comments');
$mod['notifications'] = $mods_arr[$i]->getVar('mod_notifications');
@@ -248,41 +249,63 @@
}
break;
- case 'display':
- $tableBlocks = XoopsRequest::getInt('table_blocks');
- $tableAdmin = XoopsRequest::getInt('table_admin');
- $tableUser = XoopsRequest::getInt('table_user');
- $tableSubmenu = XoopsRequest::getInt('table_submenu');
- $tableSearch = XoopsRequest::getInt('table_search');
- $tableComments = XoopsRequest::getInt('table_comments');
- $tableNotifications = XoopsRequest::getInt('table_notifications');
- $tablePermissions = XoopsRequest::getInt('table_permissions');
-
- if ( $tableId > 0 ) {
- $tablesObj =& $tdmcreate->getHandler('tables')->get($tableId);
- if(isset($tableBlocks)) {
- $tablesObj->setVar('table_blocks', $tableBlocks);
- } elseif(isset($tableAdminm)) {
- $tablesObj->setVar('table_admin', $tableAdmin);
- } elseif(isset($tableUser)) {
- $tablesObj->setVar('table_user', $tableUser);
- } elseif(isset($tableSubmenu)) {
- $tablesObj->setVar('table_submenu', $tableSubmenu);
- } elseif(isset($tableSearch)) {
- $tablesObj->setVar('table_search', $tableSearch);
- } elseif(isset($tableComments)) {
- $tablesObj->setVar('table_comments', $tableComments);
- } elseif(isset($tableNotifications)) {
- $tablesObj->setVar('table_notifications', $tableNotifications);
- } elseif(isset($tablePermissions)) {
- $tablesObj->setVar('table_permissions', $tablePermissions);
+ case 'display_modules':
+ foreach($_POST['mod_id'] as $key => $value)
+ {
+ $moduleAdmin = XoopsRequest::getInt('mod_admin');
+ $moduleUser = XoopsRequest::getInt('mod_user');
+ $moduleBlocks = XoopsRequest::getInt('mod_blocks');
+ $moduleSearch = XoopsRequest::getInt('mod_search');
+ $moduleComments = XoopsRequest::getInt('mod_comments');
+ $moduleNotifications = XoopsRequest::getInt('mod_notifications');
+ $modulePermissions = XoopsRequest::getInt('mod_permissions');
+
+ if( $tableMid > 0 ) {
+ $modulesObj =& $tdmcreate->getHandler('modules')->get($tableMid);
+ $modulesObj->setVar('mod_admin', ((isset($_REQUEST['mod_admin'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_user', ((isset($_REQUEST['mod_user'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_blocks', ((isset($_REQUEST['mod_blocks'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_search', ((isset($_REQUEST['mod_search'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_comments', ((isset($_REQUEST['mod_comments'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_notifications', ((isset($_REQUEST['mod_notifications'][$key]) == 1) ? 0 : 1));
+ $modulesObj->setVar('mod_permissions', ((isset($_REQUEST['mod_permissions'][$key]) == 1) ? 0 : 1));
+ if($tdmcreate->getHandler('modules')->insert($modulesObj, true)) {
+ redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ } else {
+ redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ }
}
- if ($tdmcreate->getHandler('tables')->insert($tablesObj, true)) {
- redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
- } else {
- redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ }
+ break;
+
+ case 'display_tables':
+ foreach($_POST['table_id'] as $key => $value)
+ {
+ $tableAdmin = XoopsRequest::getInt('table_admin');
+ $tableUser = XoopsRequest::getInt('table_user');
+ $tableBlocks = XoopsRequest::getInt('table_blocks');
+ $tableSubmenu = XoopsRequest::getInt('table_submenu');
+ $tableSearch = XoopsRequest::getInt('table_search');
+ $tableComments = XoopsRequest::getInt('table_comments');
+ $tableNotifications = XoopsRequest::getInt('table_notifications');
+ $tablePermissions = XoopsRequest::getInt('table_permissions');
+
+ if( $tableId > 0 ) {
+ $tablesObj =& $tdmcreate->getHandler('tables')->get($tableId);
+ $tablesObj->setVar('table_admin', ((isset($_REQUEST['table_admin'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_user', ((isset($_REQUEST['table_user'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_blocks', ((isset($_REQUEST['table_blocks'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_submenu', ((isset($_REQUEST['table_submenu'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_search', ((isset($_REQUEST['table_search'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_comments', ((isset($_REQUEST['table_comments'][$key]) == 1) ? 0 : 1));
+ $tablesObj->setVar('table_notifications', ((isset($_REQUEST['table_notifications'][$key]) == 1) ? 0 : 1));
+ if($tdmcreate->getHandler('tables')->insert($tablesObj, true)) {
+ redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS);
+ } else {
+ redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_FAILED);
+ }
}
- }
- break;
+ }
+ break;
}
include 'footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/header.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -45,13 +45,14 @@
* @public function write
* @param string $module
* @param mixed $table
+ * @param array $tables
* @param string $filename
*/
public function write($module, $table, $tables, $filename) {
- $this->setModule($module);
- $this->setFileName($filename);
+ $this->setModule($module);
$this->setTable($table);
$this->setTables($tables);
+ $this->setFileName($filename);
}
/*
* @public function render
@@ -63,39 +64,35 @@
$tables = $this->getTables();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
- $ucfModuleName = ucfirst($moduleDirname);
+ $ucfModuleDirname = ucfirst($moduleDirname);
$language = $this->getLanguage('AM');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
\nrequire_once dirname(dirname(dirname(dirname(__FILE__)))). '/include/cp_header.php';
\$thisPath = dirname(dirname(__FILE__));
include_once \$thisPath.'/include/common.php';
-//\n
+\$sysPathIcon16 = '../' . \$xoopsModule->getInfo('sysicons16');
+\$sysPathIcon32 = '../' . \$xoopsModule->getInfo('sysicons32');
+\$pathModuleAdmin = \$GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
+//
+\$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
+\$modPathIcon32 = \$xoopsModule->getInfo('modicons32');\n
EOT;
if (is_object($table)) {
if ( $table->getVar('table_name') != '' ) {
$content .= <<<EOT
// Get instance of module
-\${$moduleDirname} = {$ucfModuleName}Helper::getInstance();\n
+\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();\n
EOT;
- }
- }
- $content .= <<<EOT
-//
-\$sysPathIcon16 = '../' . \$xoopsModule->getInfo('sysicons16');
-\$sysPathIcon32 = '../' . \$xoopsModule->getInfo('sysicons32');
-\$pathModuleAdmin = \$GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');
-//
-\$modPathIcon16 = \$xoopsModule->getInfo('modicons16');
-\$modPathIcon32 = \$xoopsModule->getInfo('modicons32');
-//\n
-EOT;
- foreach (array_keys($tables) as $i)
- {
- $tableName = $tables[$i]->getVar('table_name');
- $content .= <<<EOT
+ }
+ foreach (array_keys($tables) as $t)
+ {
+ $tableName = $tables[$t]->getVar('table_name');
+ $content .= <<<EOT
+// {$tableName}
\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');\n
EOT;
+ }
}
$content .=<<<EOT
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -39,7 +39,7 @@
* @param string $tableName
* @param string $fieldName
*/
- public function getSimpleSetVar($tableName, $fieldName) {
+ public function getSimpleSetVar($tableName, $fieldName) {
$ret = <<<EOT
// Set Var {$fieldName}
\${$tableName}Obj->setVar('{$fieldName}', \$_POST['{$fieldName}']);\n
@@ -169,6 +169,23 @@
return $ret;
}
/*
+ * @public function getTopicGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $tableNameTopic
+ * @param string $fieldNameParent
+ * @param string $fieldNameTopic
+ */
+ public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldNameParent}
+\t\t\t\t\${$rpFieldName} =& \${$tableNameTopic}Handler->get(\${$tableName}_arr[\$i]->getVar('{$fieldNameParent}'));
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$rpFieldName}->getVar('{$fieldNameTopic}');\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getUploadImageGetVar
* @param string $lpFieldName
* @param string $rpFieldName
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -79,15 +79,17 @@
/*
* @public function getAdminPagesList
* @param string $moduleDirname
- * @param string $tableName
+ * @param string $table
* @param string $tableFieldname
* @param string $language
* @param string $fields
* @param string $fpif
* @param string $fpmf
*/
- public function getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $tableAutoincrement, $language, $fields, $fpif, $fpmf) {
+ public function getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fpmf) {
$stuModuleDirname = strtoupper($moduleDirname);
+ $tableName = $table->getVar('table_name');
+ $tableAutoincrement = $table->getVar('table_autoincrement');
$stuTableName = strtoupper($tableName);
$stuTableFieldname = strtoupper($tableFieldname);
$ret = <<<EOT
@@ -116,6 +118,7 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
+ $fieldParent = $fields[$f]->getVar('field_parent');
// Verify if table_fieldname is not empty
$lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
@@ -137,7 +140,30 @@
$ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
- $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ if( ($fieldParent == 1) && !$table->getVar('table_category') ) {
+ if($fieldElement > 13) {
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
+ $fieldElementName = $fieldElements->getVar('fieldelement_name');
+ $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
+ }
+ //
+ $fieldNameParent = $fieldName;
+ //
+ $criteriaFieldsTopic = new CriteriaCompo();
+ $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
+ $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
+ unset($criteriaFieldsTopic);
+ foreach(array_keys($fieldsTopic) as $ft)
+ {
+ if( $fieldsTopic[$ft]->getVar('field_main') == 1 ) {
+ $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
+ }
+ }
+ $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic);
+ } else {
+ $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ }
break;
}
}
@@ -326,8 +352,7 @@
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
$tableName = $table->getVar('table_name');
- $tableFieldname = $table->getVar('table_fieldname');
- $tableAutoincrement = $table->getVar('table_autoincrement');
+ $tableFieldname = $table->getVar('table_fieldname');
$language = $this->getLanguage($moduleDirname, 'AM');
$fields = $this->getTableFields($table->getVar('table_id'));
foreach(array_keys($fields) as $f)
@@ -342,7 +367,7 @@
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fpif);
- $content .= $this->getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $tableAutoincrement, $language, $fields, $fpif, $fpmf);
+ $content .= $this->getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fpmf);
$content .= $this->getAdminPagesNew($moduleDirname, $tableName, $language);
$content .= $this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf);
$content .= $this->getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -81,7 +81,8 @@
public function createBaseFoldersFiles( $module )
{
// Module
- $modId = $module->getVar('mod_id');
+ $modId = $module->getVar('mod_id');
+ $language = $GLOBALS['xoopsConfig']['language'];
// Id of tables
$criteriaTables = new CriteriaCompo();
$criteriaTables->add(new Criteria('table_mid', $modId));
@@ -142,7 +143,7 @@
$logoGifFrom = $uploadImagesRepository.'/'.$stlModuleAuthor.'_logo.gif';
if (!file_exists($logoGifFrom)) {
copy($logosFolder.'/'.$stlModuleAuthor.'_logo.gif', $logoGifFrom);
- }
+ }
// Creation of 'module_author_logo.gif' file
$this->structure->copyFile('assets/images', $logoGifFrom, $stlModuleAuthor.'_logo.gif');
// Creation of "images" folder and index.html file
@@ -163,10 +164,15 @@
$this->structure->makeDirAndCopyFile('include', $indexFile, 'index.html');
// Creation of "language" folder and index.html file
$this->structure->makeDirAndCopyFile('language', $indexFile, 'index.html');
+ // Creation of 'default english' folder
+ if($language != 'english' ) {
+ // Creation of "english" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
+ }
// Creation of "language/local_language" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'], $indexFile, 'index.html');
+ $this->structure->makeDirAndCopyFile('language/'.$language, $indexFile, 'index.html');
// Creation of "language/local_language/help" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help', $indexFile, 'index.html');
+ $this->structure->makeDirAndCopyFile('language/'.$language. '/help', $indexFile, 'index.html');
if( $module->getVar('mod_admin') == 1 ) {
// Creation of "templates" folder and index.html file
$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
@@ -186,7 +192,7 @@
}
if( $table->getVar('table_notifications') == 1 ) {
// Creation of "mail_template" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'].'/mail_template', $indexFile, 'index.html');
+ $this->structure->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
}
}
}
@@ -318,6 +324,14 @@
$languageAdmin->write($module, $tables, 'admin.php');
$ret[] = $languageAdmin->render();
}
+ // Class Helper File
+ $classHelper = ClassHelper::getInstance();
+ $classHelper->write($module, 'helper.php');
+ $ret[] = $classHelper->render();
+ // Include Functions File
+ $includeFunctions = IncludeFunctions::getInstance();
+ $includeFunctions->write($module, 'functions.php');
+ $ret[] = $includeFunctions->render();
// Creation of blocks language file
if (is_object($table)) {
// Include Install File
@@ -329,11 +343,7 @@
$languageBlocks = LanguageBlocks::getInstance();
$languageBlocks->write($module, $tables, 'blocks.php');
$ret[] = $languageBlocks->render();
- }
- // Class Helper File
- $classHelper = ClassHelper::getInstance();
- $classHelper->write($module, 'helper.php');
- $ret[] = $classHelper->render();
+ }
// Creation of admin files
if ( $table->getVar('table_admin') == 1) {
// Creation of admin permission file
@@ -364,11 +374,7 @@
// Sql File
$sqlFile = SqlFile::getInstance();
$sqlFile->write($module, $tables, 'mysql.sql');
- $ret[] = $sqlFile->render();
- // Include Functions File
- $includeFunctions = IncludeFunctions::getInstance();
- $includeFunctions->write($module, 'functions.php');
- $ret[] = $includeFunctions->render();
+ $ret[] = $sqlFile->render();
// Include Update File
$includeUpdate = IncludeUpdate::getInstance();
$includeUpdate->write($module, 'update.php');
@@ -407,33 +413,9 @@
$includeCommentFunctions = IncludeCommentFunctions::getInstance();
$includeCommentFunctions->write($module, $table, 'comment_functions.php');
$ret[] = $includeCommentFunctions->renderFile();
- }
- // Creation of user files
- if ( ($table->getVar('table_user') == 1)) {
- // User Footer File
- $userFooter = UserFooter::getInstance();
- $userFooter->write($module, 'footer.php');
- $ret[] = $userFooter->render();
- // User Header File
- $userHeader = UserHeader::getInstance();
- $userHeader->write($module, 'header.php');
- $ret[] = $userHeader->render();
- // User Notification Update File
- if ( ($table->getVar('table_notifications') == 1 )) {
- $userNotificationUpdate = UserNotificationUpdate::getInstance();
- $userNotificationUpdate->write($module, 'notification_update.php');
- $ret[] = $userNotificationUpdate->render();
- }
- // User Index File
- $userIndex = UserIndex::getInstance();
- $userIndex->write($module, 'index.php');
- $ret[] = $userIndex->render();
- // Language Main File
- $languageMain = LanguageMain::getInstance();
- $languageMain->write($module, $tables, 'main.php');
- $ret[] = $languageMain->render();
- }
+ }
}
+ // Creation of admin files
if( $module->getVar('mod_admin') == 1 ) {
// Templates Index File
$userTemplatesIndex = TemplatesUserIndex::getInstance();
@@ -447,6 +429,31 @@
$userTemplatesHeader = TemplatesUserHeader::getInstance();
$userTemplatesHeader->write($module, $tables, $moduleDirname.'_header.tpl');
$ret[] = $userTemplatesHeader->render();
+ }
+ // Creation of user files
+ if( $module->getVar('mod_user') == 1 ) {
+ // User Footer File
+ $userFooter = UserFooter::getInstance();
+ $userFooter->write($module, 'footer.php');
+ $ret[] = $userFooter->render();
+ // User Header File
+ $userHeader = UserHeader::getInstance();
+ $userHeader->write($module, $table, $tables, 'header.php');
+ $ret[] = $userHeader->render();
+ // User Notification Update File
+ if ( ($module->getVar('mod_notifications') == 1 )) {
+ $userNotificationUpdate = UserNotificationUpdate::getInstance();
+ $userNotificationUpdate->write($module, 'notification_update.php');
+ $ret[] = $userNotificationUpdate->render();
+ }
+ // User Index File
+ $userIndex = UserIndex::getInstance();
+ $userIndex->write($module, 'index.php');
+ $ret[] = $userIndex->render();
+ // Language Main File
+ $languageMain = LanguageMain::getInstance();
+ $languageMain->write($module, $tables, 'main.php');
+ $ret[] = $languageMain->render();
}
// Css Styles File
$cssStyles = CssStyles::getInstance();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/common.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -89,13 +89,9 @@
<img src='".\$local_logo."' alt='{$moduleAuthorWebsiteName}' /></a>";
include_once XOOPS_ROOT_PATH.'/class/xoopsrequest.php';
-EOT;
- if (is_object($table)) {
- $ret .= <<<EOT
include_once {$stuModuleDirname}_PATH.'/class/helper.php';
include_once {$stuModuleDirname}_PATH.'/include/functions.php';
EOT;
- }
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/include/notifications.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -51,8 +51,8 @@
*/
public function write($module, $table, $filename) {
$this->setModule($module);
- $this->setFileName($filename);
$this->setTable($table);
+ $this->setFileName($filename);
}
/*
* @static function getNotificationsFunction
@@ -72,15 +72,15 @@
}
if($fields[$f]->getVar('field_main') == 1) {
$fpmf = $fieldName;
- }
+ }
}
$ret = <<<EOT
\n// comment callback functions
function {$moduleDirname}_notify_iteminfo(\$category, \$item_id)
{
- global \$xoopsModule, \$xoopsModuleConfig, \$xoopsConfig;
-
+ global \$xoopsModule, \$xoopsModuleConfig, \$xoopsDB;
+ //
if (empty(\$xoopsModule) || \$xoopsModule->getVar('dirname') != '{$moduleDirname}')
{
\$module_handler =& xoops_gethandler('module');
@@ -90,11 +90,8 @@
} else {
\$module =& \$xoopsModule;
\$config =& \$xoopsModuleConfig;
- }
+ }
//
- xoops_loadLanguage('main', '{$moduleDirname}');
- //
- global \$xoopsDB;
switch(\$category) {
case 'global':
\$item['name'] = '';
@@ -103,7 +100,7 @@
break;
case 'category':
// Assume we have a valid category id
- \$sql = 'SELECT {$fpif}, {$fpmf} FROM ' . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fpif} = '. \$item_id;
+ \$sql = 'SELECT {$fpmf} FROM ' . \$xoopsDB->prefix('{$moduleDirname}_{$tableName}') . ' WHERE {$fpif} = '. \$item_id;
\$result = \$xoopsDB->query(\$sql); // TODO: error check
\$result_array = \$xoopsDB->fetchArray(\$result);
\$item['name'] = \$result_array['{$fpmf}'];
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-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -65,7 +65,7 @@
*/
public function getLanguageAdminIndex($language, $tables)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Index ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Index');
$ret .= $this->defines->getDefine($language, 'STATISTICS', "Statistics");
$ret .= $this->defines->getAboveDefines('There are');
foreach (array_keys($tables) as $t)
@@ -84,7 +84,7 @@
*/
public function getLanguageAdminPages($language, $tables)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Files ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Files');
$ret .= $this->defines->getAboveDefines('There aren\'t');
foreach (array_keys($tables) as $t)
{
@@ -127,7 +127,7 @@
*/
public function getLanguageAdminClass($language, $tables)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Classes ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Classes');
//
foreach (array_keys($tables) as $t)
{
@@ -186,7 +186,7 @@
*/
public function getLanguageAdminPermissions($language)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Permissions ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Permissions');
$ret .= $this->defines->getAboveDefines('Permissions');
$ret .= $this->defines->getDefine($language, 'GLOBAL', "Permissions global");
$ret .= $this->defines->getDefine($language, 'GLOBAL_DESC', "Permissions global");
@@ -208,9 +208,9 @@
*/
public function getLanguageAdminFoot($language)
{
- $ret = $this->defines->getAboveDefines('---------------- Admin Others ----------------');
+ $ret = $this->defines->getAboveHeadDefines('Admin Others');
$ret .= $this->defines->getDefine($language, 'MAINTAINEDBY', " is maintained by ");
- $ret .= $this->defines->getBelowDefines('---------------- End ----------------');
+ $ret .= $this->defines->getBelowDefines('End');
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -66,9 +66,7 @@
private function getLanguageBlock($module, $language)
{
$tables = $this->getTables();
- $ret = <<<EOT
-// Admin Edit\n
-EOT;
+ $ret = $this->defines->getAboveDefines('Admin Edit');
$ret .= $this->defines->getDefine($language, 'DISPLAY', "How Many Tables to Display");
$ret .= $this->defines->getDefine($language, 'TITLELENGTH', "Title Length");
$ret .= $this->defines->getDefine($language, 'CATTODISPLAY', "Categories to Display");
@@ -77,9 +75,7 @@
{
$tableName = $tables[$t]->getVar('table_name');
$ucfTableName = ucfirst($tableName);
- $ret .= <<<EOT
-// {$ucfTableName}\n
-EOT;
+ $ret .= $this->defines->getAboveDefines($ucfTableName);
$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
@@ -102,9 +98,7 @@
*/
private function getLanguageFooter()
{
- $ret = <<<EOT
-// ---------------- End ----------------
-EOT;
+ $ret = $this->defines->getBelowDefines('End');
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -100,11 +100,13 @@
}
/*
* @private function geLanguagetMainFooter
- * @param null
+ * @param string $language
*/
- private function geLanguagetMainFooter()
+ private function geLanguagetMainFooter($language)
{
- $ret = $this->defines->getBelowDefines('End');
+ $ret = $this->defines->getAboveDefines('Admin link');
+ $ret .= $this->defines->getDefine($language, 'ADMIN', "Admin");
+ $ret .= $this->defines->getBelowDefines('End');
return $ret;
}
/*
@@ -118,7 +120,7 @@
$language = $this->getLanguage($moduleDirname, 'MA');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->geLanguagetMain($module, $language);
- $content .= $this->geLanguagetMainFooter();
+ $content .= $this->geLanguagetMainFooter($language);
//
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -167,16 +167,23 @@
private function getLanguageConfig($language, $table)
{
$ret = $this->defines->getAboveDefines('Config');
- $ret .= $this->defines->getDefine($language, "EDITOR", "Editor");
- $ret .= $this->defines->getDefine($language, "EDITOR_DESC", "Select the Editor to use");
+ if (is_object($table)) {
+ if ( $table->getVar('table_image') != '' )
+ {
+ $ret .= $this->defines->getDefine($language, "EDITOR", "Editor");
+ $ret .= $this->defines->getDefine($language, "EDITOR_DESC", "Select the Editor to use");
+ }
+ }
$ret .= $this->defines->getDefine($language, "KEYWORDS", "Keywords");
$ret .= $this->defines->getDefine($language, "KEYWORDS_DESC", "Insert here the keywords (separate by comma)");
- if ( $table->getVar('table_image') != '' )
- {
- $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size");
- $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte");
- $ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
- $ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
+ if (is_object($table)) {
+ if ( $table->getVar('table_image') != '' )
+ {
+ $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size");
+ $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
+ }
}
$ret .= $this->defines->getDefine($language, "IDPAYPAL", "Paypal ID");
$ret .= $this->defines->getDefine($language, "IDPAYPAL_DESC", "Insert here your PayPal ID for donactions.");
@@ -281,9 +288,11 @@
}
if ( $table->getVar('table_submenu') == 1 ) {
$content .= $this->getLanguageSubmenu($language, $tables);
- }
+ }
$content .= $this->getLanguageBlocks($language, $tables);
- $content .= $this->getLanguageConfig($language, $table);
+ }
+ $content .= $this->getLanguageConfig($language, $table);
+ if (is_object($table)) {
if ( $table->getVar('table_notifications') == 1 )
{
$content .= $this->getLanguageNotifications($language);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/footer.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -81,11 +81,13 @@
<br />\n
EOT;
}
- $content .= <<<EOT
+ }
+ $content .= <<<EOT
<{if \$xoops_isadmin}>
<div class="center bold"><a href="<{\$admin}>"><{\$smarty.const.{$language}ADMIN}></a></div><br />
<{/if}>\n
EOT;
+ if (is_object($table)) {
if ( $table->getVar('table_comments') == 1 ) {
$content .= <<<EOT
<div class="pad2 marg2">
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/header.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -44,10 +44,14 @@
/*
* @public function write
* @param string $module
+ * @param mixed $table
+ * @param array $tables
* @param string $filename
*/
- public function write($module, $filename) {
- $this->setModule($module);
+ public function write($module, $table, $tables, $filename) {
+ $this->setModule($module);
+ $this->setTable($table);
+ $this->setTables($tables);
$this->setFileName($filename);
}
/*
@@ -56,6 +60,8 @@
*/
public function render() {
$module = $this->getModule();
+ $table = $this->getTable();
+ $tables = $this->getTables();
$moduleDirname = $module->getVar('mod_dirname');
$filename = $this->getFileName();
$stuModuleDirname = strtoupper($moduleDirname);
@@ -66,6 +72,21 @@
\$dirname = \$GLOBALS['xoopsModule']->getVar('dirname');
\$pathname = XOOPS_ROOT_PATH. '/modules/'.\$dirname;
include_once \$pathname . '/include/common.php';
+// Get instance of module
+\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();\n
+EOT;
+ if (is_object($table)) {
+ foreach (array_keys($tables) as $t)
+ {
+ $tableName = $tables[$t]->getVar('table_name');
+ $content .= <<<EOT
+// {$tableName}
+\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');\n
+EOT;
+ }
+ }
+ $content .=<<<EOT
+//
\$myts =& MyTextSanitizer::getInstance();
\$style = {$stuModuleDirname}_URL . '/assets/css/style.css';
if(file_exists(\$style)) { return true; }
@@ -79,8 +100,6 @@
//
xoops_loadLanguage('modinfo', \$dirname);
xoops_loadLanguage('main', \$dirname);
-//
-\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
EOT;
$this->tdmcfile->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/index.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -68,7 +68,7 @@
// Define Stylesheet
\$xoTheme->addStylesheet( \$style );
// keywords
-{$moduleDirname}_meta_keywords(xoops_getModuleOption('keywords', \$dirname));
+{$moduleDirname}_meta_keywords(\${$moduleDirname}->getConfig('keywords'));
// description
{$moduleDirname}_meta_description({$language}DESC);
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -84,6 +84,23 @@
return $ret;
}
/*
+ * @public function getTopicGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $tableNameTopic
+ * @param string $fieldNameParent
+ * @param string $fieldNameTopic
+ */
+ public function getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $tableNameTopic, $fieldNameParent, $fieldNameTopic) {
+ $ret = <<<EOT
+\t\t// Get Var {$fieldNameParent}
+\t\t\${$rpFieldName} =& \${$tableNameTopic}Handler->get(\${$tableName}_arr[\$i]->getVar('{$fieldNameParent}'));
+\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$rpFieldName}->getVar('{$fieldNameTopic}');\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getUploadImageGetVar
* @param string $lpFieldName
* @param string $rpFieldName
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -79,8 +79,6 @@
\$limit = \${$moduleDirname}->getConfig('userpager');
// Define Stylesheet
\$xoTheme->addStylesheet( \$style );
-// Get Handler
-\${$stlTableName}Handler =& \${$moduleDirname}->getHandler('{$stlTableName}');
//
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
@@ -98,6 +96,7 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
+ $fieldParent = $fields[$f]->getVar('field_parent');
// Verify if table_fieldname is not empty
$lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
@@ -121,7 +120,30 @@
$ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
- $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ if( ($fieldParent == 1) && !$table->getVar('table_category') ) {
+ if($fieldElement > 13) {
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
+ $fieldElementName = $fieldElements->getVar('fieldelement_name');
+ $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
+ }
+ //
+ $fieldNameParent = $fieldName;
+ //
+ $criteriaFieldsTopic = new CriteriaCompo();
+ $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
+ $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
+ unset($criteriaFieldsTopic);
+ foreach(array_keys($fieldsTopic) as $ft)
+ {
+ if( $fieldsTopic[$ft]->getVar('field_main') == 1 ) {
+ $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
+ }
+ }
+ $ret .= $this->userobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic);
+ } else {
+ $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ }
break;
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 04:36:09 UTC (rev 12731)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 17:13:26 UTC (rev 12732)
@@ -339,7 +339,7 @@
'show_func' => "b_{$moduleDirname}_{$tableName}_show",
'edit_func' => "b_{$moduleDirname}_{$tableName}_edit",
'options' => "{$tables[$i]->getVar('table_fieldname')}|5|25|0",
- 'template' => "'{$moduleDirname}_block_{$tableName}.tpl");\n\n
+ 'template' => "'{$moduleDirname}_block_{$tableName}.tpl");\n
EOT;
}
}
@@ -356,11 +356,12...
[truncated message content] |
