Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13066] XoopsModules/TDMCreate/branches/timgno/1.91a2 /tdmcreate
|
From: <txm...@us...> - 2015-05-24 17:27:09
|
Revision: 13066
http://sourceforge.net/p/xoops/svn/13066
Author: txmodxoops
Date: 2015-05-24 17:27:05 +0000 (Sun, 24 May 2015)
Log Message:
-----------
Fixed bugs!
Continue test with Codeception
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/index.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/css/admin/style.css
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminAbout.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminFooter.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/blocks/BlocksFiles.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeComments.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeNotifications.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeSearch.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageBlocks.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPermissions.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPdf.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPrint.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRate.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSingle.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSubmit.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserViewTag.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserVisit.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/settings.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields_item.tpl
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_modules.tpl
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_tables_item.tpl
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserBroken.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserPdf.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserPrint.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRate.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserSearch.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserSingle.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserSubmit.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSearch.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -22,10 +22,17 @@
$op = XoopsRequest::getString('op', 'default');
$mid = XoopsRequest::getInt('mod_id');
$moduleObj = $tdmcreate->getHandler('modules')->get($mid);
+// Clear cache
+$cacheFile1 = TDMC_CLASSES_PATH . '/cache/classpaths.cache';
+$cacheFile2 = TDMC_CLASSES_PATH . '/files/cache/classpaths.cache';
+if (file_exists($cacheFile1) && file_exists($cacheFile2)) {
+ unlink($cacheFile1);
+ unlink($cacheFile2);
+}
// Switch option
switch ($op) {
case 'build':
- $template_main = 'tdmcreate_building.tpl';
+ $templateMain = 'tdmcreate_building.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
// Get var module dirname
$moduleDirname = $moduleObj->getVar('mod_dirname');
@@ -72,7 +79,7 @@
case 'default':
default:
- $template_main = 'tdmcreate_building.tpl';
+ $templateMain = 'tdmcreate_building.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
// Redirect if there aren't modules
$nbModules = $tdmcreate->getHandler('modules')->getCount();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -34,7 +34,7 @@
$start = XoopsRequest::getInt('start', 0);
$limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager'));
// Define main template
- $template_main = 'tdmcreate_fields.tpl';
+ $templateMain = 'tdmcreate_fields.tpl';
$GLOBALS['xoTheme']->addStylesheet( 'modules/tdmcreate/assets/css/admin/style.css' );
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
@@ -143,7 +143,7 @@
case 'new':
// Define main template
- $template_main = 'tdmcreate_fields.tpl';
+ $templateMain = 'tdmcreate_fields.tpl';
$GLOBALS['xoTheme']->addStylesheet( 'modules/tdmcreate/assets/css/admin/style.css' );
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
@@ -227,7 +227,7 @@
case 'edit':
// Define main template
- $template_main = 'tdmcreate_fields.tpl';
+ $templateMain = 'tdmcreate_fields.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/footer.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/footer.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -19,7 +19,7 @@
* @version $Id: footer.php 12207 2013-10-23 02:46:52Z beckmi $
*/
$GLOBALS['xoopsTpl']->assign('module_name', $GLOBALS['xoopsModule']->getVar('name'));
-if (isset($template_main)) {
- $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+if (isset($templateMain)) {
+ $GLOBALS['xoopsTpl']->display("db:{$templateMain}");
}
xoops_cp_footer();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/index.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/index.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -24,7 +24,7 @@
$count_tables = $tdmcreate->getHandler('tables')->getCount($criteria);
$count_fields = $tdmcreate->getHandler('fields')->getCount($criteria);
unset($criteria);
-$template_main = 'tdmcreate_index.tpl';
+$templateMain = 'tdmcreate_index.tpl';
$adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES);
$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMMODULES . '</label>', $count_modules, 'Green');
$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMTABLES . '</label>', $count_tables, 'Orange');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -30,7 +30,7 @@
$start = XoopsRequest::getInt('start', 0);
$limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
// Define main template
- $template_main = 'tdmcreate_modules.tpl';
+ $templateMain = 'tdmcreate_modules.tpl';
$GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
$GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
@@ -83,7 +83,7 @@
case 'new':
// Define main template
- $template_main = 'tdmcreate_modules.tpl';
+ $templateMain = 'tdmcreate_modules.tpl';
$GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list');
@@ -177,7 +177,7 @@
case 'edit':
// Define main template
- $template_main = 'tdmcreate_modules.tpl';
+ $templateMain = 'tdmcreate_modules.tpl';
$GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -22,16 +22,16 @@
// Recovered value of argument op in the URL $
$op = XoopsRequest::getString('op', 'edit');
//
-$modId = XoopsRequest::getInt('set_id');
+$setId = XoopsRequest::getInt('set_id');
//
switch ($op) {
case 'edit':
default:
// Define main template
- $template_main = 'tdmcreate_settings.tpl';
+ $templateMain = 'tdmcreate_settings.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('settings.php'));
- $settingsObj = $tdmcreate->getHandler('settings')->get($modId);
- $form = $settingsObj->getForm();
+ $settingsObj = $tdmcreate->getHandler('settings')->get($setId);
+ $form = $settingsObj->getForm();
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
@@ -39,8 +39,8 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('settings.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- if (isset($modId)) {
- $settingsObj =& $tdmcreate->getHandler('settings')->get($modId);
+ if (isset($setId)) {
+ $settingsObj =& $tdmcreate->getHandler('settings')->get($setId);
}
$moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['set_dirname']));
//Form module save
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -36,7 +36,7 @@
$start = XoopsRequest::getInt('start', 0);
$limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager'));
// Define main template
- $template_main = 'tdmcreate_tables.tpl';
+ $templateMain = 'tdmcreate_tables.tpl';
$GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css');
$GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js');
@@ -132,7 +132,7 @@
case 'new':
// Define main template
- $template_main = 'tdmcreate_tables.tpl';
+ $templateMain = 'tdmcreate_tables.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list');
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
@@ -230,7 +230,7 @@
case 'edit':
// Define main template
- $template_main = 'tdmcreate_tables.tpl';
+ $templateMain = 'tdmcreate_tables.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('tables.php'));
$adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add');
$adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=list', 'list');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/css/admin/style.css
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/css/admin/style.css 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/css/admin/style.css 2015-05-24 17:27:05 UTC (rev 13066)
@@ -22,8 +22,7 @@
body {
background: #fafafa;
color: #444;
- font-family: verdana, arial, tahoma, helvetica, sans-serif;
- text-shadow: 1px 1px 1px #fff;
+ font-family: verdana, arial, tahoma, helvetica, sans-serif;
}
table { margin: 0; padding: 0; width: 100%; }
@@ -52,6 +51,7 @@
tr.modules td.name {
min-width: 70px;
+ text-shadow: 1px 1px 1px #fff;
}
tr.tables td {
@@ -65,6 +65,7 @@
tr.tables td.name {
min-width: 70px;
+ text-shadow: 1px 1px 1px #fff;
}
tr.tables-fields td {
@@ -78,6 +79,7 @@
tr.tables-fields td.name {
min-width: 70px;
+ text-shadow: 1px 1px 1px #fff;
}
tr.fields td {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -19,7 +19,6 @@
* @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-include __DIR__ . '/TDMCreateAutoload.php';
/*
* @Class TDMCreateFields
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -31,6 +31,7 @@
* @var mixed
*/
private $tdmcreate;
+
/*
* @var mixed
*/
@@ -46,6 +47,7 @@
public function __construct()
{
$this->tdmcreate = TDMCreateHelper::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
$this->structure = TDMCreateStructure::getInstance();
$this->structure->setUploadPath(TDMC_UPLOAD_REPOSITORY_PATH);
}
@@ -80,10 +82,7 @@
$modId = $module->getVar('mod_id');
$language = $GLOBALS['xoopsConfig']['language'];
// Id of tables
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_mid', $modId));
- $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria);
- unset($criteria);
+ $tables = $this->tdmcfile->getTableTables($modId);
//
$table = null;
foreach (array_keys($tables) as $t) {
@@ -96,6 +95,8 @@
}
//
$indexFile = XOOPS_UPLOAD_PATH . '/index.html';
+ $cache1 = TDMC_CLASSES_PATH . '/cache';
+ $cache2 = TDMC_CLASSES_PATH . '/files/cache';
$stlModuleAuthor = str_replace(' ', '', strtolower($module->getVar('mod_author')));
$this->structure->setModuleName($module->getVar('mod_dirname'));
$uploadPath = $this->structure->getUploadPath();
@@ -173,6 +174,8 @@
$this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
// Creation of "language/english/help" folder and index.html file
$this->structure->makeDirAndCopyFile('language/english/help', $indexFile, 'index.html');
+ // Creation of "preloads" folder and index.html file
+ $this->structure->makeDirAndCopyFile('preloads', $indexFile, 'index.html');
if (1 == $module->getVar('mod_admin')) {
// Creation of "templates" folder and index.html file
$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
@@ -210,16 +213,11 @@
public function createFilesToBuilding($module)
{
// Module
- $modId = $module->getVar('mod_id');
- $moduleDirname = $module->getVar('mod_dirname');
- $icon32 = 'assets/icons/32';
- // Id of tables
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_mid', $modId));
- $criteria->setSort('table_order');
- $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria);
- unset($criteria);
- $ret = array();
+ $modId = $module->getVar('mod_id');
+ $moduleDirname = $module->getVar('mod_dirname');
+ $icon32 = 'assets/icons/32';
+ $tables = $this->tdmcfile->getTableTables($modId);
+ $ret = array();
//
$table = array();
foreach (array_keys($tables) as $t) {
@@ -353,7 +351,7 @@
if (1 == $table->getVar('table_permissions')) {
// Admin Permissions File
$adminPermissions = AdminPermissions::getInstance();
- $adminPermissions->write($module, $tables, 'permissions.php');
+ $adminPermissions->write($module, $table, $tables, 'permissions.php');
$ret[] = $adminPermissions->render();
// Templates Admin Permissions File
$adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
@@ -448,18 +446,90 @@
$userNotificationUpdate->write($module, 'notification_update.php');
$ret[] = $userNotificationUpdate->render();
}
+ // User Broken File
+ if ((1 == $table->getVar('table_broken'))) {
+ $userBroken = UserBroken::getInstance();
+ $userBroken->write($module, $table, 'broken.php');
+ $ret[] = $userBroken->render();
+ // User Templates Broken File
+ $userTemplatesBroken = TemplatesUserBroken::getInstance();
+ $userTemplatesBroken->write($module, $table);
+ $ret[] = $userTemplatesBroken->renderFile($moduleDirname . '_broken.tpl');
+ }
+ // User Pdf File
+ if ((1 == $table->getVar('table_pdf'))) {
+ $userPdf = UserPrint::getInstance();
+ $userPdf->write($module, $table, 'pdf.php');
+ $ret[] = $userPdf->render();
+ // User Templates Pdf File
+ $userTemplatesPdf = TemplatesUserPdf::getInstance();
+ $userTemplatesPdf->write($module, $table);
+ $ret[] = $userTemplatesPdf->renderFile($moduleDirname . '_pdf.tpl');
+ }
// User Print File
if ((1 == $table->getVar('table_print'))) {
$userPrint = UserPrint::getInstance();
$userPrint->write($module, $table, 'print.php');
$ret[] = $userPrint->render();
+ // User Templates Print File
+ $userTemplatesPrint = TemplatesUserPrint::getInstance();
+ $userTemplatesPrint->write($module, $table);
+ $ret[] = $userTemplatesPrint->renderFile($moduleDirname . '_print.tpl');
}
+ // User Rate File
+ if ((1 == $table->getVar('table_rate'))) {
+ $userRate = UserRate::getInstance();
+ $userRate->write($module, $table, 'rate.php');
+ $ret[] = $userRate->render();
+ // User Templates Rate File
+ $userTemplatesRate = TemplatesUserRate::getInstance();
+ $userTemplatesRate->write($module, $table);
+ $ret[] = $userTemplatesRate->renderFile($moduleDirname . '_rate.tpl');
+ }
// User Rss File
if ((1 == $table->getVar('table_rss'))) {
$userRss = UserRss::getInstance();
$userRss->write($module, $table, 'rss.php');
$ret[] = $userRss->render();
+ // User Templates Rss File
+ $userTemplatesRss = TemplatesUserRss::getInstance();
+ $userTemplatesRss->write($module, $table);
+ $ret[] = $userTemplatesRss->renderFile($moduleDirname . '_rss.tpl');
}
+ // User Single File
+ if ((1 == $table->getVar('table_single'))) {
+ $userSingle = UserSingle::getInstance();
+ $userSingle->write($module, $table, 'single.php');
+ $ret[] = $userSingle->render();
+ // User Templates Single File
+ $userTemplatesSingle = TemplatesUserSingle::getInstance();
+ $userTemplatesSingle->write($module, $table);
+ $ret[] = $userTemplatesSingle->renderFile($moduleDirname . '_single.tpl');
+ }
+ // User Submit File
+ if ((1 == $table->getVar('table_submit'))) {
+ $userSubmit = UserSubmit::getInstance();
+ $userSubmit->write($module, $table, 'submit.php');
+ $ret[] = $userSubmit->render();
+ // User Templates Submit File
+ $userTemplatesSubmit = TemplatesUserSubmit::getInstance();
+ $userTemplatesSubmit->write($module, $table);
+ $ret[] = $userTemplatesSubmit->renderFile($moduleDirname . '_submit.tpl');
+ }// User Visit File
+ if ((1 == $table->getVar('table_visit'))) {
+ $userVisit = UserVisit::getInstance();
+ $userVisit->write($module, $table, 'visit.php');
+ $ret[] = $userVisit->render();
+ }
+ // User Tag Files
+ if ((1 == $table->getVar('table_tag'))) {
+ $userListTag = UserListTag::getInstance();
+ $userListTag->write($module, 'list.tag.php');
+ $ret[] = $userListTag->render();
+ $userViewTag = UserViewTag::getInstance();
+ $userViewTag->write($module, 'view.tag.php');
+ $ret[] = $userViewTag->render();
+ }
// User Index File
$userIndex = UserIndex::getInstance();
$userIndex->write($module, 'index.php');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -50,8 +50,8 @@
}
}
- $serialized_paths = serialize($pathCache);
- if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); }
+ $serializedPaths = serialize($pathCache);
+ if ($serializedPaths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); }
}
spl_autoload_register('applicationAutoloader');
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -94,7 +94,8 @@
*/
public function __construct()
{
- $this->xoopsFile = XoopsFile::getHandler();
+ parent::__construct();
+ $this->xoopsFile = XoopsFile::getHandler();
$this->tdmcreate = TDMCreateHelper::getInstance();
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -32,16 +32,34 @@
{
$this->tdmcreate = TDMCreateHelper::getInstance();
}
+
+ /**
+ * @public function getTableTables
+ * @param $mId
+ * @return mixed
+ */
+ public function getTableTables($mId)
+ {
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('table_mid', $mId)); // $mId = module Id
+ $criteria->setSort('table_order');
+ $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria);
+ unset($criteria);
+ return $tables;
+ }
+
/**
* @public function getTableFields
- * @param $tableId
+ * @param $mId
+ * @param $tId
* @return mixed
*/
- public function getTableFields($tableId)
+ public function getTableFields($mId, $tId)
{
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $tableId));
+ $criteria->add(new Criteria('field_mid', $mId)); // $mId = module Id
+ $criteria->add(new Criteria('field_tid', $tId)); // $tId = table Id
$criteria->setSort('field_order');
$fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
unset($criteria);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminAbout.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminAbout.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminAbout.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -85,7 +85,7 @@
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
include __DIR__ . '/header.php';
-\$template_main = '{$moduleDirname}_admin_about.tpl';
+\$templateMain = '{$moduleDirname}_admin_about.tpl';
\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('about.php'));
\$GLOBALS['xoopsTpl']->assign('about', \$adminMenu->renderAbout('{$moduleDonations}', false));
include __DIR__ . '/footer.php';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminFooter.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminFooter.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminFooter.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -84,7 +84,7 @@
$moduleDirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
-if ( isset(\$template_main) ) {
+if ( isset(\$templateMain) ) {
\$GLOBALS['xoopsTpl']->display("db:{\$templateMain}");
}
xoops_cp_footer();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -301,8 +301,7 @@
$ret = <<<EOT
\t\t\t\t// Get Var {$fieldName}
\t\t\t\t\${$fieldName} = \${$tableName}All[\$i]->getVar('{$fieldName}');
-\t\t\t\t\$upload_image = \${$fieldName} ? \${$fieldName} : 'blank.gif';
-\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \$upload_image;\n
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$fieldName} ? \${$fieldName} : 'blank.gif';\n
EOT;
return $ret;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -19,8 +19,6 @@
* @version $Id: pages.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'AdminObjects.php';
-
/**
* Class AdminPages
*/
@@ -83,7 +81,7 @@
public function getAdminPagesHeader($moduleDirname, $tableName, $fieldId)
{
$ucfModuleDirname = ucfirst($moduleDirname);
- $ucfTableName = ucfirst($tableName);
+ $ucfTableName = ucfirst($tableName);
$ret = <<<EOT
include __DIR__ . '/header.php';
//It recovered the value of argument op in URL$
@@ -143,7 +141,7 @@
\${$tableName}Count = \${$tableName}Handler->getCount(\$criteria);
\${$tableName}All = \${$tableName}Handler->getAll(\$criteria);
unset(\$criteria);
- \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_count', \${$tableName}Count);
+ \$GLOBALS['xoopsTpl']->assign('{$tableName}_count', \${$tableName}Count);
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL);
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
// Table view
@@ -248,7 +246,7 @@
$stuTableName = strtoupper($tableName);
$ret = <<<EOT
case 'new':
- \$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
+ \$templateMain = '{$moduleDirname}_admin_{$tableName}.tpl';
\$adminMenu->addItemButton({$language}{$stuTableName}_LIST, '{$tableName}.php', 'list');
\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());
@@ -353,7 +351,7 @@
$stuTableFieldname = strtoupper($tableFieldname);
$ret = <<<EOT
case 'edit':
- \$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
+ \$templateMain = '{$moduleDirname}_admin_{$tableName}.tpl';
\$adminMenu->addItemButton({$language}ADD_{$stuTableSoleName}, '{$tableName}.php?op=new', 'add');
\$adminMenu->addItemButton({$language}{$stuTableName}_LIST, '{$tableName}.php', 'list');
\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
@@ -460,7 +458,7 @@
$moduleDirname = $module->getVar('mod_dirname');
$tableName = $table->getVar('table_name');
$language = $this->tdmcfile->getLanguage($moduleDirname, 'AM');
- $fields = $this->tdmcfile->getTableFields($table->getVar('table_id'));
+ $fields = $this->tdmcfile->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
foreach (array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldInForm = $fields[$f]->getVar('field_inform');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -66,10 +66,11 @@
* @param $tables
* @param $filename
*/
- public function write($module, $tables, $filename)
+ public function write($module, $table, $tables, $filename)
{
$this->setModule($module);
- $this->setTables($tables);
+ $this->setTable($table);
+ $this->setTables($tables);
$this->setFileName($filename);
}
@@ -83,9 +84,11 @@
* @param $language
* @return string
*/
- private function getPermissionsHeader($moduleDirname, $tableName, $language)
+ private function getPermissionsHeader($moduleDirname, $language)
{
- $ret = <<<PRM
+ $table = $this->getTable();
+ $tableName = $table->getVar('table_name');
+ $ret = <<<PRM
\ninclude __DIR__ . '/header.php';
include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
if( !empty(\$_POST['submit']) )
@@ -178,19 +181,22 @@
{
$tables = $this->getTables();
foreach (array_keys($tables) as $t) {
- $tableId = $tables[$t]->getVar('table_id');
+ $tableId = $tables[$t]->getVar('table_id');
+ $tableMid = $tables[$t]->getVar('table_mid');
if (1 == $tables[$t]->getVar('table_permissions')) {
$tableName = $tables[$t]->getVar('table_name');
}
}
- $fields = $this->getTableFields($tableId);
+ $fields = $this->getTableFields($tableMid, $tableId);
+ $fieldId = 'id';
+ $fieldMain = 'title';
foreach (array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
if (0 == $f) {
- $fpif = $fieldName;
+ $fieldId = $fieldName;
}
if (1 == $fields[$f]->getVar('field_main')) {
- $fpmf = $fieldName;
+ $fieldMain = $fieldName;
}
}
$ret = <<<PRM
@@ -199,22 +205,20 @@
foreach (\$globalPerms as \$perm_id => \$perm_name) {
\$permform->addItem(\$perm_id, \$perm_name);
}
- echo \$permform->render();
- echo '<br /><br />';
+ \$GLOBALS['xoopsTpl']->assign('form', \$permform->render());
} else {
\$criteria = new CriteriaCompo();
- \$criteria->setSort('{$fpmf}');
+ \$criteria->setSort('{$fieldMain}');
\$criteria->setOrder('ASC');
\${$tableName}_count = \${$tableName}Handler->getCount(\$criteria);
\${$tableName}_arr = \${$tableName}Handler->getObjects(\$criteria);
unset(\$criteria);
foreach (array_keys(\${$tableName}_arr) as \$i) {
- \$permform->addItem(\${$tableName}_arr[\$i]->getVar('{$fpif}'), \${$tableName}_arr[\$i]->getVar('{$fpmf}'));
+ \$permform->addItem(\${$tableName}_arr[\$i]->getVar('{$fieldId}'), \${$tableName}_arr[\$i]->getVar('{$fieldMain}'));
}
// Check if {$tableName} exist before rendering the form and redirect, if there aren't {$tableName}
if (\${$tableName}_count > 0) {
- echo \$permform->render();
- echo '<br /><br />';
+ \$GLOBALS['xoopsTpl']->assign('form', \$permform->render());
} else {
redirect_header ( '{$tableName}.php?op=new', 3, {$language}NOPERMSSET );
exit ();
@@ -252,13 +256,11 @@
public function render()
{
$module = $this->getModule();
- $table = $this->getTable();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
- $tableName = $module->getVar('table_name');
$language = $this->getLanguage($moduleDirname, 'AM');
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getPermissionsHeader($moduleDirname, $tableName, $language);
+ $content .= $this->getPermissionsHeader($moduleDirname, $language);
$content .= $this->getPermissionsSwitch($moduleDirname, $language);
$content .= $this->getPermissionsBody($moduleDirname, $language);
$content .= $this->getPermissionsFooter();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/blocks/BlocksFiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/blocks/BlocksFiles.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/blocks/BlocksFiles.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -218,7 +218,7 @@
$tableFieldname = $table->getVar('table_fieldname');
$tableCategory = $table->getVar('table_category');
$language = $this->getLanguage($moduleDirname, 'MB');
- $fields = $this->getTableFields($table->getVar('table_id'));
+ $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
foreach (array_keys($fields) as $f) {
if (0 == $f) {
$fpif = $fields[$f]->getVar('field_name');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache 2015-05-24 17:27:05 UTC (rev 13066)
@@ -1 +1 @@
-a:50:{s:18:"TDMCreateStructure";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\TDMCreateStructure.php";s:10:"AdminPages";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminPages.php";s:19:"TemplatesAdminPages";s:118:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminPages.php";s:11:"BlocksFiles";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\blocks\BlocksFiles.php";s:15:"TemplatesBlocks";s:115:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\blocks\TemplatesBlocks.php";s:10:"ClassFiles";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\classes\ClassFiles.php";s:9:"UserPages";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserPages.php";s:18:"TemplatesUserPages";s:116:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserPages.php";s:15:"LanguageModinfo";s:107:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageModinfo.php";s:11:"AdminHeader";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminHeader.php";s:10:"AdminIndex";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminIndex.php";s:9:"AdminMenu";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminMenu.php";s:10:"AdminAbout";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminAbout.php";s:11:"AdminFooter";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminFooter.php";s:19:"TemplatesAdminAbout";s:118:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminAbout.php";s:19:"TemplatesAdminIndex";s:118:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminIndex.php";s:20:"TemplatesAdminFooter";s:119:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminFooter.php";s:20:"TemplatesAdminHeader";s:119:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminHeader.php";s:13:"LanguageAdmin";s:105:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageAdmin.php";s:11:"ClassHelper";s:102:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\classes\ClassHelper.php";s:16:"IncludeFunctions";s:107:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeFunctions.php";s:14:"IncludeInstall";s:105:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeInstall.php";s:7:"SqlFile";s:94:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\sql\SqlFile.php";s:13:"IncludeUpdate";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeUpdate.php";s:18:"TemplatesUserIndex";s:116:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserIndex.php";s:19:"TemplatesUserFooter";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserFooter.php";s:19:"TemplatesUserHeader";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserHeader.php";s:10:"UserFooter";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserFooter.php";s:10:"UserHeader";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserHeader.php";s:22:"UserNotificationUpdate";s:110:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserNotificationUpdate.php";s:9:"UserIndex";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserIndex.php";s:12:"LanguageMain";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageMain.php";s:9:"CssStyles";s:96:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\css\CssStyles.php";s:13:"IncludeCommon";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeCommon.php";s:13:"DocsChangelog";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\docs\DocsChangelog.php";s:12:"LanguageHelp";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageHelp.php";s:13:"IncludeJquery";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeJquery.php";s:16:"UserXoopsVersion";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserXoopsVersion.php";s:16:"AdminPermissions";s:105:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminPermissions.php";s:25:"TemplatesAdminPermissions";s:124:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminPermissions.php";s:14:"LanguageBlocks";s:106:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageBlocks.php";s:20:"IncludeNotifications";s:111:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeNotifications.php";s:15:"LanguageMailTpl";s:107:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageMailTpl.php";s:13:"IncludeSearch";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeSearch.php";s:15:"IncludeComments";s:106:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeComments.php";s:23:"IncludeCommentFunctions";s:114:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeCommentFunctions.php";s:9:"UserPrint";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserPrint.php";s:13:"TDMCreateFile";s:96:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\TDMCreateFile.php";s:20:"TDMCreateTableFields";s:103:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\TDMCreateTableFields.php";s:7:"UserRss";s:95:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserRss.php";}
\ No newline at end of file
+a:64:{s:18:"TDMCreateStructure";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\TDMCreateStructure.php";s:13:"TDMCreateFile";s:96:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\TDMCreateFile.php";s:10:"AdminPages";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminPages.php";s:12:"AdminObjects";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminObjects.php";s:19:"TemplatesAdminPages";s:118:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminPages.php";s:11:"BlocksFiles";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\blocks\BlocksFiles.php";s:15:"TemplatesBlocks";s:115:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\blocks\TemplatesBlocks.php";s:10:"ClassFiles";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\classes\ClassFiles.php";s:9:"UserPages";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserPages.php";s:18:"TemplatesUserPages";s:116:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserPages.php";s:15:"LanguageModinfo";s:107:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageModinfo.php";s:11:"AdminHeader";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminHeader.php";s:10:"AdminIndex";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminIndex.php";s:9:"AdminMenu";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminMenu.php";s:10:"AdminAbout";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminAbout.php";s:11:"AdminFooter";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminFooter.php";s:19:"TemplatesAdminAbout";s:118:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminAbout.php";s:19:"TemplatesAdminIndex";s:118:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminIndex.php";s:20:"TemplatesAdminFooter";s:119:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminFooter.php";s:20:"TemplatesAdminHeader";s:119:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminHeader.php";s:13:"LanguageAdmin";s:105:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageAdmin.php";s:11:"ClassHelper";s:102:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\classes\ClassHelper.php";s:16:"IncludeFunctions";s:107:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeFunctions.php";s:14:"IncludeInstall";s:105:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeInstall.php";s:14:"LanguageBlocks";s:106:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageBlocks.php";s:16:"AdminPermissions";s:105:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\admin\AdminPermissions.php";s:25:"TemplatesAdminPermissions";s:124:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\admin\TemplatesAdminPermissions.php";s:20:"IncludeNotifications";s:111:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeNotifications.php";s:15:"LanguageMailTpl";s:107:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageMailTpl.php";s:7:"SqlFile";s:94:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\sql\SqlFile.php";s:13:"IncludeUpdate";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeUpdate.php";s:13:"IncludeSearch";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeSearch.php";s:15:"IncludeComments";s:106:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeComments.php";s:23:"IncludeCommentFunctions";s:114:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeCommentFunctions.php";s:18:"TemplatesUserIndex";s:116:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserIndex.php";s:19:"TemplatesUserFooter";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserFooter.php";s:19:"TemplatesUserHeader";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserHeader.php";s:10:"UserFooter";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserFooter.php";s:10:"UserHeader";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserHeader.php";s:22:"UserNotificationUpdate";s:110:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserNotificationUpdate.php";s:10:"UserBroken";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserBroken.php";s:19:"TemplatesUserBroken";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserBroken.php";s:9:"UserPrint";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserPrint.php";s:18:"TemplatesUserPrint";s:116:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserPrint.php";s:8:"UserRate";s:96:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserRate.php";s:17:"TemplatesUserRate";s:115:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserRate.php";s:10:"UserSubmit";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserSubmit.php";s:19:"TemplatesUserSubmit";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserSubmit.php";s:11:"UserListTag";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserListTag.php";s:11:"UserViewTag";s:99:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserViewTag.php";s:9:"UserIndex";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserIndex.php";s:12:"LanguageMain";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageMain.php";s:9:"CssStyles";s:96:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\css\CssStyles.php";s:13:"IncludeCommon";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeCommon.php";s:13:"DocsChangelog";s:101:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\docs\DocsChangelog.php";s:12:"LanguageHelp";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\language\LanguageHelp.php";s:13:"IncludeJquery";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\include\IncludeJquery.php";s:16:"UserXoopsVersion";s:104:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserXoopsVersion.php";s:7:"UserRss";s:95:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserRss.php";s:16:"TemplatesUserRss";s:114:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserRss.php";s:16:"TemplatesUserPdf";s:114:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserPdf.php";s:10:"UserSingle";s:98:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserSingle.php";s:19:"TemplatesUserSingle";s:117:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserSingle.php";s:9:"UserVisit";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserVisit.php";}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-23 04:29:24 UTC (rev 13065)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-24 17:27:05 UTC (rev 13066)
@@ -16,10 +16,9 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: class_files.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: ClassFiles.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'ClassFormElements.php';
/**
* Class ClassFiles
@@ -255,16 +254,16 @@
$ret .= <<<EOT
global \$xoopsUser, \$xoopsModule;
// Permissions for uploader
- \$gperm_handler =& xoops_gethandler('groupperm');
+ \$gpermHandler =& xoops_gethandler('groupperm');
\$groups = is_object(\$xoopsUser) ? \$xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
if (\$xoopsUser) {
if ( !\$xoopsUser->isAdmin(\$xoopsModule->mid()) ) {
- \$perm_upload = (\$gperm_handler->checkRight('{$moduleDirname}_ac', 32, \$groups, \$xoopsModule->getVar('mid'))) ? true : false ;
+ \$perm_upload = (\$gpermHandler->checkRight('{$moduleDirname}_ac', 32, \$groups, \$xoopsModule->getVar('mid'))) ? true : false ;
}else{
\$perm_upload = true;
}
}else{
- \$perm_upload = (\$gperm_handler->checkRight('{$moduleDirname}_ac', 32, \$groups, \$xoopsModule->getVar('mid'))) ? true : false ;
+ \$perm_upload = (\$gpermHandler->checkRight('{$moduleDirname}_ac', 32, \$groups, \$xoopsModule->getVar('mid'))) ? true : false ;
}
EOT;
}
@@ -276,7 +275,7 @@
\$form = new XoopsThemeForm(\$title, 'form', \$action, 'post', true);
\$form->setExtra('enctype="multipart/form-data"');
// {$ucfTableName} handler
- \${$tableName}Handler =& \$this->{$moduleDirname}->getHandler('{$tableName}');
+ //\${$tableName}Handler =& \$this->{$moduleDirname}->getHandler('{$tableName}');
{$this->formelements->renderElements()}
EOT;
@@ -300,35 +299,35 @@
$permissionView = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_VIEW');
$ret = <<<EOT
// Permissions
- \$member_handler = & xoops_gethandler ( 'member' );
- \$group_list = &\$member_handler->getGroupList();
- \$gperm_handler = &xoops_gethandler ( 'groupperm' );
- \$full_list = array_keys ( \$group_list );
+ \$memberHandler = & xoops_gethandler ( 'member' );
+ \$groupList = &\$memberHandler->getGroupList();
+ \$gpermHandler = &xoops_gethandler ( 'groupperm' );
+ \$fullList = array_keys ( \$groupList );
global \$xoopsModule;
if ( !\$this->isNew() ) {
- \$groups_ids_approve = \$gperm_handler->getGroupIds ( '{$moduleDirname}_approve', \$this->getVar ( '{$fieldId}' ), \$xoopsModule->getVar ( 'mid' ) );
- \$groups_ids_submit = \$gperm_handler->getGroupIds ( '{$moduleDirname}_submit', \$this->getVar ( '{$fieldId}' ), \$xoopsModule->getVar ( 'mid' ) );
- \$groups_ids_view = \$gperm_handler->getGroupIds ( '{$moduleDirname}_view', \$this->getVar ( '{$fieldId}' ), \$xoopsModule->getVar ( 'mid' ) );
- \$groups_ids_approve = array_values ( \$groups_ids_approve );
- \$groups_can_approve_checkbox = new XoopsFormCheckBox ( {$permissionApprove}, 'groups_approve[]', \$group...
[truncated message content] |
