Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13067] XoopsModules/TDMCreate/branches/timgno/1.91a2 /tdmcreate
|
From: <txm...@us...> - 2015-05-25 20:22:38
|
Revision: 13067
http://sourceforge.net/p/xoops/svn/13067
Author: txmodxoops
Date: 2015-05-25 20:22:35 +0000 (Mon, 25 May 2015)
Log Message:
-----------
Fixed field parent & logos/tdmxoops_logo.gif
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache
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/LanguageDefines.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageHelp.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMailTpl.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageModinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/modules.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/images/logos/tdmxoops_logo.gif
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPhpCode.php
Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/images/logos/tdmxoops_logo.gif
===================================================================
(Binary files differ)
Index: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/images/logos/tdmxoops_logo.gif
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/images/logos/tdmxoops_logo.gif 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/images/logos/tdmxoops_logo.gif 2015-05-25 20:22:35 UTC (rev 13067)
Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/images/logos/tdmxoops_logo.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,7 +19,8 @@
* @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+// Autoloader Classes
+include __DIR__ . '/TDMCreateAutoload.php';
/*
* @Class TDMCreateFields
* @extends XoopsObject
@@ -233,9 +234,9 @@
unset($criteriaElement, $criteriaTable);
$parametersTray->addElement($fieldElementsSelect);
- $field_parent = 0;
- $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']');
- $checkFieldParent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT);
+ $field_parent = 0;
+ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']', $field_parent);
+ $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT);
$parametersTray->addElement($checkFieldParent);
/*$field_parent = (1 == $tableAutoincrement) ? 2 : 1;
$checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
@@ -302,9 +303,10 @@
$class = 'even';
// Get the number of fields - goffy
$tablesHandler =& $this->tdmcreate->getHandler('tables');
- $tableAutoincrement = $tablesHandler->get($fieldTid)->getVar('table_autoincrement');
- $fieldNumb = $tablesHandler->get($fieldTid)->getVar('table_nbfields');
- $fName = $tablesHandler->get($fieldTid)->getVar('table_fieldname');
+ $tables = $tablesHandler->get($fieldTid);
+ $tableAutoincrement = $tables->getVar('table_autoincrement');
+ $fieldNumb = $tables->getVar('table_nbfields');
+ $fName = $tables->getVar('table_fieldname');
// Get the list of fields
$criteria = new CriteriaCompo();
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-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: pages.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: AdminPages.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
/**
Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPhpCode.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPhpCode.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPhpCode.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -0,0 +1,493 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: AdminPhpCode.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+/**
+ * Class AdminPhpCode
+ */
+class AdminPhpCode extends AdminObjects
+{
+ /*
+ * @var string
+ */
+ private $adminobjects;
+
+ /*
+ * @public function constructor
+ * @param null
+ */
+ /**
+ *
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->adminobjects = AdminObjects::getInstance();
+ }
+
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ /**
+ * @return AdminPhpCode
+ */
+ public static function &getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+
+ return $instance;
+ }
+
+ /*
+ * @public function getAdminIncludeHeader
+ * @param null
+ * @return string
+ */
+ public function getAdminIncludeHeader()
+ {
+ $ret = <<<EOT
+include __DIR__ . '/header.php';\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminSwitch
+ * @param $content
+ * @return string
+ */
+ public function getAdminSwitch($content)
+ {
+ $ret = <<<EOT
+switch {\n
+ \t{$content}
+}\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminStringCaseDefaultSwitch
+ * @param $case
+ * @param $content
+ * @return string
+ */
+ public function getAdminStringCaseDefaultSwitch($case = 'list', $content)
+ {
+ $ret = <<<EOT
+ case '{$case}':
+ default:\n
+ \t\t{$content}
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminStringCaseSwitch
+ * @param $case
+ * @param $content
+ * @return string
+ */
+ public function getAdminStringCaseSwitch($case = 'list', $content)
+ {
+ $ret = <<<EOT
+ case '{$case}':\n
+ \t\t{$content}
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminNumericCaseDefaultSwitch
+ * @param $case
+ * @return string
+ */
+ public function getAdminNumericCaseDefaultSwitch($case = 1)
+ {
+ $ret = <<<EOT
+ case {$case}:
+ default:\n
+ \t\t{$content}
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminNumericCaseSwitch
+ * @param $case
+ * @return string
+ */
+ public function getAdminNumericCaseSwitch($case = 1)
+ {
+ $ret = <<<EOT
+ case {$case}:\n
+ \t\t{$content}
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminTemplateMain
+ * @param $moduleDirname
+ * @param $tableName
+ * @return string
+ */
+ public function getAdminTemplateMain($moduleDirname, $tableName)
+ {
+ $ret = <<<EOT
+ \$templateMain = '{$moduleDirname}_admin_{$tableName}.tpl';\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminXoopsTplAssign
+ * @param string $tplString
+ * @param string $phpRender
+ * @return string
+ */
+ public function getAdminXoopsTplAssign($tplString, $phpRender)
+ {
+ $ret = <<<EOT
+ \$GLOBALS['xoopsTpl']->assign('{$tplString}', \${$phpRender});\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminXoopsTplAppend
+ * @param string $tplString
+ * @param string $phpRender
+ * @return string
+ */
+ public function getAdminXoopsTplAppend($tplString, $phpRender)
+ {
+ $ret = <<<EOT
+ \$GLOBALS['xoopsTpl']->append('{$tplString}', \${$phpRender});\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminXoopsTplAppendByRef
+ * @param string $tplString
+ * @param string $phpRender
+ * @return string
+ */
+ public function getAdminXoopsTplAppendByRef($tplString, $phpRender)
+ {
+ $ret = <<<EOT
+ \$GLOBALS['xoopsTpl']->appendByRef('{$tplString}', \${$phpRender});\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminTemplateMain
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $admin
+ * @return string
+ */
+ public function getAdminItemButton($moduleDirname, $tableName, $admin = false)
+ {
+ $ret = <<<EOT
+ \$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'));
+ \$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminAddNavigation
+ * @param $tableName
+ * @return string
+ */
+ public function getAdminAddNavigation($tableName)
+ {
+ $ret = <<<EOT
+ \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminObjHandlerCreate
+ * @param string $tableName
+ * @return string
+ */
+ public function getAdminObjHandlerCreate($tableName)
+ {
+ $ret = <<<EOT
+ \${$tableName}Obj =& \${$tableName}Handler->create();\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminPhpCodeSetVarsObjects
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $fields
+ * @return string
+ */
+ public function getAdminPhpCodeSetVarsObjects($moduleDirname, $tableName, $fields)
+ {
+ $ret = <<<EOT
+ // Set Vars\n
+EOT;
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ if ($f > 0) { // If we want to hide field id
+ switch ($fieldElement) {
+ case 5:
+ case 6:
+ $ret .= $this->adminobjects->getCheckBoxOrRadioYNSetVar($tableName, $fieldName);
+ break;
+ case 11:
+ $ret .= $this->adminobjects->getImageListSetVar($moduleDirname, $tableName, $fieldName);
+ break;
+ case 12:
+ $ret .= $this->adminobjects->getUrlFileSetVar($moduleDirname, $tableName, $fieldName);
+ break;
+ case 13:
+ if(1 == $fields[$f]->getVar('field_main')) {
+ $fieldMain = $fieldName;
+ }
+ $ret .= $this->adminobjects->getUploadImageSetVar($moduleDirname, $tableName, $fieldName, $fieldMain);
+ break;
+ case 14:
+ $ret .= $this->adminobjects->getUploadFileSetVar($moduleDirname, $tableName, $fieldName);
+ break;
+ case 15:
+ $ret .= $this->adminobjects->getTextDateSelectSetVar($tableName, $fieldName);
+ break;
+ default:
+ $ret .= $this->adminobjects->getSimpleSetVar($tableName, $fieldName);
+ break;
+ }
+ }
+ }
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminPhpCodeInsertData
+ * @param $tableName
+ * @param $language
+ * @return string
+ */
+ public function getAdminPhpCodeInsertData($tableName, $language)
+ {
+ $ret = <<<EOT
+ // Insert Data
+ if (\${$tableName}Handler->insert(\${$tableName}Obj)) {
+ redirect_header('{$tableName}.php?op=list', 2, {$language}FORMOK);
+ }\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminPhpCodeXoopsSecurity
+ * @param $tableName
+ * @return string
+ */
+ public function getAdminPhpCodeXoopsSecurity($tableName)
+ {
+ $ret = <<<EOT
+ if ( !\$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors()));
+ }\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminPhpCodeInsertData
+ * @param $tableName
+ * @param $language
+ * @return string
+ */
+ public function getAdminPhpCodeInsertData($tableName, $language)
+ {
+ $ret = <<<EOT
+ // Insert Data
+ if (\${$tableName}Handler->insert(\${$tableName}Obj)) {
+ redirect_header('{$tableName}.php?op=list', 2, {$language}FORMOK);
+ }\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminPhpCodeGetFormError
+ * @param $tableName
+ * @return string
+ */
+ public function getAdminPhpCodeGetFormError($tableName)
+ {
+ $ret = <<<EOT
+ // Get Form
+ \$GLOBALS['xoopsTpl']->assign('error', \${$tableName}Obj->getHtmlErrors());
+ \$form =& \${$tableName}Obj->getForm();
+ \$GLOBALS['xoopsTpl']->assign('form', \$form->render());\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminPhpCodeGetFormId
+ * @param string $tableName
+ * @param string $fieldId
+ * @return string
+ */
+ public function getAdminPhpCodeGetFormId($tableName, $fieldId)
+ {
+ $ret = <<<EOT
+ // Get Form
+ \${$tableName}Obj = \${$tableName}Handler->get(\${$fieldId});
+ \$form = \${$tableName}Obj->getForm();
+ \$GLOBALS['xoopsTpl']->assign('form', \$form->render());\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getAdminPhpCodeGetObjHandlerId
+ * @param string $tableName
+ * @param string $fieldId
+ * @return string
+ */
+ public function getAdminPhpCodeGetObjHandlerId($tableName, $fieldId)
+ {
+ $ret = <<<EOT
+ \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId});\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminPhpCodeDelete
+ * @param string $tableName
+ * @param string $language
+ * @param string $fieldId
+ * @param string $fieldMain
+ * @return string
+ */
+ public function getAdminPhpCodeDelete($tableName, $language, $fieldId, $fieldMain)
+ {
+ $ret = <<<EOT
+ case 'delete':
+ \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId});
+ if (isset(\$_REQUEST['ok']) && 1 == \$_REQUEST['ok']) {
+ if ( !\$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('{$tableName}.php', 3, implode(', ', \$GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (\${$tableName}Handler->delete(\${$tableName}Obj)) {
+ redirect_header('{$tableName}.php', 3, {$language}FORMDELOK);
+ } else {
+ echo \${$tableName}Obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, '{$fieldId}' => \${$fieldId}, 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORMSUREDEL, \${$tableName}Obj->getVar('{$fieldMain}')));
+ }
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminPhpCodeUpdate
+ * @param string $moduleDirname
+ * @param string $tableName
+ * @param string $language
+ * @param string $fieldId
+ * @param string $fieldMain
+ * @return string
+ */
+ public function getAdminPhpCodeUpdate($moduleDirname, $tableName, $language, $fieldId, $fieldMain)
+ {
+ $upModuleName = strtoupper($moduleDirname);
+ $ret = <<<EOT
+ case 'update':
+ if (isset(\${$fieldId})) {
+ \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId});
+ }
+ \${$tableName}Obj->setVar("\${$tableName}_display", \$_POST["\${$tableName}_display"]);
+
+ if (\${$tableName}Handler->insert(\${$tableName}Obj)) {
+ redirect_header("\${$tableName}.php", 3, _AM_{$upModuleName}_FORMOK);
+ }
+ echo \${$tableName}Obj->getHtmlErrors();
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminIncludeFooter
+ * @param null
+ */
+ /**
+ * @return string
+ */
+ public function getAdminIncludeFooter()
+ {
+ $ret = <<<EOT
+include __DIR__ . '/footer.php';
+EOT;
+
+ return $ret;
+ }
+}
\ No newline at end of file
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-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache 2015-05-25 20:22:35 UTC (rev 13067)
@@ -1 +1 @@
-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
+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: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: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: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: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: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:16:"TemplatesUserPdf";s:114:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\templates\user\TemplatesUserPdf.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: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: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: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:9:"UserVisit";s:97:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\files\user\UserVisit.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";}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,19 +19,12 @@
* @version $Id: LanguageAdmin.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'LanguageDefines.php';
-
/**
* Class LanguageAdmin
*/
-class LanguageAdmin extends TDMCreateFile
+class LanguageAdmin extends LanguageDefines
{
/*
- * @var mixed
- */
- private $defines;
-
- /*
* @public function constructor
* @param null
*/
@@ -41,7 +34,6 @@
public function __construct()
{
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
$this->defines = LanguageDefines::getInstance();
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageBlocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageBlocks.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageBlocks.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,19 +19,12 @@
* @version $Id: LanguageBlocks.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'LanguageDefines.php';
-
/**
* Class LanguageBlocks
*/
-class LanguageBlocks extends TDMCreateFile
+class LanguageBlocks extends LanguageDefines
{
/*
- * @var mixed
- */
- private $defines;
-
- /*
* @public function constructor
* @param null
*/
@@ -41,7 +34,6 @@
public function __construct()
{
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
$this->defines = LanguageDefines::getInstance();
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -23,9 +23,14 @@
/**
* Class LanguageDefines
*/
-class LanguageDefines
+class LanguageDefines extends TDMCreateFile
{
- /*
+ /*
+ * @var mixed
+ */
+ protected $defines;
+
+ /*
* @public function constructor
* @param null
*/
@@ -34,6 +39,8 @@
*/
public function __construct()
{
+ parent::__construct();
+ $this->tdmcfile = TDMCreateFile::getInstance();
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageHelp.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageHelp.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageHelp.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,11 +19,10 @@
* @version $Id: 1.91 LanguageHelp.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
/**
* Class LanguageHelp
*/
-class LanguageHelp extends TDMCreateFile
+class LanguageHelp extends LanguageDefines
{
/*
* @public function constructor
@@ -34,7 +33,8 @@
*/
public function __construct()
{
- $this->tdmcfile = TDMCreateFile::getInstance();
+ parent::__construct();
+ $this->defines = LanguageDefines::getInstance();
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMailTpl.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMailTpl.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMailTpl.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,13 +19,12 @@
* @version $Id: 1.91 LanguageMailTpl.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
/**
* Class LanguageMailTpl
*/
-class LanguageMailTpl extends TDMCreateFile
+class LanguageMailTpl extends LanguageDefines
{
- /*
+ /*
* @public function constructor
* @param null
*/
@@ -35,7 +34,7 @@
public function __construct()
{
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,19 +19,12 @@
* @version $Id: LanguageMain.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'LanguageDefines.php';
-
/**
* Class LanguageMain
*/
-class LanguageMain extends TDMCreateFile
+class LanguageMain extends LanguageDefines
{
/*
- * @var mixed
- */
- private $defines;
-
- /*
* @public function constructor
* @param null
*/
@@ -41,7 +34,6 @@
public function __construct()
{
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
$this->defines = LanguageDefines::getInstance();
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageModinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageModinfo.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageModinfo.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -19,19 +19,12 @@
* @version $Id: LanguageModinfo.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'LanguageDefines.php';
-
/**
* Class LanguageModinfo
*/
-class LanguageModinfo extends TDMCreateFile
+class LanguageModinfo extends LanguageDefines
{
/*
- * @var mixed
- */
- private $defines;
-
- /*
* @public function constructor
* @param null
*/
@@ -41,7 +34,6 @@
public function __construct()
{
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
$this->defines = LanguageDefines::getInstance();
}
@@ -95,7 +87,7 @@
*/
private function getLanguageMain($language, $module)
{
- $ret = $this->defines->getAboveHeadDefines('Admin Main');
+ $ret = $this->defines->getAboveHeadDefines('Admin Main');
$ret .= $this->defines->getDefine($language, "NAME", "{$module->getVar('mod_name')}");
$ret .= $this->defines->getDefine($language, "DESC", "{$module->getVar('mod_description')}");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -190,16 +190,78 @@
}
if (!empty($fieldName)) {
switch ($fieldType) {
- case 15:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ $type = $fieldTypeName;
+ if(empty($fieldDefault)) {
+ $default = "DEFAULT '0'";
+ } else {
+ $default = "DEFAULT '{$fieldDefault}'";
+ }
+ break;
+ case 6:
+ case 7:
+ case 8:
+ $type = $fieldTypeName;
+ if(empty($fieldDefault)) {
+ $default = "DEFAULT '0.00'"; // From MySQL 5.7 Manual
+ } else {
+ $default = "DEFAULT '{$fieldDefault}'";
+ }
+ break;
+ case 9:
+ case 10:
+ $type = $fieldTypeName;
+ break;
+ case 11:
+ $type = $fieldTypeName;
+ if(empty($fieldDefault)) {
+ $default = "DEFAULT 'my...@em...'";
+ } else {
+ $default = "DEFAULT '{$fieldDefault}'";
+ }
+ break;
+ case 12:
+ $type = $fieldTypeName;
+ if(empty($fieldDefault)) {
+ $default = "DEFAULT 'http:\\'";
+ } else {
+ $default = "DEFAULT '{$fieldDefault}'";
+ }
+ break;
+ case 13:
+ case 14:
+ $type = $fieldTypeName;
+ $default = "DEFAULT ''";
+ break;
+ case 15:
case 16:
case 17:
case 18:
- case 19:
- case 20:
- case 21:
- $type = $fieldTypeName;
+ $type = $fieldTypeName;
$default = null;
break;
+ case 19:
+ case 20:
+ case 21:
+ case 22:
+ $type = $fieldTypeName;
+ /*if(empty($fieldDefault)) {
+ $default = "DEFAULT '0'";
+ } else {*/
+ $default = "DEFAULT '{$fieldDefault}'";
+ //}
+ break;
+ case 23:
+ $type = $fieldTypeName;
+ if(empty($fieldDefault)) {
+ $default = "DEFAULT '1970'"; // From MySQL 5.7 Manual
+ } else {
+ $default = "DEFAULT '{$fieldDefault}'";
+ }
+ break;
default:
$type = $fieldTypeName . '(' . $fieldValue . ')';
$default = "DEFAULT '{$fieldDefault}'";
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/modules.php 2015-05-24 17:27:05 UTC (rev 13066)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/modules.php 2015-05-25 20:22:35 UTC (rev 13067)
@@ -368,7 +368,7 @@
$modWebsiteUrl = $isNew ? $set['website_url'] : $this->getVar('mod_website_url');
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_URL, 'mod_website_url', 50, 255, $modWebsiteUrl));
//
- $modWebsiteName = $isNew ? $set['release_file'] : $this->getVar('mod_website_name');
+ $modWebsiteName = $isNew ? $set['website_name'] : $this->getVar('mod_website_name');
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_NAME, 'mod_website_name', 50, 255, $modWebsiteName));
//
$modRelease = $isNew ? $set['release'] : $this->getVar('mod_release');
|
