You can subscribe to this list here.
2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <txm...@us...> - 2015-06-03 09:42:13
|
Revision: 13077 http://sourceforge.net/p/xoops/svn/13077 Author: txmodxoops Date: 2015-06-03 09:42:10 +0000 (Wed, 03 Jun 2015) Log Message: ----------- Addeds & fix Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRaw.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTab.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTabTray.php Removed Paths: ------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateAutoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAutoload.php Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateAutoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateAutoload.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateAutoload.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -1,57 +0,0 @@ -<?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: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ - */ -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -/** - * @since 1.91 - */ -// Autoload Function -ini_set('display_errors',1); -error_reporting(E_ALL|E_STRICT); - -function application_autoloader($class) { - $classFilename = $class.'.php'; - $cacheFile = __DIR__ . '/cache/classpaths.cache'; - $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); - if (!is_array($pathCache)) { $pathCache = array(); } - - if (array_key_exists($class, $pathCache)) { - /* Load class using path from cache file (if the file still exists) */ - if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } - - } else { - /* Determine the location of the file within the $class_root and, if found, load and cache it */ - $directories = new RecursiveDirectoryIterator(__DIR__); - foreach(new RecursiveIteratorIterator($directories) as $file) { - if ($file->getFilename() == $classFilename) { - $fullPath = $file->getRealPath(); - $pathCache[$class] = $fullPath; - require_once $fullPath; - break; - } - } - } - - $serialized_paths = serialize($pathCache); - if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } -} - -spl_autoload_register('application_autoloader'); \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -0,0 +1,56 @@ +<?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: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); +/** + * @since 1.91 + */ +// Autoload Function +ini_set('display_errors',1); +error_reporting(E_ALL|E_STRICT); + +function applicationAutoloader($class) { + $classFilename = $class.'.php'; + $cacheFile = __DIR__ . '/cache/classpaths.cache'; + $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); + if (!is_array($pathCache)) { $pathCache = array(); } + + if (array_key_exists($class, $pathCache)) { + /* Load class using path from cache file (if the file still exists) */ + if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } + + } else { + /* Determine the location of the file within the $class_root and, if found, load and cache it */ + $directories = new RecursiveDirectoryIterator(__DIR__); + foreach(new RecursiveIteratorIterator($directories) as $file) { + if ($file->getFilename() == $classFilename) { + $fullPath = $file->getRealPath(); + $pathCache[$class] = $fullPath; + require_once $fullPath; + break; + } + } + } + + $serialized_paths = serialize($pathCache); + if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } +} + +spl_autoload_register('applicationAutoloader'); \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -20,7 +20,7 @@ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); // Autoloader Classes -include __DIR__ . '/TDMCreateAutoload.php'; +include __DIR__ . '/autoload.php'; /* * @Class TDMCreateFields * @extends XoopsObject Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -19,9 +19,7 @@ * @version $Id: TDMCreateArchitecture.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -// Autoloader Classes -include __DIR__ . '/TDMCreateAutoload.php'; - +include __DIR__ . '/autoload.php'; /** * Class TDMCreateArchitecture */ Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAutoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAutoload.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAutoload.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -1,57 +0,0 @@ -<?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: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ - */ -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -/** - * @since 1.91 - */ -// Autoload Function -ini_set('display_errors',1); -error_reporting(E_ALL|E_STRICT); - -function applicationAutoloader($class) { - $classFilename = $class.'.php'; - $cacheFile = __DIR__ . '/cache/classpaths.cache'; - $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); - if (!is_array($pathCache)) { $pathCache = array(); } - - if (array_key_exists($class, $pathCache)) { - /* Load class using path from cache file (if the file still exists) */ - if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } - - } else { - /* Determine the location of the file within the $class_root and, if found, load and cache it */ - $directories = new RecursiveDirectoryIterator(__DIR__); - foreach(new RecursiveIteratorIterator($directories) as $file) { - if ($file->getFilename() == $classFilename) { - $fullPath = $file->getRealPath(); - $pathCache[$class] = $fullPath; - require_once $fullPath; - break; - } - } - } - - $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.91a3/tdmcreate/class/files/admin/AdminObjects.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -101,8 +101,7 @@ \${$tableName}Obj->setVar('{$fieldName}', formatUrl(\$_REQUEST['{$fieldName}']));\n // Set Var {$fieldName} include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}'; - \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), + \$uploader = new XoopsMediaUploader({$stuModuleDirname}_UPLOAD_FILES_PATH . '/{$tableName}', \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { \$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -0,0 +1,56 @@ +<?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: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); +/** + * @since 1.91 + */ +// Autoload Function +ini_set('display_errors',1); +error_reporting(E_ALL|E_STRICT); + +function applicationAutoloader1($class) { + $classFilename = $class.'.php'; + $cacheFile = __DIR__ . '/cache/classpaths.cache'; + $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); + if (!is_array($pathCache)) { $pathCache = array(); } + + if (array_key_exists($class, $pathCache)) { + /* Load class using path from cache file (if the file still exists) */ + if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } + + } else { + /* Determine the location of the file within the $class_root and, if found, load and cache it */ + $directories = new RecursiveDirectoryIterator(__DIR__); + foreach(new RecursiveIteratorIterator($directories) as $file) { + if ($file->getFilename() == $classFilename) { + $fullPath = $file->getRealPath(); + $pathCache[$class] = $fullPath; + require_once $fullPath; + break; + } + } + } + + $serialized_paths = serialize($pathCache); + if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } +} + +spl_autoload_register('applicationAutoloader1'); \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -361,7 +361,7 @@ /** * @return string */ - private function getValuesInForm($fields) + private function getValuesInForm($moduleDirname, $table, $fields) { $ret = <<<EOT /** @@ -393,9 +393,28 @@ EOT; break; default: - $ret .= <<<EOT + if ($fieldElement > 15) { + $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); + $fieldElementMid = $fieldElements->getVar('fieldelement_mid'); + $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); + $fieldElementName = $fieldElements->getVar('fieldelement_name'); + $fieldNameDesc = substr($fieldElementName, strrpos($fieldElementName, ':'), strlen($fieldElementName)); + $topicTableName = str_replace(': ', '', strtolower($fieldNameDesc)); + $fieldsTopics = $this->getTableFields($fieldElementMid, $fieldElementTid); + foreach (array_keys($fieldsTopics) as $f) { + $fieldNameTopic = $fieldsTopics[$f]->getVar('field_name'); + if (1 == $fieldsTopics[$f]->getVar('field_main')) { + $fieldMainTopic = $fieldNameTopic; + } + } + $ret .= <<<EOT + \$ret['{$rpFieldName}'] = \$this->{$moduleDirname}->getHandler('{$topicTableName}')->get(\$this->getVar('{$fieldName}'))->getVar('{$fieldMainTopic}');\n +EOT; + } else { + $ret .= <<<EOT \$ret['{$rpFieldName}'] = \$this->getVar('{$fieldName}');\n EOT; + } break; } } @@ -835,7 +854,7 @@ } $content .= $this->getFootInForm(); } - $content .= $this->getValuesInForm($fields); + $content .= $this->getValuesInForm($moduleDirname, $table, $fields); $content .= $this->getToArrayInForm(); if(in_array(5, $fieldElementId)) { $content .= $this->getOptionsCheck($table); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -169,12 +169,14 @@ */ private function getXoopsFormCheckBox($language, $fieldName, $required = 'false') { - $ret = <<<EOT + $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true); + $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); + $ret = <<<EOT // Form Check Box - \${$fieldName} = \$this->isNew() ? 0 : \$this->getVar('{$fieldName}'); - \$check_{$fieldName} = new XoopsFormCheckBox({$language}, '{$fieldName}', \${$fieldName}); - \$check_{$fieldName}->addOption(1, " "); - \$form->addElement( \$check_{$fieldName}{$required} );\n + \${$ccFieldName} = \$this->isNew() ? 0 : \$this->getVar('{$fieldName}'); + \$check{$ucfFieldName} = new XoopsFormCheckBox({$language}, '{$fieldName}', \${$ccFieldName}); + \$check{$ucfFieldName}->addOption(1, " "); + \$form->addElement( \$check{$ucfFieldName}{$required} );\n EOT; return $ret; @@ -221,16 +223,16 @@ $stuFieldName = strtoupper($fieldName); $rpFieldName = $this->tdmcfile->getRightString($fieldName); $stuSoleName = strtoupper($tableSoleName .'_'. $rpFieldName); - $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true, false); + $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true); $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); $ret = <<<EOT // Form Frameworks Image Files \$get{$ucfFieldName} = \$this->getVar('{$fieldName}'); \${$ccFieldName} = \$get{$ucfFieldName} ? \$get{$ucfFieldName} : 'blank.gif'; - \$imageDirectory = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'; + \$imageDirectory = '/Frameworks/moduleclasses/icons/32'; \$imageTray = new XoopsFormElementTray({$language}{$stuSoleName},'<br />'); - \$imageSelect = new XoopsFormSelect(\$imageDirectory, '{$fieldName}', \${$ccFieldName}, 5); - \$imageArray = XoopsLists::getImgListAsArray( \$imageDirectory ); + \$imageSelect = new XoopsFormSelect(sprintf({$language}FORM_IMAGE_PATH, ".{\$imageDirectory}/"), '{$fieldName}', \${$ccFieldName}, 5); + \$imageArray = XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . \$imageDirectory ); foreach( \$imageArray as \$image1 ) { \$imageSelect->addOption("{\$image1}", \$image1); } @@ -267,7 +269,7 @@ */ private function getXoopsFormSelectFile($language, $moduleDirname, $fieldName, $fieldElement, $required = 'false') { - $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true, false); + $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true); $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); $ret = <<<EOT // Image Select or Upload @@ -276,22 +278,21 @@ \$uploadDirectory = '/uploads/{$moduleDirname}/images/shots'; \${$moduleDirname}ShotImage = \${$fieldName} ? \${$fieldName} : 'blank.gif'; // - \$imgtray = new XoopsFormElementTray({$language}FORM_IMAGE,'<br />'); - \$imagePath = sprintf({$language}_FORM_PATH, \$uploadDirectory ); - \$imageselect = new XoopsFormSelect(\$imagePath, 'selected_image',\${$moduleDirname}ShotImage); + \$imageTray = new XoopsFormElementTray({$language}FORM_IMAGE,'<br />'); + \$imageSelect = new XoopsFormSelect(sprintf({$language}_FORM_PATH, \$uploadDirectory ), 'selected_image',\${$moduleDirname}ShotImage); \$imageArray = XoopsLists :: getImgListAsArray( XOOPS_ROOT_PATH . \$uploadDirectory ); foreach( \$imageArray as \$image ) { - \$imageselect->addOption("{\$image}", \$image); + \$imageSelect->addOption("{\$image}", \$image); } - \$imageselect->setExtra( "onchange='showImgSelected(\"image3\", \"selected_image\", \"" . \$uploadDirectory . "\", \"\", \"" . XOOPS_URL . "\")'" ); - \$imgtray->addElement(\$imageselect,false); - \$imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . \$uploadDirectory . "/" . \${$moduleDirname}ShotImage . "' name='image3' id='image3' alt='' />" ) ); + \$imageSelect->setExtra( "onchange='showImgSelected(\"image3\", \"selected_image\", \"" . \$uploadDirectory . "\", \"\", \"" . XOOPS_URL . "\")'" ); + \$imageTray->addElement(\$imageSelect,false); + \$imageTray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . \$uploadDirectory . "/" . \${$moduleDirname}ShotImage . "' name='image3' id='image3' alt='' />" ) ); \$fileSelectTray= new XoopsFormElementTray('','<br />'); //if (\$permissionUpload == true) { \$fileSelectTray->addElement(new XoopsFormFile({$language}_FORMUPLOAD , 'attachedimage', \$this->{$moduleDirname}->getConfig('maxuploadsize')){$required}); //} - \$imgtray->addElement(\$fileSelectTray); - \$form->addElement(\$imgtray); + \$imageTray->addElement(\$fileSelectTray); + \$form->addElement(\$imageTray); }\n EOT; @@ -321,9 +322,9 @@ $ret = <<<EOT // Form Url Text File \$formUrlFile = new XoopsFormElementTray({$language}FORM_FILE,'<br /><br />'); - \$formFile = \$this->isNew() ? '{$fieldDefault}' : \$this->getVar('{$fieldName}'); - \$formFormText = new XoopsFormText({$language}FORM_TEXT, '{$fieldName}', 75, 255, \$formFile); - \$formUrlFile->addElement(\$formFormText{$required} ); + \$formUrl = \$this->isNew() ? '{$fieldDefault}' : \$this->getVar('{$fieldName}'); + \$formText = new XoopsFormText({$language}FORM_TEXT, '{$fieldName}', 75, 255, \$formUrl); + \$formUrlFile->addElement(\$formText{$required} ); \$formUrlFile->addElement(new XoopsFormFile({$language}FORM_UPLOAD , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')){$required}); \$form->addElement(\$formUrlFile);\n EOT; @@ -350,17 +351,16 @@ $stuModuleDirname = strtoupper($moduleDirname); $stuTableName = strtoupper($tableName); $stuSoleName = strtoupper($tableSoleName); - $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true, false); + $ucfFieldName = $this->tdmcfile->getCamelCase($fieldName, true); $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); $ret = <<<EOT // Form Upload Image \$get{$ucfFieldName} = \$this->getVar('{$fieldName}'); \${$ccFieldName} = \$get{$ucfFieldName} ? \$get{$ucfFieldName} : 'blank.gif'; - \$imageDirectory = {$stuModuleDirname}_UPLOAD_PATH . '/images/{$tableName}'; + \$imageDirectory = '/uploads/{$moduleDirname}/images/{$tableName}'; // \$imageTray = new XoopsFormElementTray({$language}{$stuSoleName}_IMAGE,'<br />'); - \$imagePath = sprintf({$language}FORM_IMAGE_PATH, ".{\$imageDirectory}/"); - \$imageSelect = new XoopsFormSelect(\$imagePath, '{$fieldName}', \${$ccFieldName}, 5); + \$imageSelect = new XoopsFormSelect(sprintf({$language}FORM_IMAGE_PATH, ".{\$imageDirectory}/"), '{$fieldName}', \${$ccFieldName}, 5); \$imageArray = XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . \$imageDirectory ); foreach( \$imageArray as \$image ) { \$imageSelect->addOption("{\$image}", \$image); @@ -445,12 +445,13 @@ */ private function getXoopsFormSelectBox($language, $tableName, $fieldName, $required = 'false') { - $ret = <<<EOT + $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); + $ret = <<<EOT // Form Select - \${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}')); - \${$fieldName}_select->addOption('Empty'); - \${$fieldName}_select->addOptionArray(\${$tableName}Handler->getList()); - \$form->addElement( \${$fieldName}_select{$required} );\n + \${$ccFieldName}Select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}')); + \${$ccFieldName}Select->addOption('Empty'); + \${$ccFieldName}Select->addOptionArray(\${$tableName}Handler->getList()); + \$form->addElement( \${$ccFieldName}Select{$required} );\n EOT; return $ret; @@ -492,10 +493,11 @@ */ private function getXoopsFormRadioYN($language, $fieldName, $required = 'false') { - $ret = <<<EOT + $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); + $ret = <<<EOT // Form Radio Yes/No - \${$fieldName} = \$this->isNew() ? 0 : \$this->getVar('{$fieldName}'); - \$form->addElement( new XoopsFormRadioYN({$language}, '{$fieldName}', \${$fieldName}){$required} );\n + \${$ccFieldName} = \$this->isNew() ? 0 : \$this->getVar('{$fieldName}'); + \$form->addElement( new XoopsFormRadioYN({$language}, '{$fieldName}', \${$ccFieldName}){$required} );\n EOT; return $ret; @@ -548,12 +550,13 @@ $fElement = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); $rpFieldelementName = strtolower(str_replace('Table : ', '', $fElement->getVar('fieldelement_name'))); } - $ret = <<<EOT + $ccFieldName = $this->tdmcfile->getCamelCase($fieldName, false, true); + $ret = <<<EOT // Form Table {$ucfTableName} \${$rpFieldelementName}Handler =& \$this->{$moduleDirname}->getHandler('{$rpFieldelementName}'); - \${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}')); - \${$fieldName}_select->addOptionArray(\${$rpFieldelementName}Handler->getList()); - \$form->addElement( \${$fieldName}_select{$required} );\n + \${$ccFieldName}Select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}')); + \${$ccFieldName}Select->addOptionArray(\${$rpFieldelementName}Handler->getList()); + \$form->addElement( \${$ccFieldName}Select{$required} );\n EOT; return $ret; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -114,6 +114,12 @@ define('{$stuModuleDirname}_UPLOAD_SHOTS_URL', {$stuModuleDirname}_UPLOAD_PATH.'/images/shots');\n EOT; } + if(in_array(array(11, 12), $fieldElement)) { + $ret .= <<<EOT + define('{$stuModuleDirname}_UPLOAD_FILES_PATH', {$stuModuleDirname}_UPLOAD_PATH.'/files'); + define('{$stuModuleDirname}_UPLOAD_FILES_URL', {$stuModuleDirname}_UPLOAD_PATH.'/files');\n +EOT; + } if(in_array(13, $fieldElement)) { $ret .= <<<EOT define('{$stuModuleDirname}_UPLOAD_IMAGE_PATH', {$stuModuleDirname}_UPLOAD_PATH.'/images'); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRaw.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRaw.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRaw.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -0,0 +1,47 @@ +<?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. +*/ +/** + * TDMCreateFormRaw - raw form element + * + * This class has special treatment by xoopsforms, it will render the raw + * value provided without wrapping in HTML + * + * @category Xoops\Form\Raw + * @package Xoops\Form + * @author trabis <tra...@gm...> + * @copyright 2012-2014 The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @link http://xoops.org + * @since 2.6.0 +*/ +class TDMCreateFormRaw extends XoopsFormElement +{ + + /** + * __construct + * + * @param string $value value + */ + public function __construct($value = '') + { + $this->setValue($value); + } + + /** + * render + * + * @return string rendered form element + */ + public function render() + { + return $this->getValue(); + } +} Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTab.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTab.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTab.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -0,0 +1,70 @@ +<?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. +*/ +/** + * Tab - a form tab + * + * @category XoopsFormTab + * @package XoopsForm + * @author trabis <lus...@gm...> + * @copyright 2012-2014 The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @link http://xoops.org + * @since 2.0.0 +*/ +XoopsLoad::load('XoopsFormElementTray'); +class TDMCreateFormTab extends XoopsFormElementTray +{ + /** + * __construct + * + * @param string $caption tab caption + * @param string $name unique identifier for this tab + */ + public function __construct($caption, $name) + { + $this->setName($name); + $this->setCaption($caption); + } + + /** + * render + * + * @return string + */ + public function render() + { + $ret = ''; + /* @var $ele Element */ + foreach ($this->getElements() as $ele) { + $ret .= NWLINE; + $ret .= '<tr>' . NWLINE; + $ret .= '<td class="head" width="30%">' . NWLINE; + $required = $ele->isRequired() ? '-required' : ''; + $ret .= '<div class="xoops-form-element-caption' . $required . '">' . NWLINE; + $ret .= '<span class="caption-text">' . $ele->getCaption() . '</span>' . NWLINE; + $ret .= '<span class="caption-marker">*</span>' . NWLINE; + $ret .= '</div>' . NWLINE; + $description = $ele->getDescription(); + if ($description) { + $ret .= '<div style="font-weight: normal">' . NWLINE; + $ret .= $description . NWLINE; + $ret .= '</div>' . NWLINE; + } + $ret .= '</td>' . NWLINE; + $ret .= '<td class="even">' . NWLINE; + $ret .= $ele->render() . NWLINE; + $ret .= '<span class="form-horizontal">'. $ele->getDescription() . '</span>'; + $ret .= '</td>' . NWLINE; + $ret .= '</tr>' . NWLINE; + } + return $ret; + } +} Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTabTray.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTabTray.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTabTray.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -0,0 +1,106 @@ +<?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. +*/ +/** + * TabTray - a form tray for tabs + * + * @category XoopsFormTabTray + * @package XoopsForm + * @author trabis <lus...@gm...> + * @copyright 2012-2014 The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) + * @link http://xoops.org + * @since 2.0.0 +*/ +XoopsLoad::load('XoopsFormElementTray'); +class TDMCreateFormTabTray extends XoopsFormElementTray +{ + /** + * Theme to use for jquery UI + * + * @var string + */ + private $uiTheme = ''; + + /** + * __construct + * + * @param string $caption tray caption + * @param string $name Unique identifier for this tray + * @param string $uiTheme Theme to use for jquery UI (remove? now set by theme) + * @param string $delimiter delimiter + */ + public function __construct($caption, $name, $uiTheme = 'base', $delimiter = " ") + { + $this->setName($name); + $this->setCaption($caption); + $this->delimiter = $delimiter; + $this->uiTheme = $uiTheme; + } + + /** + * create HTML to output the form as a table + * + * @return string + */ + public function render() + { + $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js'); + $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); + $GLOBALS['xoTheme']->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . $this->uiTheme . '/ui.all.css'); + $GLOBALS['xoTheme']->addScript('', array('type' => 'text/javascript'), '$(function() { $("#tabs_' . $this->getName() . '").tabs(); });'); + + $ret = '<div id="tabs_' . $this->getName() . '">' . NWLINE; + $ret .= '<ul>' . NWLINE; + foreach ($this->getElements() as $ele) { + if ($ele instanceof TDMCreateFormTab) { + $ret .= '<li><a href="#tab_' . $ele->getName() . '"><span>' + . $ele->getCaption() . '</span></a></li>' . NWLINE; + } + } + $ret .= '</ul>' . NWLINE; + + $hidden = ''; + $extras = array(); + + foreach ($this->getElements() as $ele) { + /* @var $ele Element */ + if (!$ele->isHidden()) { + if (!$ele instanceof TDMCreateFormRaw) { + if ($ele instanceof TDMCreateFormTab) { + $ret .= '<div id="tab_' . $ele->getName() . '">' . NWLINE; + $ret .= '<table class="outer" cellspacing="1">' . NWLINE; + $ret .= $ele->render(); + $ret .= '</table>' . NWLINE; + $ret .= '</div>' . NWLINE; + } else { + $extras[] = $ele; + } + } else { + $ret .= $ele->render(); + } + } else { + $hidden .= $ele->render(); + } + } + if (!empty($extras)) { + $tray = new ElementTray('', $this->getDelimiter()); + foreach ($extras as $extra) { + $tray->addElement($extra); + } + $ret .= $tray->render(); + $ret .= NWLINE; + } + + $ret .= $hidden . NWLINE; + $ret .= '</div>' . NWLINE; + return $ret; + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -15,12 +15,13 @@ * @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.x + * @since 2.5.7 * @author TDM TEAM DEV MODULE * @version $Id: modules.php 12209 2013-10-23 02:49:09Z beckmi $ * @version $Id: modules.php 13040 2015-04-25 15:12:12Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); +include __DIR__ . '/autoload.php'; /* * @Class TDMCreateModules * @extends XoopsObject Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -15,12 +15,12 @@ * @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.x + * @since 2.5.7 * @author TDM TEAM DEV MODULE * @version $Id: settings.php 13070 2015-05-19 12:24:20Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); - +include __DIR__ . '/autoload.php'; /* * @Class TDMCreateSettings * @extends XoopsObject @@ -141,80 +141,92 @@ $form = new XoopsThemeForm(_AM_TDMCREATE_SETTING_EDIT, 'settingform', $action, 'post'); $form->setExtra('enctype="multipart/form-data"'); - $form->addElement(new XoopsFormHidden('set_id', $this->getVar('set_id'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_NAME, 'set_name', 50, 255, $this->getVar('set_name'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_DIRNAME, 'set_dirname', 25, 255, $this->getVar('set_dirname'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_VERSION, 'set_version', 10, 25, $this->getVar('set_version'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SINCE, 'set_since', 10, 25, $this->getVar('set_since'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_PHP, 'set_min_php', 10, 25, $this->getVar('set_min_php'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_XOOPS, 'set_min_xoops', 10, 25, $this->getVar('set_min_xoops'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_ADMIN, 'set_min_admin', 10, 25, $this->getVar('set_min_admin'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_MYSQL, 'set_min_mysql', 10, 25, $this->getVar('set_min_mysql'))); - $form->addElement(new XoopsFormTextArea(_AM_TDMCREATE_SETTING_DESCRIPTION, 'set_description', $this->getVar('set_description'), 4, 25)); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR, 'set_author', 50, 255, $this->getVar('set_author'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_LICENSE, 'set_license', 50, 255, $this->getVar('set_license'))); - $options_tray = new XoopsFormElementTray(_OPTIONS, '<br />'); - $mod_checkbox_all = new XoopsFormCheckBox('', "settingbox", 1); - $mod_checkbox_all->addOption('allbox', _AM_TDMCREATE_SETTING_ALL); - $mod_checkbox_all->setExtra(" onclick='xoopsCheckAll(\"settingform\", \"settingbox\");' "); - $mod_checkbox_all->setClass('xo-checkall'); - $options_tray->addElement($mod_checkbox_all); - $mod_admin = $isNew ? $this->tdmcreate->getConfig('display_admin') : $this->getVar('set_admin'); - $check_mod_admin = new XoopsFormCheckBox(' ', 'set_admin', $mod_admin); - $check_mod_admin->addOption(1, _AM_TDMCREATE_SETTING_ADMIN); - $options_tray->addElement($check_mod_admin); - $mod_user = $isNew ? $this->tdmcreate->getConfig('display_user') : $this->getVar('set_user'); - $check_mod_user = new XoopsFormCheckBox(' ', 'set_user', $mod_user); - $check_mod_user->addOption(1, _AM_TDMCREATE_SETTING_USER); - $options_tray->addElement($check_mod_user); - $mod_blocks = $isNew ? $this->tdmcreate->getConfig('active_blocks') : $this->getVar('set_blocks'); - $check_mod_blocks = new XoopsFormCheckBox(' ', 'set_blocks', $mod_blocks); - $check_mod_blocks->addOption(1, _AM_TDMCREATE_SETTING_BLOCKS); - $options_tray->addElement($check_mod_blocks); - $mod_search = $isNew ? $this->tdmcreate->getConfig('active_search') : $this->getVar('set_search'); - $check_mod_search = new XoopsFormCheckBox(' ', 'set_search', $mod_search); - $check_mod_search->addOption(1, _AM_TDMCREATE_SETTING_SEARCH); - $options_tray->addElement($check_mod_search); - $mod_comments = $isNew ? $this->tdmcreate->getConfig('active_comments') : $this->getVar('set_comments'); - $check_mod_comments = new XoopsFormCheckBox(' ', 'set_comments', $mod_comments); - $check_mod_comments->addOption(1, _AM_TDMCREATE_SETTING_COMMENTS); - $options_tray->addElement($check_mod_comments); - $mod_notifications = $isNew ? $this->tdmcreate->getConfig('active_notifications') : $this->getVar('set_notifications'); - $check_mod_notifications = new XoopsFormCheckBox(' ', 'set_notifications', $mod_notifications); - $check_mod_notifications->addOption(1, _AM_TDMCREATE_SETTING_NOTIFICATIONS); - $options_tray->addElement($check_mod_notifications); - $mod_permissions = $isNew ? $this->tdmcreate->getConfig('active_permissions') : $this->getVar('set_permissions'); - $check_mod_permissions = new XoopsFormCheckBox(' ', 'set_permissions', $mod_permissions); - $check_mod_permissions->addOption(1, _AM_TDMCREATE_SETTING_PERMISSIONS); - $options_tray->addElement($check_mod_permissions); - $mod_inroot_copy = $isNew ? $this->tdmcreate->getConfig('active_permissions') : $this->getVar('set_inroot_copy'); - $check_mod_inroot_copy = new XoopsFormCheckBox(' ', 'set_inroot_copy', $mod_inroot_copy); - $check_mod_inroot_copy->addOption(1, _AM_TDMCREATE_SETTING_INROOT_MODULES_COPY); - $options_tray->addElement($check_mod_inroot_copy); - $form->addElement($options_tray); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_IMAGE, 'set_image', 30, 100, $this->getVar('set_image'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_MAIL, 'set_author_mail', 50, 255, $this->getVar('set_author_mail'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_WEBSITE_URL, 'set_author_website_url', 50, 255, $this->getVar('set_author_website_url'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_WEBSITE_NAME, 'set_author_website_name', 50, 255, $this->getVar('set_author_website_name'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_CREDITS, 'set_credits', 50, 255, $this->getVar('set_credits'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_RELEASE_INFO, 'set_release_info', 50, 255, $this->getVar('set_release_info'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_RELEASE_FILE, 'set_release_file', 50, 255, $this->getVar('set_release_file'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MANUAL, 'set_manual', 50, 255, $this->getVar('set_manual'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MANUAL_FILE, 'set_manual_file', 50, 255, $this->getVar('set_manual_file'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_DEMO_SITE_URL, 'set_demo_site_url', 50, 255, $this->getVar('set_demo_site_url'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_DEMO_SITE_NAME, 'set_demo_site_name', 50, 255, $this->getVar('set_demo_site_name'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SUPPORT_URL, 'set_support_url', 50, 255, $this->getVar('set_support_url'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SUPPORT_NAME, 'set_support_name', 50, 255, $this->getVar('set_support_name'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_WEBSITE_URL, 'set_website_url', 50, 255, $this->getVar('set_website_url'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_WEBSITE_NAME, 'set_website_name', 50, 255, $this->getVar('set_website_name'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_RELEASE, 'set_release', 50, 255, $this->getVar('set_release'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_STATUS, 'set_status', 50, 255, $this->getVar('set_status'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_PAYPAL_BUTTON, 'set_donations', 50, 255, $this->getVar('set_donations'))); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SUBVERSION, 'set_subversion', 50, 255, $this->getVar('set_subversion'))); + $tabTray = new TDMCreateFormTabTray('', 'uniqueid', xoops_getModuleOption('jquery_theme', 'system')); + // + $tab1 = new TDMCreateFormTab(_AM_TDMCREATE_IMPORTANT, 'important'); + // + $tab1->addElement(new XoopsFormHidden('set_id', $this->getVar('set_id'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_NAME, 'set_name', 50, 255, $this->getVar('set_name'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_DIRNAME, 'set_dirname', 25, 255, $this->getVar('set_dirname'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_VERSION, 'set_version', 10, 25, $this->getVar('set_version'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SINCE, 'set_since', 10, 25, $this->getVar('set_since'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_PHP, 'set_min_php', 10, 25, $this->getVar('set_min_php'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_XOOPS, 'set_min_xoops', 10, 25, $this->getVar('set_min_xoops'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_ADMIN, 'set_min_admin', 10, 25, $this->getVar('set_min_admin'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MIN_MYSQL, 'set_min_mysql', 10, 25, $this->getVar('set_min_mysql'))); + $tab1->addElement(new XoopsFormTextArea(_AM_TDMCREATE_SETTING_DESCRIPTION, 'set_description', $this->getVar('set_description'), 4, 25)); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR, 'set_author', 50, 255, $this->getVar('set_author'))); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_LICENSE, 'set_license', 50, 255, $this->getVar('set_license'))); + $tabTray->addElement($tab1); + // + $tab2 = new TDMCreateFormTab(_AM_TDMCREATE_OPTIONS_CHECK, 'options_check'); + $options_tray = new XoopsFormElementTray(_OPTIONS, '<br />'); + $mod_checkbox_all = new XoopsFormCheckBox('', "settingbox", 1); + $mod_checkbox_all->addOption('allbox', _AM_TDMCREATE_SETTING_ALL); + $mod_checkbox_all->setExtra(" onclick='xoopsCheckAll(\"settingform\", \"settingbox\");' "); + $mod_checkbox_all->setClass('xo-checkall'); + $options_tray->addElement($mod_checkbox_all); + $mod_admin = $isNew ? $this->tdmcreate->getConfig('display_admin') : $this->getVar('set_admin'); + $check_mod_admin = new XoopsFormCheckBox(' ', 'set_admin', $mod_admin); + $check_mod_admin->addOption(1, _AM_TDMCREATE_SETTING_ADMIN); + $options_tray->addElement($check_mod_admin); + $mod_user = $isNew ? $this->tdmcreate->getConfig('display_user') : $this->getVar('set_user'); + $check_mod_user = new XoopsFormCheckBox(' ', 'set_user', $mod_user); + $check_mod_user->addOption(1, _AM_TDMCREATE_SETTING_USER); + $options_tray->addElement($check_mod_user); + $mod_blocks = $isNew ? $this->tdmcreate->getConfig('active_blocks') : $this->getVar('set_blocks'); + $check_mod_blocks = new XoopsFormCheckBox(' ', 'set_blocks', $mod_blocks); + $check_mod_blocks->addOption(1, _AM_TDMCREATE_SETTING_BLOCKS); + $options_tray->addElement($check_mod_blocks); + $mod_search = $isNew ? $this->tdmcreate->getConfig('active_search') : $this->getVar('set_search'); + $check_mod_search = new XoopsFormCheckBox(' ', 'set_search', $mod_search); + $check_mod_search->addOption(1, _AM_TDMCREATE_SETTING_SEARCH); + $options_tray->addElement($check_mod_search); + $mod_comments = $isNew ? $this->tdmcreate->getConfig('active_comments') : $this->getVar('set_comments'); + $check_mod_comments = new XoopsFormCheckBox(' ', 'set_comments', $mod_comments); + $check_mod_comments->addOption(1, _AM_TDMCREATE_SETTING_COMMENTS); + $options_tray->addElement($check_mod_comments); + $mod_notifications = $isNew ? $this->tdmcreate->getConfig('active_notifications') : $this->getVar('set_notifications'); + $check_mod_notifications = new XoopsFormCheckBox(' ', 'set_notifications', $mod_notifications); + $check_mod_notifications->addOption(1, _AM_TDMCREATE_SETTING_NOTIFICATIONS); + $options_tray->addElement($check_mod_notifications); + $mod_permissions = $isNew ? $this->tdmcreate->getConfig('active_permissions') : $this->getVar('set_permissions'); + $check_mod_permissions = new XoopsFormCheckBox(' ', 'set_permissions', $mod_permissions); + $check_mod_permissions->addOption(1, _AM_TDMCREATE_SETTING_PERMISSIONS); + $options_tray->addElement($check_mod_permissions); + $mod_inroot_copy = $isNew ? $this->tdmcreate->getConfig('active_permissions') : $this->getVar('set_inroot_copy'); + $check_mod_inroot_copy = new XoopsFormCheckBox(' ', 'set_inroot_copy', $mod_inroot_copy); + $check_mod_inroot_copy->addOption(1, _AM_TDMCREATE_SETTING_INROOT_MODULES_COPY); + $options_tray->addElement($check_mod_inroot_copy); + $tab2->addElement($options_tray); + $tabTray->addElement($tab2); + // + $tab3 = new TDMCreateFormTab(_AM_TDMCREATE_NOT_IMPORTANT, 'not_important'); - $form->addElement(new XoopsFormHidden('op', 'save')); - $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); - + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_IMAGE, 'set_image', 30, 100, $this->getVar('set_image'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_MAIL, 'set_author_mail', 50, 255, $this->getVar('set_author_mail'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_WEBSITE_URL, 'set_author_website_url', 50, 255, $this->getVar('set_author_website_url'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_WEBSITE_NAME, 'set_author_website_name', 50, 255, $this->getVar('set_author_website_name'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_CREDITS, 'set_credits', 50, 255, $this->getVar('set_credits'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_RELEASE_INFO, 'set_release_info', 50, 255, $this->getVar('set_release_info'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_RELEASE_FILE, 'set_release_file', 50, 255, $this->getVar('set_release_file'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MANUAL, 'set_manual', 50, 255, $this->getVar('set_manual'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_MANUAL_FILE, 'set_manual_file', 50, 255, $this->getVar('set_manual_file'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_DEMO_SITE_URL, 'set_demo_site_url', 50, 255, $this->getVar('set_demo_site_url'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_DEMO_SITE_NAME, 'set_demo_site_name', 50, 255, $this->getVar('set_demo_site_name'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SUPPORT_URL, 'set_support_url', 50, 255, $this->getVar('set_support_url'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SUPPORT_NAME, 'set_support_name', 50, 255, $this->getVar('set_support_name'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_WEBSITE_URL, 'set_website_url', 50, 255, $this->getVar('set_website_url'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_WEBSITE_NAME, 'set_website_name', 50, 255, $this->getVar('set_website_name'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_RELEASE, 'set_release', 50, 255, $this->getVar('set_release'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_STATUS, 'set_status', 50, 255, $this->getVar('set_status'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_PAYPAL_BUTTON, 'set_donations', 50, 255, $this->getVar('set_donations'))); + $tab3->addElement(new XoopsFormText(_AM_TDMCREATE_SETTING_SUBVERSION, 'set_subversion', 50, 255, $this->getVar('set_subversion'))); + + $tab3->addElement(new XoopsFormHidden('op', 'save')); + $tab3->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); + $tabTray->addElement($tab3); + $form->addElement($tabTray); return $form; } } @@ -236,8 +248,7 @@ * * @param $i * @param $fields - * @return mixed reference to the <a href='psi_element://TDMCreateFields'>TDMCreateFields</a> object - * object + * @return mixed reference to the object */ public function &get($i = null, $fields = null) { @@ -248,7 +259,7 @@ /** * insert a new field in the database * - * @param object $field reference to the {@link TDMCreateFields} object + * @param $field object * @param bool $force * * @return bool FALSE if failed, TRUE if already present and unchanged or successful Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -15,12 +15,12 @@ * @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.5 + * @since 2.5.7 * @author Txmod Xoops <su...@tx...> * @version $Id: 1.91 tables.php 11297 2013-03-24 10:58:10Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); - +include __DIR__ . '/autoload.php'; /* * @Class TDMCreateTables * @extends XoopsObject Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-02 13:47:44 UTC (rev 13076) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-03 09:42:10 UTC (rev 13077) @@ -367,3 +367,6 @@ define('_AM_TDMCREATE_FIELD_PARAMETERS_LIST', "<b>Parameters List</b>"); // define('_AM_TDMCREATE_ABOUT_MAKE_DONATION', "Make a Donation to support this module"); +define('_AM_TDMCREATE_IMPORTANT', "Main Settings"); +define('_AM_TDMCREATE_OPTIONS_CHECK', "Options Settings"); +define('_AM_TDMCREATE_NOT_IMPORTANT', "Secondary Settings"); \ No newline at end of file |
From: <txm...@us...> - 2015-06-02 13:47:49
|
Revision: 13076 http://sourceforge.net/p/xoops/svn/13076 Author: txmodxoops Date: 2015-06-02 13:47:44 +0000 (Tue, 02 Jun 2015) Log Message: ----------- Added alpha 3 Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/style.css XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/style.css XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/fonts/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/fonts/VeraBd.ttf XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/fonts/green.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/fonts/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/fonts/red.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/fonts/xcvLogo.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/arrow.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/blocks.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/drag.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/editfields.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/fields.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/left_right.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/nb_fields.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/rss.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/spinner.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/submenu.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/tables.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/16/toggle.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/24/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/24/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/24/next.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/24/previous.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/addmodule.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/addtable.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/builder.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/dashboard.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/edittable.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/fields.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/loading.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/settings.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/blank.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/empty.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/naked.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/tdmxoops_logo.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/txmodxoops_logo.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/xoops2.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/logos/xoopsdevelopmentteam_logo.gif XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/images/tdmcreate_logo.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/debug.log XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/functions.js XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/sortable.js XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/SplClassLoader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateAutoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateHelper.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateSession.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/building.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/cache/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/cache/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldattributes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldkey.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldnull.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldtype.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAbstract.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAutoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateFile.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateHtmlSmartyCodes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateStructure.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminAbout.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPermissions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPhpCode.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/blocks/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/blocks/BlocksFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/blocks/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/cache/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/cache/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassHelper.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/css/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/css/CssStyles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/css/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/docs/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/docs/DocsChangelog.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/docs/DocsFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/docs/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommentFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeComments.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeInstall.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeJquery.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeNotifications.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeSearch.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeUpdate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageBlocks.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageDefines.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageHelp.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageMailTpl.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageMain.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/sql/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/sql/SqlFile.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/sql/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/TDMCreateHtmlSmartyCodes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminAbout.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPermissions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/blocks/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/blocks/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserBreadcrumbs.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserBroken.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPdf.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPrint.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserRate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserRss.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserSearch.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserSingle.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserSubmit.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserBroken.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserListTag.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserNotificationUpdate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPdf.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPrint.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserRate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserRss.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserSearch.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserSingle.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserSubmit.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserViewTag.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserVisit.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRadio.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateThemeForm.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/html/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/html/TDMCreateFormLabel.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/html/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/changelog.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/credits.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/install.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/lang_diff.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/license.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/docs/readme.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/functions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/install.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/update.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/help/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/help/help.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/help/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/mail_template/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/mail_template/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/update language 1.0 to 1.1.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/update language 1.1 to 1.15.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/update language 1.1 to 1.37.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/update language 1.15 to 1.37.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/update language 1.37 to 1.38.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/update language 1.38 to 1.39.txt XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_about.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_building.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_fields.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_fields_item.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_footer.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_header.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_index.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_modules.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_settings.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_tables.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_tables_item.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/index.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,27 @@ +<?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: about.php 11084 2013-02-23 15:44:20Z timgno $ + */ +include __DIR__ . '/header.php'; +$templateMain = 'tdmcreate_about.tpl'; +$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('about.php')); +$about = $adminMenu->renderAbout('7LFE862PGJN88', false); +$aboutRes = TDMCreate_MakeDonationForm($about); +$GLOBALS['xoopsTpl']->assign('about', $aboutRes); +include __DIR__ . '/footer.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,96 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.0 + * @author Txmod Xoops http://www.txmodxoops.org + * @version $Id: building.php 12258 2014-01-02 09:33:29Z timgno $ + */ +include __DIR__ . '/header.php'; +$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': + $templateMain = 'tdmcreate_building.tpl'; + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php')); + // Get var module dirname + $moduleDirname = $moduleObj->getVar('mod_dirname'); + // Directories for copy from to + $fromDir = TDMC_UPLOAD_REPOSITORY_PATH . '/' . strtolower($moduleDirname); + $toDir = XOOPS_ROOT_PATH . '/modules/' . strtolower($moduleDirname); + if (isset($moduleDirname)) { + // Clear this module if it's in repository + if (is_dir($fromDir)) { + TDMCreate_clearDir($fromDir); + } + // Clear this module if it's in root/modules + if (is_dir($toDir)) { + TDMCreate_clearDir($toDir); + } + } + // Structure + include_once TDMC_CLASSES_PATH . '/files/TDMCreateArchitecture.php'; + $handler = TDMCreateArchitecture::getInstance(); + // Creation of the structure of folders and files + $base_architecture = $handler->createBaseFoldersFiles($moduleObj); + if (false !== $base_architecture) { + $GLOBALS['xoopsTpl']->assign('base_architecture', true); + } else { + $GLOBALS['xoopsTpl']->assign('base_architecture', false); + } + // Get files + $build = array(); + $files = $handler->createFilesToBuilding($moduleObj); + foreach ($files as $file) { + if ($file) { + $build['list'] = $file; + } + $GLOBALS['xoopsTpl']->append('builds', $build); + } + unset($build); + // Directory to saved all files + $GLOBALS['xoopsTpl']->assign('building_directory', sprintf(_AM_TDMCREATE_BUILDING_DIRECTORY, $moduleDirname)); + // Copy this module in root modules + if (1 == $moduleObj->getVar('mod_inroot_copy')) { + TDMCreate_copyr($fromDir, $toDir); + } + break; + + case 'default': + default: + $templateMain = 'tdmcreate_building.tpl'; + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php')); + // Redirect if there aren't modules + $nbModules = $tdmcreate->getHandler('modules')->getCount(); + if (0 == $nbModules) { + redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES); + } + unset($nbModules); + include_once TDMC_PATH . '/class/building.php'; + $handler = TDMCreateBuilding::getInstance(); + $form = $handler->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; +} +include __DIR__ . '/footer.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,291 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.0 + * @author Txmod Xoops http://www.txmodxoops.org + * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ + */ +include __DIR__ . '/header.php'; +// Recovered value of arguments op in the URL $ +$op = XoopsRequest::getString('op', 'list'); +// Get fields Variables +$fieldMid = XoopsRequest::getInt('field_mid'); +$fieldTid = XoopsRequest::getInt('field_tid'); +$fieldNumb = XoopsRequest::getInt('field_numb'); +$fieldName = XoopsRequest::getString('field_name', ''); +// switch op +switch ($op) +{ + case 'list': + default: + $start = XoopsRequest::getInt('start', 0); + $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager')); + // Define main template + $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'); + $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/sortable.js'); + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL); + $GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL); + $GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL); + $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL); + $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); + $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); + // Redirect if there aren't modules + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); + if ( $modulesCount == 0 ) { + redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES ); + } + unset($modulesCount); + // Redirect if there aren't tables + $tablesCount = $tdmcreate->getHandler('tables')->getCountTables(); + if ($tablesCount == 0) { + redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES ); + } + // Get the list of tables + $tablesAll = $tdmcreate->getHandler('tables')->getAllTables($start, $limit); + if ($tablesCount > 0) + { + $tlid = 1; + foreach (array_keys($tablesAll) as $tid) + { + // Display tables list + $table = $tablesAll[$tid]->getValues(); + $talid = array('lid' => $tlid); + $table = array_merge($table, $talid); + // Get the list of fields + $fieldsCount = $tdmcreate->getHandler('fields')->getCountFields(); + $fieldsAll = $tdmcreate->getHandler('fields')->getAllFieldsByModuleAndTableId($table['mid'], $tid); + // Display fields list + $fields = array(); + $lid = 1; + if ( $fieldsCount > 0 ) + { + foreach (array_keys($fieldsAll) as $fid) + { + $field = $fieldsAll[$fid]->getValues(); + $falid = array('lid' => $lid); + $fields[] = array_merge($field, $falid); + unset($field); + ++$lid; + } + } + ++$tlid; + unset($lid); + $table['fields'] = $fields; + $GLOBALS['xoopsTpl']->append('tables_list', $table); + unset($table); + } + unset($tlid); + unset($fields); + if ( $tablesCount > $limit ) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $pagenav = new XoopsPageNav($tablesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); + } + } else { + $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_FIELDS); + } + break; + + case 'new': + // Define main template + $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'); + $adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + // Form Add + $fieldsObj =& $tdmcreate->getHandler('fields')->create(); + $form = $fieldsObj->getFormNew($fieldMid, $fieldTid, $fieldNumb, $fieldName); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'save': + // + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + $fieldId = XoopsRequest::getInt('field_id'); + // Fields Handler + $fields = $tdmcreate->getHandler('fields'); + $fieldOrder = 1; + // Set Variables + foreach($_POST['field_id'] as $key => $value) + { + if(isset($value)){ + $fieldsObj =& $fields->get($value); + } else { + $fieldsObj =& $fields->create(); + } + $order = $fieldsObj->isNew() ? $fieldOrder : XoopsRequest::getInt('field_order'); + // Set Data + $fieldsObj->setVar( 'field_mid', $fieldMid ); + $fieldsObj->setVar( 'field_tid', $fieldTid ); + $fieldsObj->setVar( 'field_order', $order ); + $fieldsObj->setVar( 'field_name', $_POST['field_name'][$key]); + $fieldsObj->setVar( 'field_type', $_POST['field_type'][$key]); + $fieldsObj->setVar( 'field_value', $_POST['field_value'][$key]); + $fieldsObj->setVar( 'field_attribute', $_POST['field_attribute'][$key]); + $fieldsObj->setVar( 'field_null', $_POST['field_null'][$key]); + $fieldsObj->setVar( 'field_default', $_POST['field_default'][$key]); + $fieldsObj->setVar( 'field_key', $_POST['field_key'][$key]); + $fieldsObj->setVar( 'field_element', $_POST['field_element'][$key]); + $fieldsObj->setVar( 'field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_main', ($key == $_REQUEST['field_main'] ? 1 : 0)); + $fieldsObj->setVar( 'field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0); + // Insert Data + $tdmcreate->getHandler('fields')->insert($fieldsObj); + $fieldOrder++; + } + unset($fieldOrder); + // Get table name from field table id + $tables =& $tdmcreate->getHandler('tables')->get($fieldTid); + $tableName = $tables->getVar('table_name'); + // Set field elements + if ($fieldsObj->isNew()) { + // Fields Elements Handler + $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create(); + $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid ); + $fieldelementObj->setVar( 'fieldelement_tid', $fieldTid ); + $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($tableName) ); + $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($tableName) ); + // Insert new field element id for table name + if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) { + $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element'); + } + redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_SAVED_OK, $tableName)); + } else { + // Needed code from table name by field_tid + redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK, $tableName)); + } + // + $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); + $form = $fieldsObj->getForm(null, $fieldTid); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'edit': + // Define main template + $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'); + $adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + // Form Edit + $fieldId = XoopsRequest::getInt('field_id'); + $fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId ); + $form = $fieldsObj->getFormEdit($fieldMid, $fieldTid); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'order': + // Initialize fields handler + $fieldsObj = $tdmcreate->getHandler('fields'); + if (isset($_POST['forder'])) { + $i = 0; + foreach ($_POST['forder'] as $order) { + if ($order > 0) { + $fieldOrder = $fieldsObj->get($order); + $fieldOrder->setVar('field_order', $i); + if (!$fieldsObj->insert($fieldOrder)) { + $error = true; + } + ++$i; + } + } + redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR); + unset($i); + } + exit; + break; + + case 'delete': + $tablesObj =& $tdmcreate->getHandler('tables')->get($fieldTid); + if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if ($tdmcreate->getHandler('tables')->delete($tablesObj)) { + redirect_header('fields.php', 3, _AM_TDMCREATE_FORMDELOK); + } else { + echo $tablesObj->getHtmlErrors(); + } + } else { + xoops_confirm(array('ok' => 1, 'field_tid' => $fieldTid, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name'))); + } + break; + + case 'display': + $fieldId = tdmcreate_CleanVars($_POST, 'field_id', 0, 'int'); + if ($fieldId > 0) { + $fieldsObj = $tdmcreate->getHandler('fields')->get($fieldId); + if (isset($_POST['field_parent'])) { + $field_parent = $fieldsObj->getVar('field_parent'); + $fieldsObj->setVar('field_parent', !$field_parent); + } + if (isset($_POST['field_inlist'])) { + $field_inlist = $fieldsObj->getVar('field_inlist'); + $fieldsObj->setVar('field_inlist', !$field_inlist); + } + if (isset($_POST['field_inform'])) { + $field_inform = $fieldsObj->getVar('field_inform'); + $fieldsObj->setVar('field_inform', !$field_inform); + } + if (isset($_POST['field_admin'])) { + $field_admin = $fieldsObj->getVar('field_admin'); + $fieldsObj->setVar('field_admin', !$field_admin); + } + if (isset($_POST['field_user'])) { + $field_user = $fieldsObj->getVar('field_user'); + $fieldsObj->setVar('field_user', !$field_user); + } + if (isset($_POST['field_block'])) { + $field_block = $fieldsObj->getVar('field_block'); + $fieldsObj->setVar('field_block', !$field_block); + } + if (isset($_POST['field_main'])) { + $field_main = $fieldsObj->getVar('field_main'); + $fieldsObj->setVar('field_main', !$field_main); + } + if (isset($_POST['field_search'])) { + $field_search = $fieldsObj->getVar('field_search'); + $fieldsObj->setVar('field_search', !$field_search); + } + if (isset($_POST['field_required'])) { + $field_required = $fieldsObj->getVar('field_required'); + $fieldsObj->setVar('field_required', !$field_required); + } + if ($tdmcreate->getHandler('fields')->insert($fieldsObj)) { + redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); + } + $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); + } + break; +} +include __DIR__ . '/footer.php'; \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,25 @@ +<?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: footer.php 12207 2013-10-23 02:46:52Z beckmi $ + */ +$GLOBALS['xoopsTpl']->assign('module_name', $GLOBALS['xoopsModule']->getVar('name')); +if (isset($templateMain)) { + $GLOBALS['xoopsTpl']->display("db:{$templateMain}"); +} +xoops_cp_footer(); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,57 @@ +<?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: header.php 12258 2014-01-02 09:33:29Z timgno $ + */ +include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; +include_once dirname(__DIR__) . '/include/common.php'; +// +$thisDirname = $GLOBALS['xoopsModule']->getVar('dirname'); +// Link System Icons +$sysPathIcon16 = $GLOBALS['xoopsModule']->getInfo('sysicons16'); +$sysPathIcon32 = $GLOBALS['xoopsModule']->getInfo('sysicons32'); +// Link Local Icons +$modPathIcon16 = $GLOBALS['xoopsModule']->getInfo('modicons16'); +$modPathIcon32 = $GLOBALS['xoopsModule']->getInfo('modicons32'); +$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin'); +// TDMCreate Instance +$tdmcreate = TDMCreateHelper::getInstance(); +// MyTextSanitizer +$myts =& MyTextSanitizer::getInstance(); +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH . "/class/template.php"); + $xoopsTpl = new XoopsTpl(); +} +// System Icons +$GLOBALS['xoopsTpl']->assign('sysPathIcon16', $sysPathIcon16); +$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); +// Local Icons +$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); +$GLOBALS['xoopsTpl']->assign('modPathIcon32', $modPathIcon32); +// Load languages +xoops_loadLanguage('admin', $thisDirname); +xoops_loadLanguage('modinfo', $thisDirname); +xoops_loadLanguage('main', $thisDirname); +// Locad admin menu class +if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) { + include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'); +} else { + redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); +} +xoops_cp_header(); +$adminMenu = new ModuleAdmin(); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.html =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.html (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.html 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,49 @@ +<?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: index.php 11084 2013-02-23 15:44:20Z timgno $ + */ +include __DIR__ . '/header.php'; +$criteria = new CriteriaCompo(); +$count_modules = $tdmcreate->getHandler('modules')->getCount($criteria); +$count_tables = $tdmcreate->getHandler('tables')->getCount($criteria); +$count_fields = $tdmcreate->getHandler('fields')->getCount($criteria); +unset($criteria); +$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'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMFIELDS . '</label>', $count_fields, 'Gray'); + +// Upload Folders +$folder = array( + TDMC_UPLOAD_PATH, + TDMC_UPLOAD_REPOSITORY_PATH, + TDMC_UPLOAD_IMGMOD_PATH, + TDMC_UPLOAD_IMGTAB_PATH +); + +// Uploads Folders Created +foreach (array_keys( $folder) as $i) { + $adminMenu->addConfigBoxLine($folder[$i], 'folder'); + $adminMenu->addConfigBoxLine(array($folder[$i], '777'), 'chmod'); +} + +$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('index.php')); +$GLOBALS['xoopsTpl']->assign('index', $adminMenu->renderIndex()); +include __DIR__ . '/footer.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,54 @@ +<?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: menu.php 11084 2013-02-23 15:44:20Z timgno $ + */ +$module_handler =& xoops_gethandler('module'); +$xoopsModule =& XoopsModule::getByDirname('TDMCreate'); +$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); +$sysPathIcon32 = $moduleInfo->getInfo('sysicons32'); +$adminmenu = array(); +$i = 1; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU1; +$adminmenu[$i]['link'] = 'admin/index.php'; +$adminmenu[$i]['icon'] = $sysPathIcon32 . '/dashboard.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU2; +$adminmenu[$i]['link'] = 'admin/settings.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/settings.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU3; +$adminmenu[$i]['link'] = 'admin/modules.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/addmodule.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU4; +$adminmenu[$i]['link'] = 'admin/tables.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/addtable.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU5; +$adminmenu[$i]['link'] = 'admin/fields.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/fields.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6; +$adminmenu[$i]['link'] = 'admin/building.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/builder.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU7; +$adminmenu[$i]['link'] = 'admin/about.php'; +$adminmenu[$i]['icon'] = $sysPathIcon32 . '/about.png'; +unset($i); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php 2015-06-02 13:47:44 UTC (rev 13076) @@ -0,0 +1,230 @@ +<?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.5 + * @author Txmod Xoops <su...@tx...> + * @version $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $ + */ +include __DIR__ . '/header.php'; +// Recovered value of argument op in the URL $ +$op = XoopsRequest::getString('op', 'list'); +// +$modId = XoopsRequest::getInt('mod_id'); +// +switch ($op) { + case 'list': + default: + $start = XoopsRequest::getInt('start', 0); + $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('modules_adminpager')); + // Define main template + $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')); + $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL); + $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL); + $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); + $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); + $modulesAll = $tdmcreate->getHandler('modules')->getAllModules($start, $limit); + // Redirect if there aren't modules + if (0 == $modulesCount) { + redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES); + } + // Display modules list + if ($modulesCount > 0) { + foreach (array_keys($modulesAll) as $i) { + $module = $modulesAll[$i]->getValues(); + $GLOBALS['xoopsTpl']->append('modules_list', $module); + unset($module); + } + if ($modulesCount > $limit) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); + } + } else { + $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MODULES); + } + break; + + case 'new': + // Define main template + $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'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + + $modulesObj =& $tdmcreate->getHandler('modules')->create(); + $form = $modulesObj->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'save': + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if (isset($modId)) { + $modulesObj =& $tdmcreate->getHandler('modules')->get($modId); + } else { + $modulesObj =& $tdmcreate->getHandler('modules')->create(); + } + $moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['mod_dirname'])); + //Form module save + $modulesObj->setVars(array( + 'mod_name' => $_POST['mod_name'], + 'mod_dirname' => $moduleDirname, + 'mod_version' => $_POST['mod_version'], + 'mod_since' => $_POST['mod_since'], + 'mod_min_php' => $_POST['mod_min_php'], + 'mod_min_xoops' => $_POST['mod_min_xoops'], + 'mod_min_admin' => $_POST['mod_min_admin'], + 'mod_min_mysql' => $_POST['mod_min_mysql'], + 'mod_description' => $_POST['mod_description'], + 'mod_author' => $_POST['mod_author'], + 'mod_author_mail' => $_POST['mod_author_mail'], + 'mod_author_website_url' => $_POST['mod_author_website_url'], + 'mod_author_website_name' => $_POST['mod_author_website_name'], + 'mod_credits' => $_POST['mod_credits'], + 'mod_license' => $_POST['mod_license'], + 'mod_release_info' => $_POST['mod_release_info'], + 'mod_release_file' => $_POST['mod_release_file'], + 'mod_manual' => $_POST['mod_manual'], + 'mod_manual_file' => $_POST['mod_manual_file'])); + //Form mod_image + include_once XOOPS_ROOT_PATH . '/class/uploader.php'; + $uploader = new XoopsMediaUploader(TDMC_UPLOAD_IMGMOD_PATH, $tdmcreate->getConfig('mimetypes'), + $tdmcreate->getConfig('maxsize'), null, null); + if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { + $uploader->fetchMedia($_POST['xoops_upload_file'][0]); + if (!$uploader->upload()) { + $errors = $uploader->getErrors(); + redirect_header('javascript:history.go(-1)', 3, $errors); + } else { + $modulesObj->setVar('mod_image', $uploader->getSavedFileName()); + } + } else { + $modulesObj->setVar('mod_image', $_POST['mod_image']); + } + //Form module save + $modulesObj->setVars(array( + 'mod_demo_site_url' => $_POST['mod_demo_site_url'], + 'mod_demo_site_name' => $_POST['mod_demo_site_name'], + 'mod_support_url' => $_POST['mod_support_url'], + 'mod_support_name' => $_POST['mod_support_name'], + 'mod_website_url' => $_POST['mod_website_url'], + 'mod_website_name' => $_POST['mod_website_name'], + 'mod_release' => $_POST['mod_release'], + 'mod... [truncated message content] |
From: <txm...@us...> - 2015-06-01 12:53:54
|
Revision: 13075 http://sourceforge.net/p/xoops/svn/13075 Author: txmodxoops Date: 2015-06-01 12:53:51 +0000 (Mon, 01 Jun 2015) Log Message: ----------- Alpha 3 Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/xoops_version.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/xoops_version.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/xoops_version.php 2015-06-01 11:22:57 UTC (rev 13074) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/xoops_version.php 2015-06-01 12:53:51 UTC (rev 13075) @@ -47,10 +47,10 @@ $modversion['targetdir'] = XOOPS_ROOT_PATH . "/modules/{$dirname}/modules/"; -$modversion['release_date'] = "2015/04/27"; +$modversion['release_date'] = "2015/06/01"; $modversion['module_website_url'] = "http://www.xoops.org/"; $modversion['module_website_name'] = "XOOPS"; -$modversion['module_status'] = "Alpha 2"; +$modversion['module_status'] = "Alpha 3"; $modversion['min_php'] = "5.3"; $modversion['min_xoops'] = "2.5.7"; |
From: <txm...@us...> - 2015-06-01 11:23:00
|
Revision: 13074 http://sourceforge.net/p/xoops/svn/13074 Author: txmodxoops Date: 2015-06-01 11:22:57 +0000 (Mon, 01 Jun 2015) Log Message: ----------- Fixed display toggle in modules, table & fields list Added table_index filed to insert code in user/index.php Needed a fresh installation Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 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/admin/AdminObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 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/IncludeFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_modules.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_tables.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_tables_item.tpl Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/16/rss.gif XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/index.html XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/next.png XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/previous.png Removed Paths: ------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -49,81 +49,45 @@ $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); // Redirect if there aren't modules - $countModules = $tdmcreate->getHandler('modules')->getCount(); - if ( $countModules == 0 ) { + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); + if ( $modulesCount == 0 ) { redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES ); } - unset($countModules); + unset($modulesCount); // Redirect if there aren't tables - $handlerTables = $tdmcreate->getHandler('tables'); - $countTables = $handlerTables->getCount(); - if ($countTables == 0) { + $tablesCount = $tdmcreate->getHandler('tables')->getCountTables(); + if ($tablesCount == 0) { redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES ); } - unset($countTables); // Get the list of tables - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('table_mid', $handlerTables->getVar('table_mid'))); - $criteria->setStart($start); - $criteria->setLimit($limit); - $criteria->setSort('table_id ASC, table_order ASC, table_name'); - $criteria->setOrder('ASC'); - $countTables = $tdmcreate->getHandler('tables')->getCount($criteria); - $tablesAll = $tdmcreate->getHandler('tables')->getAll($criteria); - unset($criteria); - if ($countTables > 0) + $tablesAll = $tdmcreate->getHandler('tables')->getAllTables($start, $limit); + if ($tablesCount > 0) { $tlid = 1; foreach (array_keys($tablesAll) as $tid) - { + { // Display tables list - $table['id'] = $tid; - $table['lid'] = $tlid; - $table['mid'] = $tablesAll[$tid]->getVar('table_mid'); - $table['name'] = ucfirst($tablesAll[$tid]->getVar('table_name')); - $table['image'] = $tablesAll[$tid]->getVar('table_image'); - $table['nbfields'] = $tablesAll[$tid]->getVar('table_nbfields'); - $table['order'] = $tablesAll[$tid]->getVar('table_order'); - $table['autoincrement'] = $tablesAll[$tid]->getVar('table_autoincrement'); - $table['blocks'] = $tablesAll[$tid]->getVar('table_blocks'); - $table['admin'] = $tablesAll[$tid]->getVar('table_admin'); - $table['user'] = $tablesAll[$tid]->getVar('table_user'); - $table['search'] = $tablesAll[$tid]->getVar('table_search'); + $table = $tablesAll[$tid]->getValues(); + $talid = array('lid' => $tlid); + $table = array_merge($table, $talid); // Get the list of fields - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('field_mid', $table['mid'])); - $criteria->add(new Criteria('field_tid', $tid)); - $criteria->setSort('field_order ASC, field_id ASC, field_name'); - $criteria->setOrder('ASC'); - $countFields = $tdmcreate->getHandler('fields')->getCount($criteria); - $fieldsAll = $tdmcreate->getHandler('fields')->getObjects($criteria); - unset($criteria); + $fieldsCount = $tdmcreate->getHandler('fields')->getCountFields(); + $fieldsAll = $tdmcreate->getHandler('fields')->getAllFieldsByModuleAndTableId($table['mid'], $tid); // Display fields list $fields = array(); $lid = 1; - if ( $countFields > 0 ) + if ( $fieldsCount > 0 ) { - foreach (array_keys($fieldsAll) as $fid) + foreach (array_keys($fieldsAll) as $fid) { - $field['id'] = $fid; - $field['lid'] = $lid; - $field['order'] = $fieldsAll[$fid]->getVar('field_order'); - $field['name'] = str_replace('_', ' ', ucfirst($fieldsAll[$fid]->getVar('field_name'))); - $field['parent'] = $fieldsAll[$fid]->getVar('field_parent'); - $field['inlist'] = $fieldsAll[$fid]->getVar('field_inlist'); - $field['inform'] = $fieldsAll[$fid]->getVar('field_inform'); - $field['admin'] = $fieldsAll[$fid]->getVar('field_admin'); - $field['user'] = $fieldsAll[$fid]->getVar('field_user'); - $field['block'] = $fieldsAll[$fid]->getVar('field_block'); - $field['main'] = $fieldsAll[$fid]->getVar('field_main'); - $field['search'] = $fieldsAll[$fid]->getVar('field_search'); - $field['required'] = $fieldsAll[$fid]->getVar('field_required'); - $fields[] = $field; - unset($field); - $lid++; + $field = $fieldsAll[$fid]->getValues(); + $falid = array('lid' => $lid); + $fields[] = array_merge($field, $falid); + unset($field); + ++$lid; } } - $tlid++; + ++$tlid; unset($lid); $table['fields'] = $fields; $GLOBALS['xoopsTpl']->append('tables_list', $table); @@ -131,9 +95,9 @@ } unset($tlid); unset($fields); - if ( $countTables > $limit ) { + if ( $tablesCount > $limit ) { include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; - $pagenav = new XoopsPageNav($countTables, $limit, $start, 'start', 'op=list&limit=' . $limit); + $pagenav = new XoopsPageNav($tablesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); } } else { @@ -278,26 +242,50 @@ break; case 'display': - // Fields Handler - $fields = $tdmcreate->getHandler('fields'); - // - foreach ($_POST['field_id'] as $key => $value) { - $fieldsObj =& $fields->get($value); - $fieldsObj->setVar('field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_user', (1 == $_REQUEST['field_user'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_block', (1 == $_REQUEST['field_block'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_main', ($key == $_REQUEST['field_main']) ? 0 : 1); - $fieldsObj->setVar('field_search', (1 == $_REQUEST['field_search'][$key]) ? 0 : 1); - $fieldsObj->setVar('field_required', (1 == $_REQUEST['field_required'][$key]) ? 0 : 1); - } - if ($fieldsObj->insert($fieldsObj, true)) { - redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); - } else { - redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_FAILED); - } + $fieldId = tdmcreate_CleanVars($_POST, 'field_id', 0, 'int'); + if ($fieldId > 0) { + $fieldsObj = $tdmcreate->getHandler('fields')->get($fieldId); + if (isset($_POST['field_parent'])) { + $field_parent = $fieldsObj->getVar('field_parent'); + $fieldsObj->setVar('field_parent', !$field_parent); + } + if (isset($_POST['field_inlist'])) { + $field_inlist = $fieldsObj->getVar('field_inlist'); + $fieldsObj->setVar('field_inlist', !$field_inlist); + } + if (isset($_POST['field_inform'])) { + $field_inform = $fieldsObj->getVar('field_inform'); + $fieldsObj->setVar('field_inform', !$field_inform); + } + if (isset($_POST['field_admin'])) { + $field_admin = $fieldsObj->getVar('field_admin'); + $fieldsObj->setVar('field_admin', !$field_admin); + } + if (isset($_POST['field_user'])) { + $field_user = $fieldsObj->getVar('field_user'); + $fieldsObj->setVar('field_user', !$field_user); + } + if (isset($_POST['field_block'])) { + $field_block = $fieldsObj->getVar('field_block'); + $fieldsObj->setVar('field_block', !$field_block); + } + if (isset($_POST['field_main'])) { + $field_main = $fieldsObj->getVar('field_main'); + $fieldsObj->setVar('field_main', !$field_main); + } + if (isset($_POST['field_search'])) { + $field_search = $fieldsObj->getVar('field_search'); + $fieldsObj->setVar('field_search', !$field_search); + } + if (isset($_POST['field_required'])) { + $field_required = $fieldsObj->getVar('field_required'); + $fieldsObj->setVar('field_required', !$field_required); + } + if ($tdmcreate->getHandler('fields')->insert($fieldsObj)) { + redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); + } + $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); + } break; } include __DIR__ . '/footer.php'; \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -40,40 +40,22 @@ $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL); $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); - $criteria = new CriteriaCompo(); - $criteria->setStart($start); - $criteria->setLimit($limit); - $criteria->setSort('mod_id ASC, mod_name'); - $criteria->setOrder('ASC'); - $nb_modules = $tdmcreate->getHandler('modules')->getCount($criteria); - $mods_arr = $tdmcreate->getHandler('modules')->getAll($criteria); - unset($criteria); + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); + $modulesAll = $tdmcreate->getHandler('modules')->getAllModules($start, $limit); // Redirect if there aren't modules - if (0 == $nb_modules) { + if (0 == $modulesCount) { redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES); } // Display modules list - if ($nb_modules > 0) { - foreach (array_keys($mods_arr) as $i) { - $mod['id'] = $i; - $mod['name'] = $mods_arr[$i]->getVar('mod_name'); - $mod['version'] = $mods_arr[$i]->getVar('mod_version'); - $mod['image'] = $mods_arr[$i]->getVar('mod_image'); - $mod['release'] = $mods_arr[$i]->getVar('mod_release'); - $mod['status'] = $mods_arr[$i]->getVar('mod_status'); - $mod['admin'] = $mods_arr[$i]->getVar('mod_admin'); - $mod['user'] = $mods_arr[$i]->getVar('mod_user'); - $mod['blocks'] = $mods_arr[$i]->getVar('mod_blocks'); - $mod['search'] = $mods_arr[$i]->getVar('mod_search'); - $mod['comments'] = $mods_arr[$i]->getVar('mod_comments'); - $mod['notifications'] = $mods_arr[$i]->getVar('mod_notifications'); - $mod['permissions'] = $mods_arr[$i]->getVar('mod_permissions'); - $GLOBALS['xoopsTpl']->append('modules_list', $mod); - unset($mod); + if ($modulesCount > 0) { + foreach (array_keys($modulesAll) as $i) { + $module = $modulesAll[$i]->getValues(); + $GLOBALS['xoopsTpl']->append('modules_list', $module); + unset($module); } - if ($nb_modules > $limit) { + if ($modulesCount > $limit) { include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; - $pagenav = new XoopsPageNav($nb_modules, $limit, $start, 'start', 'op=list&limit=' . $limit); + $pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); } } else { @@ -205,48 +187,44 @@ } break; - case 'display': - //if ( $modId > 0 ) { - $mod_admin = XoopsRequest::getInt('mod_admin'); - $mod_user = XoopsRequest::getInt('mod_user'); - $mod_blocks = XoopsRequest::getInt('mod_blocks'); - $mod_search = XoopsRequest::getInt('mod_search'); - $mod_comments = XoopsRequest::getInt('mod_comments'); - $mod_notifications = XoopsRequest::getInt('mod_notifications'); - $mod_permissions = XoopsRequest::getInt('mod_permissions'); - - //foreach($_POST['mod_id'] as $key => $value) - //{ - /*$mod_admin = tdmcreate_CleanVars($_REQUEST, 'mod_admin'); - $mod_user = tdmcreate_CleanVars($_REQUEST, 'mod_user'); - $mod_blocks = tdmcreate_CleanVars($_REQUEST, 'mod_blocks'); - $mod_search = tdmcreate_CleanVars($_REQUEST, 'mod_search'); - $mod_comments = tdmcreate_CleanVars($_REQUEST, 'mod_comments'); - $mod_notifications = tdmcreate_CleanVars($_REQUEST, 'mod_notifications'); - $mod_permissions = tdmcreate_CleanVars($_REQUEST, 'mod_permissions'); */ - - $modulesObj =& $tdmcreate->getHandler('modules')->get($modId); - if (isset($mod_admin)) { - $modulesObj->setVar('mod_admin', $mod_admin); - } elseif (isset($mod_user)) { - $modulesObj->setVar('mod_user', $mod_user); - } elseif (isset($mod_blocks)) { - $modulesObj->setVar('mod_blocks', $mod_blocks); - } elseif (isset($mod_search)) { - $modulesObj->setVar('mod_search', $mod_search); - } elseif (isset($mod_comments)) { - $modulesObj->setVar('mod_comments', $mod_comments); - } elseif (isset($mod_notifications)) { - $modulesObj->setVar('mod_notifications', $mod_notifications); - } elseif (isset($mod_permissions)) { - $modulesObj->setVar('mod_permissions', $mod_permissions); - } - if ($tdmcreate->getHandler('modules')->insert($modulesObj, true)) { - redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS); - } else { - redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED); - } - //} + case 'display': + $id = tdmcreate_CleanVars($_POST, 'mod_id', 0, 'int'); + if ($id > 0) { + $modulesObj = $tdmcreate->getHandler('modules')->get($id); + if (isset($_POST['mod_admin'])) { + $mod_admin = $modulesObj->getVar('mod_admin'); + $modulesObj->setVar('mod_admin', !$mod_admin); + } + if (isset($_POST['mod_user'])) { + $mod_user = $modulesObj->getVar('mod_user'); + $modulesObj->setVar('mod_user', !$mod_user); + } + if (isset($_POST['mod_blocks'])) { + $mod_blocks = $modulesObj->getVar('mod_blocks'); + $modulesObj->setVar('mod_blocks', !$mod_blocks); + } + if (isset($_POST['mod_search'])) { + $mod_search = $modulesObj->getVar('mod_search'); + $modulesObj->setVar('mod_search', !$mod_search); + } + if (isset($_POST['mod_comments'])) { + $mod_comments = $modulesObj->getVar('mod_comments'); + $modulesObj->setVar('mod_comments', !$mod_comments); + } + if (isset($_POST['mod_notifications'])) { + $mod_notifications = $modulesObj->getVar('mod_notifications'); + $modulesObj->setVar('mod_notifications', !$mod_notifications); + } + if (isset($_POST['mod_permissions'])) { + $mod_permissions = $modulesObj->getVar('mod_permissions'); + $modulesObj->setVar('mod_permissions', !$mod_permissions); + } + if ($tdmcreate->getHandler('modules')->insert($modulesObj)) { + redirect_header('modules.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); + } + $GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors()); + } break; } + include __DIR__ . '/footer.php'; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -51,78 +51,45 @@ $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); // Get the list of modules - $criteria = new CriteriaCompo(); - $criteria->setStart($start); - $criteria->setLimit($limit); - $criteria->setSort('mod_id ASC, mod_name'); - $criteria->setOrder('ASC'); - $numbModules = $tdmcreate->getHandler('modules')->getCount($criteria); + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); // Redirect if there aren't modules - if (0 == $numbModules) { + if (0 == $modulesCount) { redirect_header('modules.php?op=new', 10, _AM_TDMCREATE_NOTMODULES); } - $mods_arr = $tdmcreate->getHandler('modules')->getAll($criteria); - unset($criteria); - $numbTables = $tdmcreate->getHandler('tables')->getObjects(null); + $modulesAll = $tdmcreate->getHandler('modules')->getAllModules($start, $limit); + $tablesCount = $tdmcreate->getHandler('tables')->getObjects(null); // Redirect if there aren't tables - if (0 == $numbTables) { + if (0 == $tablesCount) { redirect_header('tables.php?op=new', 10, _AM_TDMCREATE_NOTTABLES); } - unset($numbTables); + unset($tablesCount); // Display modules list - if ($numbModules > 0) { - foreach (array_keys($mods_arr) as $i) { - $mod['id'] = $i; - $mod['name'] = $mods_arr[$i]->getVar('mod_name'); - $mod['image'] = $mods_arr[$i]->getVar('mod_image'); - $mod['admin'] = $mods_arr[$i]->getVar('mod_admin'); - $mod['user'] = $mods_arr[$i]->getVar('mod_user'); - $mod['blocks'] = $mods_arr[$i]->getVar('mod_blocks'); - $mod['search'] = $mods_arr[$i]->getVar('mod_search'); - $mod['comments'] = $mods_arr[$i]->getVar('mod_comments'); - $mod['notifications'] = $mods_arr[$i]->getVar('mod_notifications'); - $mod['permissions'] = $mods_arr[$i]->getVar('mod_permissions'); + if ($modulesCount > 0) { + foreach (array_keys($modulesAll) as $i) { + $module = $modulesAll[$i]->getValues(); // Get the list of tables - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('table_mid', $i)); - $criteria->setSort('table_order ASC, table_id ASC, table_name'); - $criteria->setOrder('ASC'); - $numbTables = $tdmcreate->getHandler('tables')->getCount($criteria); - $tables_arr = $tdmcreate->getHandler('tables')->getAll($criteria); - unset($criteria); + $tablesCount = $tdmcreate->getHandler('tables')->getCountTables(); + $tablesAll = $tdmcreate->getHandler('tables')->getAllTablesByModuleId($i); // Display tables list $tables = array(); $lid = 1; - if ($numbTables > 0) { - foreach (array_keys($tables_arr) as $t) { - $table['id'] = $t; - $table['lid'] = $lid; - $table['mid'] = $tables_arr[$t]->getVar('table_mid'); - $table['name'] = ucfirst($tables_arr[$t]->getVar('table_name')); - $table['image'] = $tables_arr[$t]->getVar('table_image'); - $table['nbfields'] = $tables_arr[$t]->getVar('table_nbfields'); - $table['order'] = $tables_arr[$t]->getVar('table_order'); - $table['blocks'] = $tables_arr[$t]->getVar('table_blocks'); - $table['admin'] = $tables_arr[$t]->getVar('table_admin'); - $table['user'] = $tables_arr[$t]->getVar('table_user'); - $table['submenu'] = $tables_arr[$t]->getVar('table_submenu'); - $table['search'] = $tables_arr[$t]->getVar('table_search'); - $table['comments'] = $tables_arr[$t]->getVar('table_comments'); - $table['notifications'] = $tables_arr[$t]->getVar('table_notifications'); - $table['permissions'] = $tables_arr[$t]->getVar('table_permissions'); - $tables[] = $table; - unset($table); + if ($tablesCount > 0) { + foreach (array_keys($tablesAll) as $t) { + $table = $tablesAll[$t]->getValues(); + $alid = array('lid' => $lid); + $tables[] = array_merge($table, $alid); + unset($table); ++$lid; } } unset($lid); - $mod['tables'] = $tables; - $GLOBALS['xoopsTpl']->append('modules_list', $mod); - unset($mod); + $module['tables'] = $tables; + $GLOBALS['xoopsTpl']->append('modules_list', $module); + unset($module); } - if ($numbModules > $limit) { + if ($modulesCount > $limit) { include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; - $pagenav = new XoopsPageNav($numbModules, $limit, $start, 'start', 'op=list&limit=' . $limit); + $pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); } } else { @@ -155,11 +122,11 @@ // Checking if table name exist in the same module $criteria = new CriteriaCompo(); $criteria->add(new Criteria('table_mid', $tableMid)); - $table_name_search = $tables->getObjects($criteria); + $tableNameSearch = $tables->getObjects($criteria); unset($criteria); //unset($criteria); - foreach (array_keys($table_name_search) as $t) { - if ($table_name_search[$t]->getVar('table_name') === $_POST['table_name']) { + foreach (array_keys($tableNameSearch) as $t) { + if ($tableNameSearch[$t]->getVar('table_name') === $_POST['table_name']) { redirect_header('tables.php?op=new', 3, sprintf(_AM_TDMCREATE_ERROR_TABLE_NAME_EXIST, $_POST['table_name'])); } } @@ -194,7 +161,8 @@ } $tablesObj->setVars(array( 'table_autoincrement' => ((1 == $_REQUEST['table_autoincrement']) ? 1 : 0), - 'table_blocks' => ((1 == $_REQUEST['table_blocks']) ? 1 : 0), + 'table_index' => ((1 == $_REQUEST['table_index']) ? 1 : 0), + 'table_blocks' => ((1 == $_REQUEST['table_blocks']) ? 1 : 0), 'table_admin' => ((1 == $_REQUEST['table_admin']) ? 1 : 0), 'table_user' => ((1 == $_REQUEST['table_user']) ? 1 : 0), 'table_submenu' => ((1 == $_REQUEST['table_submenu']) ? 1 : 0), @@ -278,47 +246,80 @@ } break; - case 'display_modules': - $modules = $tdmcreate->getHandler('modules'); - foreach ($_POST['mod_id'] as $key => $value) { - if ($key > 0) { - $modulesObj =& $tdmcreate->getHandler('modules')->get($value); - $modulesObj->setVar('mod_admin', (1 == $_REQUEST['mod_admin'][$key]) ? 0 : 1); - $modulesObj->setVar('mod_user', (1 == $_REQUEST['mod_user'][$key]) ? 0 : 1); - $modulesObj->setVar('mod_blocks', (1 == $_REQUEST['mod_blocks'][$key]) ? 0 : 1); - $modulesObj->setVar('mod_search', (1 == $_REQUEST['mod_search'][$key]) ? 0 : 1); - $modulesObj->setVar('mod_comments', (1 == $_REQUEST['mod_comments'][$key]) ? 0 : 1); - $modulesObj->setVar('mod_notifications', (1 == $_REQUEST['mod_notifications'][$key]) ? 0 : 1); - $modulesObj->setVar('mod_permissions', (1 == $_REQUEST['mod_permissions'][$key]) ? 0 : 1); + case 'display': + $modId = tdmcreate_CleanVars($_POST, 'mod_id', 0, 'int'); + if ($modId > 0) { + $modulesObj = $tdmcreate->getHandler('modules')->get($modId); + if (isset($_POST['mod_admin'])) { + $mod_admin = $modulesObj->getVar('mod_admin'); + $modulesObj->setVar('mod_admin', !$mod_admin); + } + if (isset($_POST['mod_user'])) { + $mod_user = $modulesObj->getVar('mod_user'); + $modulesObj->setVar('mod_user', !$mod_user); + } + if (isset($_POST['mod_blocks'])) { + $mod_blocks = $modulesObj->getVar('mod_blocks'); + $modulesObj->setVar('mod_blocks', !$mod_blocks); + } + if (isset($_POST['mod_search'])) { + $mod_search = $modulesObj->getVar('mod_search'); + $modulesObj->setVar('mod_search', !$mod_search); + } + if (isset($_POST['mod_comments'])) { + $mod_comments = $modulesObj->getVar('mod_comments'); + $modulesObj->setVar('mod_comments', !$mod_comments); + } + if (isset($_POST['mod_notifications'])) { + $mod_notifications = $modulesObj->getVar('mod_notifications'); + $modulesObj->setVar('mod_notifications', !$mod_notifications); + } + if (isset($_POST['mod_permissions'])) { + $mod_permissions = $modulesObj->getVar('mod_permissions'); + $modulesObj->setVar('mod_permissions', !$mod_permissions); + } + if ($tdmcreate->getHandler('modules')->insert($modulesObj)) { + redirect_header('modules.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); } + $GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors()); } - if ($modules->insert($modulesObj, true)) { - redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS); - } else { - redirect_header('modules.php', 1, _AM_TDMCREATE_TOGGLE_FAILED); - } - break; - - case 'display_tables': - $tables = $tdmcreate->getHandler('tables'); - // - foreach ($_POST['table_id'] as $key => $value) { - if ($key > 0) { - $tablesObj =& $tables->get($value); - $tablesObj->setVar('table_admin', (1 == $_REQUEST['table_admin'][$key]) ? 0 : 1); - $tablesObj->setVar('table_user', (1 == $_REQUEST['table_user'][$key]) ? 0 : 1); - $tablesObj->setVar('table_blocks', (1 == $_REQUEST['table_blocks'][$key]) ? 0 : 1); - $tablesObj->setVar('table_submenu', (1 == $_REQUEST['table_submenu'][$key]) ? 0 : 1); - $tablesObj->setVar('table_search', (1 == $_REQUEST['table_search'][$key]) ? 0 : 1); - $tablesObj->setVar('table_comments', (1 == $_REQUEST['table_comments'][$key]) ? 0 : 1); - $tablesObj->setVar('table_notifications', (1 == $_REQUEST['table_notifications'][$key]) ? 0 : 1); + + $tableId = tdmcreate_CleanVars($_POST, 'table_id', 0, 'int'); + if ($tableId > 0) { + $tablesObj = $tdmcreate->getHandler('tables')->get($tableId); + if (isset($_POST['table_admin'])) { + $table_admin = $tablesObj->getVar('table_admin'); + $tablesObj->setVar('table_admin', !$table_admin); + } + if (isset($_POST['table_user'])) { + $table_user = $tablesObj->getVar('table_user'); + $tablesObj->setVar('table_user', !$table_user); + } + if (isset($_POST['table_blocks'])) { + $table_blocks = $tablesObj->getVar('table_blocks'); + $tablesObj->setVar('table_blocks', !$table_blocks); + } + if (isset($_POST['table_search'])) { + $table_search = $tablesObj->getVar('table_search'); + $tablesObj->setVar('table_search', !$table_search); + } + if (isset($_POST['table_comments'])) { + $table_comments = $tablesObj->getVar('table_comments'); + $tablesObj->setVar('table_comments', !$table_comments); + } + if (isset($_POST['table_notifications'])) { + $table_notifications = $tablesObj->getVar('table_notifications'); + $tablesObj->setVar('table_notifications', !$table_notifications); + } + if (isset($_POST['table_permissions'])) { + $table_permissions = $tablesObj->getVar('table_permissions'); + $tablesObj->setVar('table_permissions', !$table_permissions); + } + if ($tdmcreate->getHandler('tables')->insert($tablesObj)) { + redirect_header('tables.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); } - } - if ($tables->insert($tablesObj, true)) { - redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_SUCCESS); - } else { - redirect_header('tables.php', 1, _AM_TDMCREATE_TOGGLE_FAILED); - } + $GLOBALS['xoopsTpl']->assign('error', $tablesObj->getHtmlErrors()); + } break; } include __DIR__ . '/footer.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/16/rss.gif =================================================================== (Binary files differ) Index: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/16/rss.gif =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/16/rss.gif 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/16/rss.gif 2015-06-01 11:22:57 UTC (rev 13074) Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/16/rss.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/index.html =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/index.html (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/index.html 2015-06-01 11:22:57 UTC (rev 13074) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/next.png =================================================================== (Binary files differ) Index: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/next.png =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/next.png 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/next.png 2015-06-01 11:22:57 UTC (rev 13074) Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/next.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/previous.png =================================================================== (Binary files differ) Index: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/previous.png =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/previous.png 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/previous.png 2015-06-01 11:22:57 UTC (rev 13074) Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/24/previous.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache 2015-06-01 11:22:57 UTC (rev 13074) @@ -1 +0,0 @@ -a:5:{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:18:"TDMCreateThemeForm";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\form\TDMCreateThemeForm.php";s:18:"TDMCreateFormLabel";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\html\TDMCreateFormLabel.php";s:18:"TDMCreateFormRadio";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\form\TDMCreateFormRadio.php";} \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -452,6 +452,30 @@ return $form; } + + /** + * Get Values + */ + public function getValues($keys = null, $format = null, $maxDepth = null) + { + $ret = parent::getValues($keys, $format, $maxDepth); + $ret['id'] = $this->getVar('field_id'); + $ret['mid'] = $this->getVar('field_mid'); + $ret['tid'] = $this->getVar('field_tid'); + $ret['order'] = $this->getVar('field_order'); + $ret['name'] = str_replace('_', ' ', ucfirst($this->getVar('field_name'))); + $ret['parent'] = $this->getVar('field_parent'); + $ret['inlist'] = $this->getVar('field_inlist'); + $ret['inform'] = $this->getVar('field_inform'); + $ret['admin'] = $this->getVar('field_admin'); + $ret['user'] = $this->getVar('field_user'); + $ret['block'] = $this->getVar('field_block'); + $ret['main'] = $this->getVar('field_main'); + $ret['search'] = $this->getVar('field_search'); + $ret['required'] = $this->getVar('field_required'); + + return $ret; + } } /* @@ -537,4 +561,45 @@ return true; } + + /** + * Get Count Fields + */ + public function getCountFields($start = 0, $limit = 0, $sort = 'field_id ASC, field_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getCount($criteria); + } + + /** + * Get All Fields + */ + public function getAllFields($start = 0, $limit = 0, $sort = 'field_id ASC, field_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getAll($criteria); + } + + /** + * Get All Fields By Module & Table Id + */ + public function getAllFieldsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'field_id ASC, field_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('field_mid', $modId)); + $criteria->add(new Criteria('field_tid', $tabId)); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getAll($criteria); + } } 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-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -273,8 +273,8 @@ if (1 == $tableUser) { // User Pages File $userPages = UserPages::getInstance(); - $userPages->write($module, $table); - $ret[] = $userPages->renderFile($tableName . '.php'); + $userPages->write($module, $table, $tableName . '.php'); + $ret[] = $userPages->renderFile(); // User Templates File $userTemplatesPages = TemplatesUserPages::getInstance(); $userTemplatesPages->write($module, $table); @@ -532,7 +532,7 @@ } // User Index File $userIndex = UserIndex::getInstance(); - $userIndex->write($module, 'index.php'); + $userIndex->write($module, $table, 'index.php'); $ret[] = $userIndex->render(); // Language Main File $languageMain = LanguageMain::getInstance(); 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-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -104,8 +104,8 @@ \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}'; \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) { - \$uploader->fetchMedia(\$_POST['xoops_upload_file'][]); + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { + \$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); @@ -133,9 +133,9 @@ \$uploaddir = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'; \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) { + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][1])) { //\$uploader->setPrefix('{$fieldName}_'); - //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][]); + //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][1]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); @@ -156,7 +156,7 @@ * @param string $fieldName * @return string */ - public function getUploadImageSetVar($moduleDirname, $tableName, $fieldName, $fpmf) + public function getUploadImageSetVar($moduleDirname, $tableName, $fieldName, $fieldMain) { $stuModuleDirname = strtoupper($moduleDirname); $ret = <<<EOT @@ -165,11 +165,11 @@ \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/images/{$tableName}'; \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][2])) { \$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '' , \$_FILES['attachedfile']['name']); - \$imgName = str_replace(' ', '', \$_POST['{$fpmf}']).'.'.\$extension; + \$imgName = str_replace(' ', '', \$_POST['{$fieldMain}']).'.'.\$extension; \$uploader->setPrefix(\$imgName); - \$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); + \$uploader->fetchMedia(\$_POST['xoops_upload_file'][2]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); @@ -199,9 +199,9 @@ \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}'; \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) { + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][3])) { //\$uploader->setPrefix('{$fieldName}_') ; - //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][]); + //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][3]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); 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-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -136,7 +136,6 @@ $ret .= <<<EOT \${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}(); \${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}(\$start, \$limit); - unset(\$criteria); \$GLOBALS['xoopsTpl']->assign('{$tableName}_count', \${$tableName}Count); \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL); \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL); @@ -146,7 +145,7 @@ foreach (array_keys(\${$tableName}All) as \$i) { \${$tableSoleName} = \${$tableName}All[\$i]->getValues(); - \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName}); + \$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$tableSoleName}); unset(\${$tableSoleName}); } if ( \${$tableName}Count > \$limit ) { @@ -204,7 +203,7 @@ $ret = <<<EOT case 'save': if ( !\$GLOBALS['xoopsSecurity']->check() ) { - redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors())); + redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors())); } if (isset(\${$fieldId})) { \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId}); @@ -249,7 +248,7 @@ $ret .= <<<EOT // Insert Data if (\${$tableName}Handler->insert(\${$tableName}Obj)) { - redirect_header('{$tableName}.php?op=list', 2, {$language}FORMOK); + redirect_header('{$tableName}.php?op=list', 2, {$language}FORM_OK); } // Get Form \$GLOBALS['xoopsTpl']->assign('error', \${$tableName}Obj->getHtmlErrors()); Deleted: 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-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache 2015-06-01 11:22:57 UTC (rev 13074) @@ -1 +0,0 @@ -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: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: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: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: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/classes/ClassFiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -809,8 +809,9 @@ $fieldParentId = array(); $fieldElementId = array(); foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $fieldInForm[] = $fields[$f]->getVar('field_inform'); + $fieldName = $fields[$f]->getVar('field_name'); + $fieldInForm[] = $fields[$f]->getVar('field_inform'); + $fieldParentId[] = $fields[$f]->getVar('field_parent'); if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $fieldId = $fieldName; // $fieldId = fields parameter index field } @@ -818,7 +819,7 @@ $fieldMain = $fieldName; // $fieldMain = fields parameter main field } if (1 == $fields[$f]->getVar('field_parent')) { - $fieldParent = $fieldName; // $fieldParent = fields parameter parent field + $fieldParent = $fieldName; // $fieldParent = fields parameter parent field } $fieldElement = $fields[$f]->getVar('field_element'); // Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -303,7 +303,7 @@ } /* - * @private function getXoopsFormTextFile + * @private function getXoopsFormUrlFile * @param string $language * @param string $moduleDirname * @param string $fieldName @@ -323,13 +323,13 @@ private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $fieldElement, $required = 'false') { $ret = <<<EOT - // Form Text File - \$formTextFile = new XoopsFormElementTray({$language}FORM_FILE,'<br /><br />'); - \$field_text = \$this->isNew() ? '{$fieldDefault}' : \$this->getVar('{$fieldName}'); - \$formText = new XoopsFormText({$language}FORM_TEXT, '{$fieldName}', 75, 255, \$field_text); - \$formTextFile->addElement(\$formText{$required} ); - \$formTextFile->addElement(new XoopsFormFile({$language}FORM_UPLOAD , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')){$required}); - \$form->addElement(\$formTextFile);\n + // Form Url Text File + \$formUrlFile = new XoopsFormElementTray({$language}FORM_FILE,'<br /><br />'); + \$formFile = \$this->isNew() ? '{$fieldDefault}' : \$this->getVar('{$fieldName}'); + \$formFormText = new XoopsFormText({$language}FORM_TEXT, '{$fieldName}', 75, 255, \$formFile); + \$formUrlFile->addElement(\$formFormText{$required} ); + \$formUrlFile->addElement(new XoopsFormFile({$language}FORM_UPLOAD , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')){$required}); + \$form->addElement(\$formUrlFile);\n EOT; return $ret; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeFunctions.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeFunctions.php 2015-05-30 10:15:43 UTC (rev 13073) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeFunctions.php 2015-06-01 11:22:57 UTC (rev 13074) @@ -140,7 +140,7 @@ public function getFunctionMetaKeywords($moduleDirname) { $ret = <<<EOT -\nfunction {$moduleDirname}_meta_keywords(\$co... [truncated message content] |
From: <txm...@us...> - 2015-05-30 10:15:45
|
Revision: 13073 http://sourceforge.net/p/xoops/svn/13073 Author: txmodxoops Date: 2015-05-30 10:15:43 +0000 (Sat, 30 May 2015) Log Message: ----------- Refactoring Added & deleted superflues code 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/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-27 14:19:05 UTC (rev 13072) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-30 10:15:43 UTC (rev 13073) @@ -205,7 +205,7 @@ $fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList()); $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>')); // Field Null - $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : ''; + $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '2'; $fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value); $fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList()); $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>')); 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-27 14:19:05 UTC (rev 13072) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-30 10:15:43 UTC (rev 13073) @@ -114,6 +114,7 @@ $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); $tableFieldname = $table->getVar('table_fieldname'); + $ucfTableName = ucfirst($tableName); $stuTableName = strtoupper($tableName); $stuTableSoleName = strtoupper($tableSoleName); $stuTableFieldname = strtoupper($tableFieldname); @@ -133,13 +134,8 @@ EOT; } $ret .= <<<EOT - \$criteria = new CriteriaCompo(); - \$criteria->setStart(\$start); - \$criteria->setLimit(\$limit); - \$criteria->setSort('{$fieldId} ASC, {$fieldMain}'); - \$criteria->setOrder('ASC'); - \${$tableName}Count = \${$tableName}Handler->getCount(\$criteria); - \${$tableName}All = \${$tableName}Handler->getAll(\$criteria); + \${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}(); + \${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}(\$start, \$limit); unset(\$criteria); \$GLOBALS['xoopsTpl']->assign('{$tableName}_count', \${$tableName}Count); \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL); @@ -148,78 +144,11 @@ if (\${$tableName}Count > 0) { foreach (array_keys(\${$tableName}All) as \$i) - {\n -EOT; - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $fieldParent = $fields[$f]->getVar('field_parent'); - // Verify if table_fieldname is not empty - $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableSoleName; - $rpFieldName = $this->tdmcfile->getRightString($fieldName); - // - if($f < 1) { - $ret .= $this->adminobjects->getIdGetVar($lpFieldName); - } - $fieldElement = $fields[$f]->getVar('field_element'); - if ((1 == $fields[$f]->getVar('field_admin')) || ((1 == $tableAutoincrement) && (1 == $fields[$f]->getVar('field_inlist')))) { - switch ($fieldElement) { - case 3: - case 4: - $ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 8: - $ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 12: - $ret .= $this->adminobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 13: - $ret .= $this->adminobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 15: - $ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - default: - if ($fieldElement > 15) { - $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); - $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); - $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName)); - if (1 == $fieldParent) { - $criteriaFieldsTopic = new CriteriaCompo(); - $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid)); - $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic); - unset($criteriaFieldsTopic); - foreach (array_keys($fieldsTopic) as $ft) { - if (1 == $fieldsTopic[$ft]->getVar('field_main')) { - $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name'); - } - } - $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldName, $fieldNameTopic); - } else { - // - $criteriaTablesTopic = new CriteriaCompo(); - $criteriaTablesTopic->add(new Criteria('table_id', $fieldElementTid)); - $tablesTopic = $this->tdmcreate->getHandler('tables')->getObjects($criteriaTablesTopic); - unset($criteriaTablesTopic); - foreach (array_keys($tablesTopic) as $ft) { - $ucfTableSoleNameTopic = ucfirst($tablesTopic[$ft]->getVar('table_solename')); - } - $ret .= $this->adminobjects->getParentTopicGetVar($moduleDirname, $lpFieldName, $rpFieldName, $tableName, $ucfTableSoleNameTopic, $rpFieldElementName, $fieldName); - } - } else { - $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - } - break; - } + { + \${$tableSoleName} = \${$tableName}All[\$i]->getValues(); + \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName}); + unset(\${$tableSoleName}); } - } - $ret .= <<<EOT - \$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lpFieldName}); - unset(\${$lpFieldName}); - }\n -EOT; - $ret .= <<<EOT if ( \${$tableName}Count > \$limit ) { include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; \$pagenav = new XoopsPageNav(\${$tableName}Count, \$limit, \$start, 'start', 'op=list&limit=' . \$limit); 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-27 14:19:05 UTC (rev 13072) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-30 10:15:43 UTC (rev 13073) @@ -192,7 +192,8 @@ * @var mixed */ private \${$moduleDirname} = null; - /* + + /* * Constructor * * @param null @@ -200,7 +201,7 @@ public function __construct() { \$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance(); -{$this->getInitVars($fields)}\t} +{$this->getInitVars($fields)}\t}\n /* * @static function &getInstance * @param null @@ -212,7 +213,7 @@ \$instance = new self(); } return \$instance; - }\n + }\n\n EOT; return $ret; @@ -327,7 +328,7 @@ \$form->addElement ( \$groupsCanSubmitCheckbox ); // For view \$groupsCanViewCheckbox->addOptionArray ( \$groupList ); - \$form->addElement ( \$groupsCanViewCheckbox );\n + \$form->addElement ( \$groupsCanViewCheckbox );\n\n EOT; return $ret; @@ -347,12 +348,65 @@ \$form->addElement(new XoopsFormHidden('op', 'save')); \$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); return \$form; - }\n + }\n\n EOT; return $ret; } + + /* + * @private function getToArray + * @param null + */ + /** + * @return string + */ + private function getValuesInForm($fields) + { + $ret = <<<EOT + /** + * Get Values + */ + public function getValues(\$keys = null, \$format = null, \$maxDepth = null) + { + \$ret = parent::getValues(\$keys, \$format, \$maxDepth);\n +EOT; + foreach (array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); + switch ($fieldElement) { + case 3: + case 4: + $ret .= <<<EOT + \$ret['{$rpFieldName}'] = strip_tags(\$this->getVar('{$fieldName}'));\n +EOT; + break; + case 8: + $ret .= <<<EOT + \$ret['{$rpFieldName}'] = XoopsUser::getUnameFromId(\$this->getVar('{$fieldName}'));\n +EOT; + break; + case 15: + $ret .= <<<EOT + \$ret['{$rpFieldName}'] = formatTimeStamp(\$this->getVar('{$fieldName}'));\n +EOT; + break; + default: + $ret .= <<<EOT + \$ret['{$rpFieldName}'] = \$this->getVar('{$fieldName}');\n +EOT; + break; + } + } + $ret .= <<<EOT + + return \$ret; + }\n\n +EOT; + return $ret; + } /* * @private function getToArray * @param null @@ -360,7 +414,7 @@ /** * @return string */ - private function getToArray() + private function getToArrayInForm() { $ret = <<<EOT /** @@ -377,12 +431,54 @@ } return \$ret; } -}\n +}\n\n EOT; return $ret; } + + /* + * @private function getOptionsCheck + * @param $table + */ + /** + * @return string + */ + private function getOptionsCheck($table) + { + $ret = <<<EOT + /** + * Get Options + */ + public function getOptions() + { + \$ret = array();\n +EOT; + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + foreach (array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + // + $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); + $fieldElementId = $fieldElements->getVar('fieldelement_id'); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); + if(5 == $fieldElementId) { + $ret .= <<<EOT + if (1 == \$this->getVar('{$fieldName}')) { + array_push(\$ret, '{$rpFieldName}'); + }\n +EOT; + } + } + $ret .= <<<EOT + return \$ret; + } +}\n\n +EOT; + return $ret; + } + /* * @public function getClassHandler * @param string $moduleDirname @@ -399,7 +495,7 @@ * @param $fieldMain * @return string */ - private function getClassHandler($moduleDirname, $table, $fieldId, $fieldMain) + private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain) { $tableName = $table->getVar('table_name'); $tableCategory = $table->getVar('table_category'); @@ -428,9 +524,21 @@ { parent::__construct(\$db, '{$moduleDirname}_{$tableName}', '{$moduleDirname}{$tableName}', '{$fieldId}', '{$fieldMain}'); \$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance(); + }\n\n +EOT; + + return $ret; } - - /** + + /** + * @public function getClassCreate + * + * @return string + */ + private function getClassCreate() + { + $ret = <<<EOT + /** * @param bool \$isNew * * @return object @@ -438,9 +546,21 @@ public function &create(\$isNew = true) { return parent::create(\$isNew); + }\n\n +EOT; + + return $ret; } - - /** + + /** + * @public function getClassGet + * + * @return string + */ + private function getClassGet() + { + $ret = <<<EOT + /** * retrieve a field * * @param int \$i field id @@ -449,8 +569,20 @@ public function &get(\$i = null, \$fields = null) { return parent::get(\$i, \$fields); + }\n\n +EOT; + + return $ret; } - + + /** + * @public function getClassGetInsertId + * + * @return string + */ + private function getClassGetInsertId() + { + $ret = <<<EOT /** * get inserted id * @@ -460,9 +592,21 @@ public function &getInsertId() { return \$this->db->getInsertId(); + }\n\n +EOT; + + return $ret; } - - /** + + /** + * @public function getClassGetIds + * + * @return string + */ + private function getClassGetIds() + { + $ret = <<<EOT + /** * get IDs of objects matching a condition * * @param object \$criteria {@link CriteriaElement} to match @@ -471,9 +615,21 @@ function &getIds(\$criteria) { return parent::getIds(\$criteria); + }\n\n +EOT; + + return $ret; } - - /** + + /** + * @public function getClassInsert + * + * @return string + */ + private function getClassInsert() + { + $ret = <<<EOT + /** * insert a new field in the database * * @param object \$field reference to the {@link TDMCreateFields} object @@ -487,11 +643,115 @@ return false; } return true; - }\n + }\n\n EOT; - if (1 == $tableCategory) { - $ret .= <<<EOT - \n\t/** + + return $ret; + } + + /** + * @public function getClassCounter + * + * @param $tableName + * @param $fieldId + * @param $fieldMain + * @return string + */ + private function getClassCounter($tableName, $fieldId, $fieldMain) + { + $ucfTableName = ucfirst($tableName); + $ret = <<<EOT + /** + * Get Count {$ucfTableName} + */ + public function getCount{$ucfTableName}(\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC') + { + \$criteria = new CriteriaCompo(); + \$criteria->setSort(\$sort); + \$criteria->setOrder(\$order); + \$criteria->setStart(\$start); + \$criteria->setLimit(\$limit); + return parent::getCount(\$criteria); + }\n\n +EOT; + + return $ret; + } + + /** + * @public function getClassAll + * + * @param $tableName + * @param $fieldId + * @param $fieldMain + * @return string + */ + private function getClassAll($tableName, $fieldId, $fieldMain) + { + $ucfTableName = ucfirst($tableName); + $ret = <<<EOT + /** + * Get All {$ucfTableName} + */ + public function getAll{$ucfTableName}(\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC') + { + \$criteria = new CriteriaCompo(); + \$criteria->setSort(\$sort); + \$criteria->setOrder(\$order); + \$criteria->setStart(\$start); + \$criteria->setLimit(\$limit); + return parent::getAll(\$criteria); + }\n\n +EOT; + + return $ret; + } + + /** + * @public function getClassByCategory + * + * @param $tableName + * @param $fieldId + * @param $fieldMain + * @param $fieldParent + * @return string + */ + private function getClassByCategory($tableName, $fieldId, $fieldMain, $fieldParent) + { + $ucfTableName = ucfirst($tableName); + $ret = <<<EOT + /** + * Get All {$ucfTableName} By Category Id + */ + public function getAll{$ucfTableName}ByCategoryId(\$catId, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC') + { + \$criteria = new CriteriaCompo(); + \$criteria->add(new Criteria('{$fieldParent}', \$catId)); + \$criteria->setSort(\$sort); + \$criteria->setOrder(\$order); + \$criteria->setStart(\$start); + \$criteria->setLimit(\$limit); + return parent::getAll(\$criteria); + }\n\n +EOT; + + return $ret; + } + + /** + * @public function getClassGetTableSolenameById + * + * @param $moduleDirname + * @param $table + * @return string + */ + private function getClassGetTableSolenameById($moduleDirname, $table, $fieldMain) + { + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $ucfTableSoleName = ucfirst($tableSoleName); + $ret = <<<EOT + /** * Returns the {$ucfTableSoleName} from id * * @return string @@ -508,15 +768,26 @@ } } return \${$tableSoleName}; - }\n + } EOT; - } - $ret .= <<<EOT -} + + return $ret; + } + + /** + * @public function getClassEnd + * + * @return null + */ + private function getClassEnd() + { + $ret = <<<EOT +}\n EOT; - - return $ret; + + return $ret; } + /* * @public function renderFile @@ -531,30 +802,56 @@ $module = $this->getModule(); $table = $this->getTable(); $tableName = $table->getVar('table_name'); + $tableCategory = $table->getVar('table_category'); $moduleDirname = $module->getVar('mod_dirname'); $fields = $this->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'); + $fieldInForm = array(); + $fieldParentId = array(); + $fieldElementId = array(); + foreach (array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldInForm[] = $fields[$f]->getVar('field_inform'); if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $fieldId = $fieldName; // $fieldId = fields parameter index field } if (1 == $fields[$f]->getVar('field_main')) { $fieldMain = $fieldName; // $fieldMain = fields parameter main field } + if (1 == $fields[$f]->getVar('field_parent')) { + $fieldParent = $fieldName; // $fieldParent = fields parameter parent field + } + $fieldElement = $fields[$f]->getVar('field_element'); + // + $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); + $fieldElementId[] = $fieldElements->getVar('fieldelement_id'); } $content = $this->getHeaderFilesComments($module, $filename); $content .= $this->getHeadClass($moduleDirname, $tableName, $fields); - if (1 == $fieldInForm) { + if (in_array(1, $fieldInForm)) { $content .= $this->getHeadInForm($module, $table); if (1 == $table->getVar('table_permissions')) { $content .= $this->getPermissionsInForm($moduleDirname, $fieldId); } $content .= $this->getFootInForm(); } - $content .= $this->getToArray(); - $content .= $this->getClassHandler($moduleDirname, $table, $fieldId, $fieldMain); - + $content .= $this->getValuesInForm($fields); + $content .= $this->getToArrayInForm(); + if(in_array(5, $fieldElementId)) { + $content .= $this->getOptionsCheck($table); + } + $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain); + $content .= $this->getClassCreate(); + $content .= $this->getClassGet(); + $content .= $this->getClassGetInsertId(); + $content .= $this->getClassGetIds(); + $content .= $this->getClassInsert(); + $content .= $this->getClassCounter($tableName, $fieldId, $fieldMain); + $content .= $this->getClassAll($tableName, $fieldId, $fieldMain); + if (in_array(1, $fieldParentId)) { + $content .= $this->getClassByCategory($tableName, $fieldId, $fieldMain, $fieldParent); + $content .= $this->getClassGetTableSolenameById($moduleDirname, $table, $fieldMain); + } + $content .= $this->getClassEnd(); $this->tdmcfile->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); return $this->tdmcfile->renderFile(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-27 14:19:05 UTC (rev 13072) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-30 10:15:43 UTC (rev 13073) @@ -670,11 +670,11 @@ } break; } - if (($fieldElement <= 15) && (1 == $fieldParent)) { + /*if (($fieldElement <= 15)) { $ret .= $this->getXoopsFormTopic($language, $moduleDirname, $tableName, $fieldId, $fieldPid, $fieldMain, $required); - } + }*/ if ($fieldElement > 15) { - if (1 == $table->getVar('table_category')) { + if (1 == $table->getVar('table_category') || (1 == $fieldParent)) { $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); $fieldElementMid = $fieldElements->getVar('fieldelement_mid'); $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php 2015-05-27 14:19:05 UTC (rev 13072) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php 2015-05-30 10:15:43 UTC (rev 13073) @@ -85,6 +85,7 @@ { $table = $this->getTable(); $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); $tableFieldname = $table->getVar('table_fieldname'); $stuModuleDirname = strtoupper($moduleDirname); $stuTableName = strtoupper($tableName); @@ -104,77 +105,27 @@ // \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL); // -\$criteria{$ucfTableName} = new CriteriaCompo(); -\${$stlTableName}Count = \${$stlTableName}Handler->getCount(\$criteria{$ucfTableName}); -\${$stlTableName}All = \${$stlTableName}Handler->getAll(\$criteria{$ucfTableName}); -unset(\$criteria{$ucfTableName}); +\${$stlTableName}Count = \${$stlTableName}Handler->getCount{$ucfTableName}(); +\${$stlTableName}All = \${$stlTableName}Handler->getAll{$ucfTableName}(\$start, \$limit); \$keywords = array(); if (\${$stlTableName}Count > 0) { - foreach (array_keys(\${$stlTableName}All) as \$i) - {\n + // Get All {$ucfTableName} + foreach (array_keys(\${$stlTableName}All) as \$i) + { + \${$tableSoleName} = \${$tableName}All[\$i]->getValues(); + \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName}); + unset(\${$tableSoleName});\n EOT; // Fields $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); foreach (array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); - $fieldParent = $fields[$f]->getVar('field_parent'); - // Verify if table_fieldname is not empty - $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName; - $rpFieldName = $this->tdmcfile->getRightString($fieldName); if (1 == $fields[$f]->getVar('field_main')) { - $fpmf = $fieldName; // fpmf = fields parameters main field - } - $fieldElement = $fields[$f]->getVar('field_element'); - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) { - switch ($fieldElement) { - case 3: - case 4: - $ret .= $this->userobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 8: - $ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 12: - $ret .= $this->userobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 13: - $ret .= $this->userobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - case 15: - $ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - break; - default: - if ((1 == $fieldParent) && !$table->getVar('table_category')) { - if ($fieldElement > 15) { - $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); - $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); - $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName)); - // - $fieldNameParent = $fieldName; - // - $criteriaFieldsTopic = new CriteriaCompo(); - $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid)); - $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic); - unset($criteriaFieldsTopic); - foreach (array_keys($fieldsTopic) as $ft) { - if (1 == $fieldsTopic[$ft]->getVar('field_main')) { - $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name'); - } - } - $ret .= $this->userobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic); - } - } else { - $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); - } - break; - } - } + $fieldMain = $fieldName; // fieldMain = fields parameters main field + } } $ret .= <<<EOT - \$GLOBALS['xoopsTpl']->append('{$stlTableName}', \${$lpFieldName}); - \$keywords[] = \${$stlTableName}All[\$i]->getVar('{$fpmf}'); - unset(\${$lpFieldName}); + \$keywords[] = \${$stlTableName}All[\$i]->getVar('{$fieldMain}'); } // Display Navigation if (\${$stlTableName}Count > \$limit) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-27 14:19:05 UTC (rev 13072) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-30 10:15:43 UTC (rev 13073) @@ -130,7 +130,7 @@ $ret = <<<EOT defined('XOOPS_ROOT_PATH') or die('Restricted access'); // -\$dirname = basename(__DIR__) ; +\$dirname = basename(__DIR__); // ------------------- Informations ------------------- // \$modversion = array( 'name' => {$language}NAME, @@ -325,6 +325,23 @@ } /* + * @private function getXoopsVersionTemplatesUserLine + * @param $moduleDirname + */ + /** + * @param $moduleDirname + * @return string + */ + private function getXoopsVersionTemplatesUserLine($moduleDirname, $type) + { + $ret = <<<EOT +\$modversion['templates'][] = array('file' => '{$moduleDirname}_{$type}.tpl', 'description' => '');\n +EOT; + + return $ret; + } + + /* * @private function getXoopsVersionTemplatesUser * @param $moduleDirname */ @@ -346,44 +363,28 @@ EOT; } if(1 == $table->getVar('table_broken')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_broken.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'broken'); } if(1 == $table->getVar('table_pdf')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_pdf.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'pdf'); } if(1 == $table->getVar('table_print')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_print.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'print'); } if(1 == $table->getVar('table_rate')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_rate.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'rate'); } if(1 == $table->getVar('table_rss')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_rss.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'rss'); } if(1 == $table->getVar('table_search')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_search.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'search'); } if(1 == $table->getVar('table_single')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_single.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'single'); } if(1 == $table->getVar('table_submit')) { - $ret .= <<<EOT -\$modversion['templates'][] = array('file' => '{$moduleDirname}_submit.tpl', 'description' => '');\n -EOT; + $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'submit'); } $ret .= <<<EOT \$modversion['templates'][] = array('file' => '{$moduleDirname}_footer.tpl', 'description' => '');\n\n |
From: <txm...@us...> - 2015-05-27 14:19:08
|
Revision: 13072 http://sourceforge.net/p/xoops/svn/13072 Author: txmodxoops Date: 2015-05-27 14:19:05 +0000 (Wed, 27 May 2015) Log Message: ----------- Major changes in lists and language Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/about.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/about.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/about.php 2015-05-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/about.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -19,7 +19,7 @@ * @version $Id: about.php 11084 2013-02-23 15:44:20Z timgno $ */ include __DIR__ . '/header.php'; -$template_main = 'tdmcreate_about.tpl'; +$templateMain = 'tdmcreate_about.tpl'; $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('about.php')); $GLOBALS['xoopsTpl']->assign('about', $adminMenu->renderAbout('6KJ7RW5DR3VTJ', false)); include __DIR__ . '/footer.php'; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php 2015-05-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -126,7 +126,29 @@ \$adminMenu->addInfoBoxLine({$language}STATISTICS, '<label>No statistics</label>', 0);\n EOT; } - $content .= <<<EOT + if (is_array($tables)) { + $content .= <<<EOT +// Upload Folders +\$folder = array(\n +EOT; + $stuModuleDirname = strtoupper($moduleDirname); + foreach (array_keys($tables) as $i) { + $tableName = $tables[$i]->getVar('table_name'); + $content .= <<<EOT + \t{$stuModuleDirname}_UPLOAD_PATH . '/{$tableName}/',\n +EOT; + } + $content .= <<<EOT +); + +// Uploads Folders Created +foreach (array_keys( \$folder) as \$i) { + \$adminMenu->addConfigBoxLine(\$folder[\$i], 'folder'); + \$adminMenu->addConfigBoxLine(array(\$folder[\$i], '777'), 'chmod'); +}\n +EOT; + } + $content .= <<<EOT // Render Index echo \$adminMenu->addNavigation('index.php'); echo \$adminMenu->renderIndex(); 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-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache 2015-05-27 14:19:05 UTC (rev 13072) @@ -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: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 +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: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: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: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: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/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -230,8 +230,8 @@ \$iconsdirectory = is_dir(XOOPS_ROOT_PATH . \$iconsdir) ? \$iconsdir : \$uploads_dir; // \$imgtray1 = new XoopsFormElementTray({$language}{$stuSoleName},'<br />'); - \$imgpath = is_dir(XOOPS_ROOT_PATH . \$iconsdir) ? sprintf({$language}FORMIMAGE_PATH, ".{\$iconsdir}/") : sprintf({$language}FORMIMAGE_PATH, \$uploads_dir); - //\$imgpath1 = sprintf({$language}FORMIMAGE_PATH, ".{\$iconsdirectory}/"); + \$imgpath = is_dir(XOOPS_ROOT_PATH . \$iconsdir) ? sprintf({$language}FORM_IMAGE_PATH, ".{\$iconsdir}/") : sprintf({$language}FORMIMAGE_PATH, \$uploads_dir); + //\$imgpath1 = sprintf({$language}FORM_IMAGE_PATH, ".{\$iconsdirectory}/"); \$imageselect1 = new XoopsFormSelect(\$imgpath, '{$fieldName}', \${$fieldName}, 10); \$image_array1 = XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . \$iconsdirectory ); foreach( \$image_array1 as \$image1 ) { @@ -280,8 +280,8 @@ if (!is_file(\$uploaddir)){ \${$moduleDirname}cat_img = 'blank.gif'; } - \$imgtray = new XoopsFormElementTray({$language}_FORMIMG,'<br />'); - \$imgpath = sprintf({$language}_FORMPATH, \$uploadirectory ); + \$imgtray = new XoopsFormElementTray({$language}_FORM_IMG,'<br />'); + \$imgpath = sprintf({$language}_FORM_PATH, \$uploadirectory ); \$imageselect = new XoopsFormSelect(\$imgpath, 'selected_img',\${$moduleDirname}cat_img); \${$fieldName}_array = XoopsLists :: getImgListAsArray( XOOPS_ROOT_PATH . \$uploadirectory ); foreach( \${$fieldName}_array as \$image ) { @@ -670,6 +670,9 @@ } break; } + if (($fieldElement <= 15) && (1 == $fieldParent)) { + $ret .= $this->getXoopsFormTopic($language, $moduleDirname, $tableName, $fieldId, $fieldPid, $fieldMain, $required); + } if ($fieldElement > 15) { if (1 == $table->getVar('table_category')) { $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); @@ -692,10 +695,10 @@ } } $ret .= $this->getXoopsFormTopic($language, $moduleDirname, $topicTableName, $fieldIdTopic, $fieldPidTopic, $fieldMainTopic, $required); - } elseif (1 == $fieldParent) { + } else { $ret .= $this->getXoopsFormTable($language, $moduleDirname, $tableName, $fieldName, $fieldElement, $required); } - } + } } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php 2015-05-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -248,8 +248,12 @@ $filename = $this->getFileName(); $content = $this->getHeaderFilesComments($module, $filename); $content .= $this->getInstallModuleFolder($moduleDirname); - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { + foreach (array_keys($tables) as $t) { + $tableName = $tables[$t]->getVar('table_name'); + $content .= $this->getInstallTableFolder($moduleDirname, $tableName); + } + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + foreach (array_keys($fields) as $f) { $fieldElement = $fields[$f]->getVar('field_element'); // All fields elements selected switch ($fieldElement) { 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-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -107,10 +107,10 @@ $ret .= $this->defines->getDefine($language, "THEREARENT_{$stuTableName}", "There aren't {$stlTableName}"); } $ret .= $this->defines->getAboveDefines('Save/Delete'); - $ret .= $this->defines->getDefine($language, "FORMOK", "Successfully saved"); - $ret .= $this->defines->getDefine($language, "FORMDELOK", "Successfully deleted"); - $ret .= $this->defines->getDefine($language, "FORMSUREDEL", "Are you sure to delete: <b><span style='color : Red;'>%s </span></b>"); - $ret .= $this->defines->getDefine($language, "FORMSURERENEW", "Are you sure to update: <b><span style='color : Red;'>%s </span></b>"); + $ret .= $this->defines->getDefine($language, 'FORM_OK', "Successfully saved"); + $ret .= $this->defines->getDefine($language, 'FORM_DELETE_OK', "Successfully deleted"); + $ret .= $this->defines->getDefine($language, 'FORM_SURE_DELETE', "Are you sure to delete: <b><span style='color : Red;'>%s </span></b>"); + $ret .= $this->defines->getDefine($language, 'FORM_SURE_RENEW', "Are you sure to update: <b><span style='color : Red;'>%s </span></b>"); $ret .= $this->defines->getAboveDefines('Buttons'); // foreach (array_keys($tables) as $t) { @@ -177,7 +177,7 @@ $fieldNameDesc = ucfirst($rpFieldName); } // - $ret .= $this->defines->getDefine($language, $tableSoleName .'_'. $rpFieldName, $fieldNameDesc); + $ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName, $fieldNameDesc); $stuTableName = strtoupper($tableName); // switch ($fieldElement) { @@ -185,8 +185,8 @@ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images"); break; case 12: - $ret .= $this->defines->getDefine($language, "URLFORM_{$stuTableName}", "{$fieldNameDesc} in text url"); - $ret .= $this->defines->getDefine($language, "URLFORM_UPLOAD", "{$fieldNameDesc} in uploads files"); + $ret .= $this->defines->getDefine($language, "FORM_URL_{$stuTableName}", "{$fieldNameDesc} in text url"); + $ret .= $this->defines->getDefine($language, "FORM_URL_UPLOAD", "{$fieldNameDesc} in uploads files"); break; case 13: $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_{$stuTableName}", "{$fieldNameDesc} in uploads images"); @@ -198,11 +198,11 @@ } } $ret .= $this->defines->getAboveDefines('General'); - $ret .= $this->defines->getDefine($language, 'FORMUPLOAD', "Upload file"); - $ret .= $this->defines->getDefine($language, 'FORMIMAGE_PATH', "Files in %s "); - $ret .= $this->defines->getDefine($language, 'FORMACTION', "Action"); - $ret .= $this->defines->getDefine($language, 'FORMEDIT', "Modification"); - $ret .= $this->defines->getDefine($language, 'FORMDEL', "Clear"); + $ret .= $this->defines->getDefine($language, 'FORM_UPLOAD', "Upload file"); + $ret .= $this->defines->getDefine($language, 'FORM_IMAGE_PATH', "Files in %s "); + $ret .= $this->defines->getDefine($language, 'FORM_ACTION', "Action"); + $ret .= $this->defines->getDefine($language, 'FORM_EDIT', "Modification"); + $ret .= $this->defines->getDefine($language, 'FORM_DELETE', "Clear"); return $ret; } 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-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageMain.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -93,24 +93,20 @@ As you can see, you've created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code."); $ret .= $this->defines->getAboveHeadDefines('Contents'); foreach (array_keys($tables) as $i) { - $tableName = $tables[$i]->getVar('table_name'); - $stuTableName = strtoupper($tableName); - $ucfTableName = UcFirstAndToLower($tableName); - $ret .= $this->defines->getAboveDefines($ucfTableName); - $ret .= $this->defines->getDefine($language, $stuTableName, $ucfTableName); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description"); - $ret .= $this->defines->getAboveDefines("Caption of {$ucfTableName}"); + $tableSoleName = $tables[$i]->getVar('table_solename'); + $stuTableSoleName = strtoupper($tableSoleName); + $ucfTableSoleName = UcFirstAndToLower($tableSoleName); + $ret .= $this->defines->getAboveDefines($ucfTableSoleName); + $ret .= $this->defines->getDefine($language, $stuTableSoleName, $ucfTableSoleName); + $ret .= $this->defines->getDefine($language, "{$stuTableSoleName}_DESC", "{$ucfTableSoleName} description"); + $ret .= $this->defines->getAboveDefines("Caption of {$ucfTableSoleName}"); $fields = $this->getTableFields($tables[$i]->getVar('table_mid'), $tables[$i]->getVar('table_id')); foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $stuFieldName = strtoupper($fieldName); - // - $rpFieldName = $this->tdmcfile->getRightString($fieldName); - $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_')); - // + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); $fieldNameDesc = ucfirst($rpFieldName); - // - $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc); + + $ret .= $this->defines->getDefine($language, $stuTableSoleName . '_' . $rpFieldName, $fieldNameDesc); } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-27 10:06:24 UTC (rev 13071) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-27 14:19:05 UTC (rev 13072) @@ -19,8 +19,6 @@ * @version $Id: TemplatesAdminPages.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -include_once TDMC_PATH . '/class/files/templates/TDMCreateHtmlSmartyCodes.php'; - /** * Class TemplatesAdminPages */ @@ -85,18 +83,24 @@ <thead> <tr class="head">\n EOT; - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $rpFieldName = $this->tdmcfile->getRightString($fieldName); - $lang_fn = $language . strtoupper($tableSoleName) . '_' . strtoupper($rpFieldName); - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_inlist'))) { - $ret .= <<<EOT - <th class="center"><{\$smarty.const.{$lang_fn}}></th>\n + $langHeadId = $language . strtoupper($tableSoleName) . '_ID'; + if (1 == $table->getVar('table_autoincrement')) { + $ret .= <<<EOT + <th class="center"><{\$smarty.const.{$langHeadId}}></th>\n EOT; - } + } + foreach (array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); + $langFieldName = $language . strtoupper($tableSoleName) . '_' . strtoupper($rpFieldName); + if (1 == $fields[$f]->getVar('field_inlist')) { + $ret .= <<<EOT + <th class="center"><{\$smarty.const.{$langFieldName}}></th>\n +EOT; + } } $ret .= <<<EOT - <th class="center"><{\$smarty.const.{$language}FORMACTION}></th> + <th class="center"><{\$smarty.const.{$language}FORM_ACTION}></th> </tr> </thead>\n EOT; @@ -121,14 +125,19 @@ <{foreach item=list from=\${$tableName}_list}> <tr class="<{cycle values='odd, even'}>">\n EOT; - foreach (array_keys($fields) as $f) { + if (1 == $table->getVar('table_autoincrement')) { + $ret .= <<<EOT + <td class="center"><{\$list.id}></td>\n +EOT; + } + foreach (array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $rpFieldName = $this->tdmcfile->getRightString($fieldName); if (0 == $f) { - $field_id = $fieldName; + $fieldId = $fieldName; } - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_inlist'))) { + if (1 == $fields[$f]->getVar('field_inlist')) { switch ($fieldElement) { case 9: $ret .= <<<EOT @@ -155,10 +164,10 @@ } $ret .= <<<EOT <td class="center"> - <a href="{$tableName}.php?op=edit&{$field_id}=<{\$list.id}>" title="<{\$smarty.const._EDIT}>"> + <a href="{$tableName}.php?op=edit&{$fieldId}=<{\$list.id}>" title="<{\$smarty.const._EDIT}>"> <img src="<{xoModuleIcons16 edit.png}>" alt="<{\$smarty.const._EDIT}>" /> </a> - <a href="{$tableName}.php?op=delete&{$field_id}=<{\$list.id}>" title="<{\$smarty.const._DELETE}>"> + <a href="{$tableName}.php?op=delete&{$fieldId}=<{\$list.id}>" title="<{\$smarty.const._DELETE}>"> <img src="<{xoModuleIcons16 delete.png}>" alt="<{\$smarty.const._DELETE}>" /> </a> </td> @@ -189,13 +198,18 @@ <{foreach item=list from=\${$tableName}_list}> <tr class="<{cycle values='odd, even'}>">\n EOT; - foreach (array_keys($fields) as $f) { + if (1 == $table->getVar('table_autoincrement')) { + $ret .= <<<EOT + <td class="center"><{\$list.id}></td>\n +EOT; + } + foreach (array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); if (0 == $f) { - $field_id = $fieldName; + $fieldId = $fieldName; } - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_inlist'))) { + if (1 == $fields[$f]->getVar('field_inlist')) { switch ($fieldElement) { case 9: $ret .= <<<EOT @@ -222,10 +236,10 @@ } $ret .= <<<EOT <td class="center"> - <a href="{$tableName}.php?op=edit&{$field_id}=<{\$list.{$field_id}}>" title="<{\$smarty.const._EDIT}>"> + <a href="{$tableName}.php?op=edit&{$fieldId}=<{\$list.{$fieldId}}>" title="<{\$smarty.const._EDIT}>"> <img src="<{xoModuleIcons16 edit.png}>" alt="<{\$smarty.const._EDIT}>" /> </a> - <a href="{$tableName}.php?op=delete&{$field_id}=<{\$list.{$field_id}}>" title="<{\$smarty.const._DELETE}>"> + <a href="{$tableName}.php?op=delete&{$fieldId}=<{\$list.{$fieldId}}>" title="<{\$smarty.const._DELETE}>"> <img src="<{xoModuleIcons16 delete.png}>" alt="<{\$smarty.const._DELETE}>" /> </a> </td> |
From: <txm...@us...> - 2015-05-27 10:06:26
|
Revision: 13071 http://sourceforge.net/p/xoops/svn/13071 Author: txmodxoops Date: 2015-05-27 10:06:24 +0000 (Wed, 27 May 2015) Log Message: ----------- Fix missing value type sql/SqlFile.php XML Rss Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-26 09:35:26 UTC (rev 13070) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-27 10:06:24 UTC (rev 13071) @@ -238,25 +238,25 @@ $fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId ); $form = $fieldsObj->getFormEdit($fieldMid, $fieldTid); $GLOBALS['xoopsTpl']->assign('form', $form->render()); - break; - - case 'order': - // Initialize fields handler + break; + + case 'order': + // Initialize fields handler $fieldsObj = $tdmcreate->getHandler('fields'); - if ( isset($_POST['forder'] ) ) { + if (isset($_POST['forder'])) { $i = 0; - foreach($_POST['forder'] as $order) { - if( $order > 0 ) { + foreach ($_POST['forder'] as $order) { + if ($order > 0) { $fieldOrder = $fieldsObj->get($order); $fieldOrder->setVar('field_order', $i); if (!$fieldsObj->insert($fieldOrder)) { - $error=true; + $error = true; } - $i++; + ++$i; } } - redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR); - unset($i); + redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_ORDER_ERROR); + unset($i); } exit; break; 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-26 09:35:26 UTC (rev 13070) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-27 10:06:24 UTC (rev 13071) @@ -493,7 +493,7 @@ $ret[] = $userRss->render(); // User Templates Rss File $userTemplatesRss = TemplatesUserRss::getInstance(); - $userTemplatesRss->write($module, $table); + $userTemplatesRss->write($module); $ret[] = $userTemplatesRss->renderFile($moduleDirname . '_rss.tpl'); } // User Single File 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-26 09:35:26 UTC (rev 13070) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-27 10:06:24 UTC (rev 13071) @@ -194,7 +194,7 @@ case 3: case 4: case 5: - $type = $fieldTypeName; + $type = $fieldTypeName . '(' . $fieldValue . ')'; if(empty($fieldDefault)) { $default = "DEFAULT '0'"; } else { @@ -204,7 +204,7 @@ case 6: case 7: case 8: - $type = $fieldTypeName; + $type = $fieldTypeName . '(' . $fieldValue . ')'; if(empty($fieldDefault)) { $default = "DEFAULT '0.00'"; // From MySQL 5.7 Manual } else { @@ -216,7 +216,7 @@ $type = $fieldTypeName; break; case 11: - $type = $fieldTypeName; + $type = $fieldTypeName . '(' . $fieldValue . ')'; if(empty($fieldDefault)) { $default = "DEFAULT 'my...@em...'"; } else { @@ -224,7 +224,7 @@ } break; case 12: - $type = $fieldTypeName; + $type = $fieldTypeName . '(' . $fieldValue . ')'; if(empty($fieldDefault)) { $default = "DEFAULT 'http:\\'"; } else { @@ -233,8 +233,8 @@ break; case 13: case 14: - $type = $fieldTypeName; - $default = "DEFAULT ''"; + $type = $fieldTypeName . '(' . $fieldValue . ')'; + $default = "DEFAULT '{$fieldDefault}'"; break; case 15: case 16: @@ -247,12 +247,8 @@ case 20: case 21: case 22: - $type = $fieldTypeName; - /*if(empty($fieldDefault)) { - $default = "DEFAULT '0'"; - } else {*/ - $default = "DEFAULT '{$fieldDefault}'"; - //} + $type = $fieldTypeName . '(' . $fieldValue . ')'; + $default = "DEFAULT '{$fieldDefault}'"; break; case 23: $type = $fieldTypeName; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php 2015-05-26 09:35:26 UTC (rev 13070) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/user/TemplatesUserRss.php 2015-05-27 10:06:24 UTC (rev 13071) @@ -65,14 +65,13 @@ * @param $module * @param $table */ - public function write($module, $table) + public function write($module) { $this->setModule($module); - $this->setTable($table); } - + /* - * @private function getTemplatesUserRssHeader + * @private function getTemplatesUserRssXml * @param string $moduleDirname * @param string $table * @param string $language @@ -83,158 +82,42 @@ * @param $language * @return string */ - private function getTemplatesUserRssHeader($moduleDirname, $table, $language) + private function getTemplatesUserRssXml() { - $ret = <<<EOT -<{include file="db:{$moduleDirname}_header.tpl"}> -<table class="{$moduleDirname}"> - <thead class="outer"> - <tr class="head">\n -EOT; - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $langStuFieldName = $language . strtoupper($fieldName); - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) { - $ret .= <<<EOT - <th class="center"><{\$smarty.const.{$langStuFieldName}}></th>\n -EOT; - } - } - $ret .= <<<EOT - </tr> - </thead>\n -EOT; - - return $ret; - } - - /* - * @private function getTemplatesUserRssBody - * @param string $moduleDirname - * @param string $table - * @param string $language - */ - /** - * @param $moduleDirname - * @param $table - * @param $language - * @return string - */ - private function getTemplatesUserRssBody($moduleDirname, $table, $language) - { - $tableName = $table->getVar('table_name'); - $ret = <<<EOT - <tbody> - <{foreach item=list from=\${$tableName}}> - <tr class="<{cycle values='odd, even'}>">\n -EOT; - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $fieldElement = $fields[$f]->getVar('field_element'); - $rpFieldName = $this->tdmcfile->getRightString($fieldName); - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) { - switch ($fieldElement) { - case 9: - $ret .= <<<EOT - <td class="center"><span style="background-color: #<{\$list.{$rpFieldName}}>;">\t\t</span></td>\n -EOT; - break; - case 10: - $ret .= <<<EOT - <td class="center"><img src="<{xoModuleIcons32}><{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n -EOT; - break; - case 13: - $ret .= <<<EOT - <td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n -EOT; - break; - default: - $ret .= <<<EOT - <td class="center"><{\$list.{$rpFieldName}}></td>\n -EOT; - break; - } - } - } - $ret .= <<<EOT - </tr> - <{/foreach}> - </tbody> -</table>\n -EOT; - - return $ret; - } - - /* - * @private function getTemplatesUserRssBodyFieldnameEmpty - * @param string $moduleDirname - * @param string $table - * @param string $language - */ - /** - * @param $moduleDirname - * @param $table - * @param $language - * @return string - */ - private function getTemplatesUserRssBodyFieldnameEmpty($moduleDirname, $table, $language) - { - $tableName = $table->getVar('table_name'); - $ret = <<<EOT - <tbody> - <{foreach item=list from=\${$tableName}}> - <tr class="<{cycle values='odd, even'}>">\n -EOT; - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); - foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $fieldElement = $fields[$f]->getVar('field_element'); - if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) { - switch ($fieldElement) { - case 9: - $ret .= <<<EOT - <td class="center"><span style="background-color: #<{\$list.{$fieldName}}>;"></span></td>\n -EOT; - break; - case 13: - $ret .= <<<EOT - <td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$fieldName}}>" alt="{$tableName}"></td>\n -EOT; - break; - default: - $ret .= <<<EOT - <td class="center"><{\$list.{$fieldName}}></td>\n -EOT; - break; - } - } - } - $ret .= <<<EOT - </tr> - <{/foreach}> - </tbody> -</table>\n -EOT; - - return $ret; - } - - /* - * @private function getTemplatesUserRssFooter - * @param string $moduleDirname - */ - /** - * @param $moduleDirname - * @return string - */ - private function getTemplatesUserRssFooter($moduleDirname) - { $ret = <<<EOT -<{include file="db:{$moduleDirname}_footer.tpl"}> +<?xml version="1.0" encoding="UTF-8"?> +<rss version="2.0"> + <channel> + <title><{\$channel_title}></title> + <link><{\$channel_link}></link> + <description><{\$channel_desc}></description> + <lastBuildDate><{\$channel_lastbuild}></lastBuildDate> + <docs>http://backend.userland.com/rss/</docs> + <generator><{\$channel_generator}></generator> + <category><{\$channel_category}></category> + <managingEditor><{\$channel_editor}></managingEditor> + <webMaster><{\$channel_webmaster}></webMaster> + <language><{\$channel_language}></language> + <{if \$image_url != ""}> + <image> + <title><{\$channel_title}></title> + <url><{\$image_url}></url> + <link><{\$channel_link}></link> + <width><{\$image_width}></width> + <height><{\$image_height}></height> + </image> + <{/if}> + <{foreach item=item from=\$items}> + <item> + <title><{\$item.title}></title> + <link><{\$item.link}></link> + <description><{\$item.description}></description> + <pubDate><{\$item.pubdate}></pubDate> + <guid><{\$item.guid}></guid> + </item> + <{/foreach}> + </channel> +</rss>\n EOT; return $ret; @@ -251,18 +134,9 @@ public function renderFile($filename) { $module = $this->getModule(); - $table = $this->getTable(); $moduleDirname = $module->getVar('mod_dirname'); - $tableFieldname = $table->getVar('table_fieldname'); $language = $this->getLanguage($moduleDirname, 'MA'); - $content = $this->getTemplatesUserRssHeader($moduleDirname, $table, $language); - // Verify if table_fieldname is not empty - if (!empty($tableFieldname)) { - $content .= $this->getTemplatesUserRssBody($moduleDirname, $table, $language); - } else { - $content .= $this->getTemplatesUserRssBodyFieldnameEmpty($moduleDirname, $table, $language); - } - $content .= $this->getTemplatesUserRssFooter($moduleDirname); + $content = $this->getTemplatesUserRssXml(); // $this->tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php 2015-05-26 09:35:26 UTC (rev 13070) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php 2015-05-27 10:06:24 UTC (rev 13071) @@ -107,7 +107,9 @@ } if (1 == $fields[$f]->getVar('field_parent')) { $fieldParent = $fieldName; - } + } else { + $fieldParent = 'cid'; + } } $ret = <<<EOT @@ -140,7 +142,7 @@ \${$tableName}Arr = \${$tableName}Handler->getAll(\$criteria); unset(\$criteria); -if (!\$tpl->is_cached('db:rss.tpl', \${$fieldParent})) { +if (!\$tpl->is_cached('db:{$moduleDirname}_rss.tpl', \${$fieldParent})) { \$tpl->assign('channel_title', htmlspecialchars(\$title, ENT_QUOTES)); \$tpl->assign('channel_link', XOOPS_URL.'/'); \$tpl->assign('channel_desc', htmlspecialchars(\$xoopsConfig['slogan'], ENT_QUOTES)); @@ -185,7 +187,7 @@ } } header("Content-Type:text/xml; charset=" . _CHARSET); -\$tpl->display('db:rss.tpl', \${$fieldParent}); +\$tpl->display('db:{$moduleDirname}_rss.tpl', \${$fieldParent}); EOT; return $ret; |
From: <be...@us...> - 2015-05-26 09:35:28
|
Revision: 13070 http://sourceforge.net/p/xoops/svn/13070 Author: beckmi Date: 2015-05-26 09:35:26 +0000 (Tue, 26 May 2015) Log Message: ----------- 1.02 RC-1 for XOOPS 2.5.7.1 (see changelog.txt) Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/highlighter.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/utilities.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/config.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/oninstall.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/onupdate.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo.inc.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/item.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/search.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_header.tpl XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php Added Paths: ----------- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/plugins/ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/plugins/plugin.tag.php Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -73,7 +73,7 @@ // Uploading the image, if any // Retreive the filename to be uploaded - if (($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name'])) { + if ($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name']) { // $filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]; if ($filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]) { // TODO : implement publisher mimetype management @@ -139,7 +139,7 @@ //Added by fx2024 $parentCat = $categoryObj->categoryid(); - $sizeof = sizeof(XoopsRequest::getString('scname', '', 'POST')); + $sizeof = count(XoopsRequest::getString('scname', '', 'POST')); for ($i = 0; $i < $sizeof; ++$i) { if (XoopsRequest::getArray('scname', array(), 'POST')[$i] != '') { $categoryObj = $publisher->getHandler('category')->create(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -156,7 +156,7 @@ unset($func); } - if (!file_exists($imageBase = $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/VeraBd.ttf"))) { + if (!file_exists($imageBase = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/VeraBd.ttf"))) { return false; } @@ -175,7 +175,7 @@ $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127); imagefill($imageModule, 0, 0, $white); imagecolortransparent($imageModule, $white); - imagepng($imageModule, $GLOBALS['xoops']->path("/modules/" . $dirname . "/assets/images/module_logo.png")); + imagepng($imageModule, $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png")); imagedestroy($imageModule); return true; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -161,8 +161,8 @@ include_once (dirname(dirname(__DIR__))) . '/include/common.php'; publisherOpenCollapsableBar('amsimportgo', 'amsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('ams'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('ams'); $ams_module_id = $moduleObj->getVar('mid'); $gperm_handler = xoops_gethandler('groupperm'); @@ -185,7 +185,7 @@ // get the total number of subcats for this category // $criteria = new CriteriaCompo(); // $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '=')); -// $childCount = intval($mylinksCatHandler->getCount($criteria)); +// $childCount = (int)($mylinksCatHandler->getCount($criteria)); $criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME); $imageCategoryId = $imageCategoryHandler->getObjects($criteria); @@ -224,7 +224,7 @@ // Category image: copying to Publisher category uploads if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) { - if (copy($GLOBALS['xoops']->path("/uploads/AMS/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("/uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']))) { + if (copy($GLOBALS['xoops']->path("uploads/AMS/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']))) { $categoryObj->setVar('image', $arrCat['topic_imgurl']); //======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder @@ -259,8 +259,8 @@ //copy all images to Image Manager - $src = $GLOBALS['xoops']->path("/uploads/AMS/topics/"); - $dst = $GLOBALS['xoops']->path("/uploads"); + $src = $GLOBALS['xoops']->path("uploads/AMS/topics/"); + $dst = $GLOBALS['xoops']->path("uploads"); PublisherUtilities::recurseCopy($src, $dst); @@ -327,9 +327,9 @@ /* // HTML Wrap if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { - if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) { + if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>"; } @@ -347,9 +347,9 @@ $resultFiles = $GLOBALS['xoopsDB']->query($sql); $allowed_mimetypes = ''; while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) { - $filename = $GLOBALS['xoops']->path("/uploads/AMS/attached/" . $arrFile['downloadname']); + $filename = $GLOBALS['xoops']->path("uploads/AMS/attached/" . $arrFile['downloadname']); if (file_exists($filename)) { - if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filerealname']))) { + if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) { $fileObj = $publisher->getHandler('file')->create(); $fileObj->setVar('name', $arrFile['filerealname']); $fileObj->setVar('description', $arrFile['filerealname']); @@ -411,15 +411,15 @@ $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $ams_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -107,8 +107,8 @@ _AM_PUBLISHER_IMPORT_RESULT ); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('cjaycontent'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('cjaycontent'); $cjaycontent_module_id = $moduleObj->getVar('mid'); $gperm_handler = xoops_gethandler('groupperm'); @@ -151,9 +151,9 @@ /* // HTML Wrap if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { - if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) { + if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>"; } @@ -178,15 +178,15 @@ $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $cjaycontent_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -37,8 +37,8 @@ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); publisherOpenCollapsableBar('fmimport', 'fmimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('fmcontent'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('fmcontent'); $fm_module_id = $moduleObj->getVar('mid'); $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent'); @@ -122,8 +122,8 @@ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); publisherOpenCollapsableBar('fmimportgo', 'fmimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('fmcontent'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('fmcontent'); $fm_module_id = $moduleObj->getVar('mid'); $gperm_handler = xoops_gethandler('groupperm'); @@ -319,15 +319,15 @@ $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $fm_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -97,8 +97,8 @@ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); publisherOpenCollapsableBar('newsimportgo', 'newsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('news'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('news'); $news_module_id = $moduleObj->getVar('mid'); $gperm_handler = xoops_gethandler('groupperm'); @@ -131,7 +131,7 @@ // Category image if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) { - if (copy($GLOBALS['xoops']->path("/modules/news/assets/images/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("/uploads/publisher/images/category/" . $arrCat['topic_imgurl']))) { + if (copy($GLOBALS['xoops']->path("modules/news/assets/images/topics/" . $arrCat['topic_imgurl']), $GLOBALS['xoops']->path("uploads/publisher/images/category/" . $arrCat['topic_imgurl']))) { $categoryObj->setVar('image', $arrCat['topic_imgurl']); } } @@ -173,9 +173,9 @@ /* // HTML Wrap if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { - if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) { + if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>"; } @@ -194,9 +194,9 @@ $allowed_mimetypes = ''; while ($arrFile = $GLOBALS['xoopsDB']->fetchArray ($resultFiles)) { - $filename = $GLOBALS['xoops']->path("/modules/wfsection/cache/uploaded/" . $arrFile['filerealname']); + $filename = $GLOBALS['xoops']->path("modules/wfsection/cache/uploaded/" . $arrFile['filerealname']); if (file_exists($filename)) { - if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filerealname']))) { + if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) { $fileObj = $publisher_file_handler->create(); $fileObj->setVar('name', $arrFile['fileshowname']); $fileObj->setVar('description', $arrFile['filedescript']); @@ -252,15 +252,15 @@ $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $news_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -97,8 +97,8 @@ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); publisherOpenCollapsableBar('newsimportgo', 'newsimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('smartsection'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('smartsection'); $smartsection_module_id = $moduleObj->getVar('mid'); $gperm_handler = xoops_gethandler('groupperm'); @@ -128,7 +128,7 @@ // Copy category image if (($arrCat['image'] != 'blank.gif') && ($arrCat['image'] != '')) { - copy($GLOBALS['xoops']->path("/uploads/smartsection/images/category/" . $arrCat['image']), $GLOBALS['xoops']->path("/uploads/publisher/images/category/" . $arrCat['image'])); + copy($GLOBALS['xoops']->path("uploads/smartsection/images/category/" . $arrCat['image']), $GLOBALS['xoops']->path("uploads/publisher/images/category/" . $arrCat['image'])); } if (!$publisher->getHandler('category')->insert($categoryObj)) { @@ -158,9 +158,9 @@ // TODO: copy contents folder /* if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { - if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) { + if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>"; } @@ -178,9 +178,9 @@ $resultFiles = $GLOBALS['xoopsDB']->query($sql); $allowed_mimetypes = null; while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) { - $filename = $GLOBALS['xoops']->path("/uploads/smartsection/" . $arrFile['filename']); + $filename = $GLOBALS['xoops']->path("uploads/smartsection/" . $arrFile['filename']); if (file_exists($filename)) { - if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filename']))) { + if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filename']))) { $fileObj = $publisher->getHandler('file')->create(); $fileObj->setVars($arrFile); $fileObj->setVar('fileid', 0); @@ -229,15 +229,15 @@ $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $smartsection_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -42,7 +42,7 @@ if ($totalCat == 0) { echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . "</span>"; } else { - include_once $GLOBALS['xoops']->path("/class/xoopstree.php"); + include_once $GLOBALS['xoops']->path("class/xoopstree.php"); $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("wfs_article")); list ($totalArticles) = $GLOBALS['xoopsDB']->fetchRow($result); @@ -131,7 +131,7 @@ // Category image if (($arrCat['imgurl'] != 'blank.gif') && ($arrCat['imgurl'])) { - if (copy($GLOBALS['xoops']->path("/modules/wfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) { + if (copy($GLOBALS['xoops']->path("modules/wfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) { $categoryObj->setVar('image', $arrCat['imgurl']); } } @@ -172,7 +172,7 @@ // HTML Wrap if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" . $arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" . $arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . "/content/" . $arrArticle['htmlpage'])) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); @@ -191,7 +191,7 @@ $resultFiles = $GLOBALS['xoopsDB']->query($sql); $allowed_mimetypes = ''; while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) { - $filename = $GLOBALS['xoops']->path("/modules/wfsection/cache/uploaded/" . $arrFile['filerealname']); + $filename = $GLOBALS['xoops']->path("modules/wfsection/cache/uploaded/" . $arrFile['filerealname']); if (file_exists($filename)) { if (copy($filename, PUBLISHER_UPLOAD_PATH . "/" . $arrFile['filerealname'])) { $fileObj = $publisher->getHandler('file')->create(); @@ -239,21 +239,21 @@ // Looping through the comments to link them to the new articles and module echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />"; - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('wfsection'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('wfsection'); $news_module_id = $moduleObj->getVar('mid'); $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $news_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -123,7 +123,7 @@ // Category image if (($arrCat['imgurl'] != 'blank.gif') && ($arrCat['imgurl'])) { - if (copy($GLOBALS['xoops']->path("/modules/xfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) { + if (copy($GLOBALS['xoops']->path("modules/xfsection/images/category/" . $arrCat['imgurl']), PUBLISHER_UPLOAD_PATH . "/images/category/" . $arrCat['imgurl'])) { $categoryObj->setVar('image', $arrCat['imgurl']); } } @@ -170,7 +170,7 @@ // HTML Wrap if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/xfsection/html/" . $arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/xfsection/html/" . $arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { if (copy($pagewrap_filename, PUBLISHER_UPLOAD_PATH . "/content/" . $arrArticle['htmlpage'])) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); @@ -189,7 +189,7 @@ $resultFiles = $GLOBALS['xoopsDB']->query($sql); $allowed_mimetypes = ''; while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) { - $filename = $GLOBALS['xoops']->path("/modules/xfsection/cache/uploaded/" . $arrFile['filerealname']); + $filename = $GLOBALS['xoops']->path("modules/xfsection/cache/uploaded/" . $arrFile['filerealname']); if (file_exists($filename)) { if (copy($filename, PUBLISHER_UPLOAD_PATH . "/" . $arrFile['filerealname'])) { $fileObj = $publisher->getHandler('file')->create(); @@ -237,21 +237,21 @@ // Looping through the comments to link them to the new articles and module echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />"; - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('xfsection'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('xfsection'); $news_module_id = $moduleObj->getVar('mid'); $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $news_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -56,33 +56,31 @@ echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf( _AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, - $totalArticles - ) . "</span>"; + $totalArticles) . "</span>"; } else { echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf( _AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, - $totalCat - ) . "</span>"; + $totalCat) . "</span>"; $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname"); -//---------- mb ------------------ -// add "publisher" category to "imagecategory" table + //---------- mb ------------------ + // add "publisher" category to "imagecategory" table -// if (!$GLOBALS['xoopsSecurity']->check()) { -// redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); -// } + // if (!$GLOBALS['xoopsSecurity']->check()) { + // redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + // } $imageCategoryHandler =& xoops_gethandler('imagecategory'); $imagecategory =& $imageCategoryHandler->create(); -// $imagecategory->setVar('imgcat_name', $imgcat_name); + // $imagecategory->setVar('imgcat_name', $imgcat_name); $imagecategory->setVar('imgcat_name', PUBLISHER_DIRNAME); //$imgcat_name); $imagecategory->setVar('imgcat_maxsize', $GLOBALS['xoopsModuleConfig']['maximum_filesize']); //$imgcat_maxsize); $imagecategory->setVar('imgcat_maxwidth', $GLOBALS['xoopsModuleConfig']['maximum_image_width']); //$imgcat_maxwidth); $imagecategory->setVar('imgcat_maxheight', $GLOBALS['xoopsModuleConfig']['maximum_image_height']); //$imgcat_maxheight); -// $imgcat_display = empty($imgcat_display) ? 0 : 1; + // $imgcat_display = empty($imgcat_display) ? 0 : 1; $imagecategory->setVar('imgcat_display', 1); //$imgcat_display); $imagecategory->setVar('imgcat_weight', 0); //$imgcat_weight); $imagecategory->setVar('imgcat_storetype', 'file'); //$imgcat_storetype); @@ -130,7 +128,7 @@ } unset($wgroup); -//---------- mb ------------------ + //---------- mb ------------------ // Categories to be imported $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM " . $GLOBALS['xoopsDB']->prefix("nw_topics") @@ -182,8 +180,8 @@ _AM_PUBLISHER_IMPORT_RESULT ); - $module_handler = xoops_gethandler('module'); - $moduleObj = $module_handler->getByDirname('xnews'); + $moduleHandler = xoops_gethandler('module'); + $moduleObj = $moduleHandler->getByDirname('xnews'); $xnews_module_id = $moduleObj->getVar('mid'); $gperm_handler = xoops_gethandler('groupperm'); @@ -201,32 +199,32 @@ $newArticleArray = array(); $imageCategoryHandler =& xoops_gethandler('imagecategory'); -// $criteria = new criteriaCombo; + // $criteria = new criteriaCombo; -// get the total number of subcats for this category -// $criteria = new CriteriaCompo(); -// $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '=')); -// $childCount = intval($mylinksCatHandler->getCount($criteria)); + // get the total number of subcats for this category + // $criteria = new CriteriaCompo(); + // $criteria->add(new Criteria('imagecategory', $catObj->getVar('cid'), '=')); + // $childCount = (int)($mylinksCatHandler->getCount($criteria)); $criteria = new Criteria('imgcat_name', PUBLISHER_DIRNAME); $imageCategoryId = $imageCategoryHandler->getObjects($criteria); -// $criteria = new CriteriaCompo(); -// $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "=")); + // $criteria = new CriteriaCompo(); + // $criteria->add(new Criteria("imagecategory", PUBLISHER_DIRNAME, "=")); -// $newid = $imageCategoryId->getVar('imgcat_id'); + // $newid = $imageCategoryId->getVar('imgcat_id'); $newid = $imageCategoryId[0]->vars['imgcat_id']['value']; -// $newid = $imageCategoryId[0]->vars['imgcat_id']; + // $newid = $imageCategoryId[0]->vars['imgcat_id']; -// $select_form = new XoopsFormSelect("", $name_current, array(), 1); -// $select_form->addOption("", _SELECT); -// $select_form->addOptionArray($writer_handler->getList($criteria)); + // $select_form = new XoopsFormSelect("", $name_current, array(), 1); + // $select_form->addOption("", _SELECT); + // $select_form->addOptionArray($writer_handler->getList($criteria)); -// $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('imagecategory') . " WHERE imgcat_name=" . PUBLISHER_DIRNAME; -// $resultImageCategory = $GLOBALS['xoopsDB']->query($sql); -// -// -// $newid = $resultImageCategory->getVar('imgcat_id'); + // $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix('imagecategory') . " WHERE imgcat_name=" . PUBLISHER_DIRNAME; + // $resultImageCategory = $GLOBALS['xoopsDB']->query($sql); + // + // + // $newid = $resultImageCategory->getVar('imgcat_id'); $oldToNew = array(); while (($arrCat = $GLOBALS['xoopsDB']->fetchArray($resultCat)) !== false) { @@ -246,13 +244,13 @@ // Category image: copying to Publisher category uploads if (($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '')) { if (copy( - $GLOBALS['xoops']->path("/uploads/xnews/topics/" . $arrCat['topic_imgurl']), - $GLOBALS['xoops']->path("/uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']) + $GLOBALS['xoops']->path("uploads/xnews/topics/" . $arrCat['topic_imgurl']), + $GLOBALS['xoops']->path("uploads/" . PUBLISHER_DIRNAME . "/images/category/" . $arrCat['topic_imgurl']) ) ) { $categoryObj->setVar('image', $arrCat['topic_imgurl']); -//======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder + //======== there is no need to add the category images to Image Manager, because they are handled directly from /images/category/ folder /* @@ -272,7 +270,7 @@ */ -//============================ + //============================ } } @@ -283,8 +281,8 @@ } //copy all images to Image Manager - $src = $GLOBALS['xoops']->path("/uploads/xnews/topics/"); - $dst = $GLOBALS['xoops']->path("/uploads"); + $src = $GLOBALS['xoops']->path("uploads/xnews/topics/"); + $dst = $GLOBALS['xoops']->path("uploads"); PublisherUtilities::recurseCopy($src, $dst); //populate the Image Manager with images from xNews articles (by Bleekk) @@ -329,7 +327,7 @@ $itemObj->setVar('dobr', !$arrArticle['dobr']); $itemObj->setVar('item_tag', $arrArticle['tags']); $itemObj->setVar('notifypub', $arrArticle['notifypub']); -//-------- image + //-------- image $img_handler =& xoops_gethandler('image'); @@ -339,7 +337,7 @@ $itemObj->setVar('image', $newImageId); $itemObj->setVar('images', $newImageId); -//-------------- + //-------------- $itemObj->setVar('rating', $arrArticle['rating']); $itemObj->setVar('votes', $arrArticle['votes']); @@ -350,9 +348,9 @@ /* // HTML Wrap if ($arrArticle['htmlpage']) { - $pagewrap_filename = $GLOBALS['xoops']->path("/modules/wfsection/html/" .$arrArticle['htmlpage']); + $pagewrap_filename = $GLOBALS['xoops']->path("modules/wfsection/html/" .$arrArticle['htmlpage']); if (file_exists($pagewrap_filename)) { - if (copy($pagewrap_filename, $GLOBALS['xoops']->path("/uploads/publisher/content/" . $arrArticle['htmlpage']))) { + if (copy($pagewrap_filename, $GLOBALS['xoops']->path("uploads/publisher/content/" . $arrArticle['htmlpage']))) { $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]"); echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>"; } @@ -364,15 +362,15 @@ echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['storyid'] . ' ' . $arrArticle['title']) . "<br/>"; continue; } else { -//-------------------------------------------- + //-------------------------------------------- // Linkes files $sql = "SELECT * FROM " . $GLOBALS['xoopsDB']->prefix("nw_stories_files") . " WHERE storyid=" . $arrArticle['storyid']; $resultFiles = $GLOBALS['xoopsDB']->query($sql); $allowed_mimetypes = ''; while (($arrFile = $GLOBALS['xoopsDB']->fetchArray($resultFiles)) !== false) { - $filename = $GLOBALS['xoops']->path("/uploads/xnews/attached/" . $arrFile['downloadname']); + $filename = $GLOBALS['xoops']->path("uploads/xnews/attached/" . $arrFile['downloadname']); if (file_exists($filename)) { - if (copy($filename, $GLOBALS['xoops']->path("/uploads/publisher/" . $arrFile['filerealname']))) { + if (copy($filename, $GLOBALS['xoops']->path("uploads/publisher/" . $arrFile['filerealname']))) { $fileObj = $publisher->getHandler('file')->create(); $fileObj->setVar('name', $arrFile['filerealname']); $fileObj->setVar('description', $arrFile['filerealname']); @@ -392,7 +390,7 @@ } } -//------------------------ + //------------------------ $newArticleArray[$arrArticle['storyid']] = $itemObj->itemid(); echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />"; @@ -434,15 +432,15 @@ $publisher_module_id = $publisher->getModule()->mid(); - $comment_handler = xoops_gethandler('comment'); + $commentHandler = xoops_gethandler('comment'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('com_modid', $xnews_module_id)); - $comments = $comment_handler->getObjects($criteria); + $comments = $commentHandler->getObjects($criteria); foreach ($comments as $comment) { $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]); $comment->setVar('com_modid', $publisher_module_id); $comment->setNew(); - if (!$comment_handler->insert($comment)) { + if (!$commentHandler->insert($comment)) { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />"; } else { echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />"; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -23,13 +23,12 @@ $op = XoopsRequest::getString('op', XoopsRequest::getString('op', 'none', 'GET'), 'POST'); - switch ($op) { case "importExecute": $importfile = XoopsRequest::getString('importfile', 'nonselected', 'POST'); - $importfile_path = $GLOBALS['xoops']->path("/modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php"); + $importfile_path = $GLOBALS['xoops']->path("modules/" . $publisher->getModule()->dirname() . "/admin/import/" . $importfile . ".php"); include_once $importfile_path; break; @@ -45,11 +44,11 @@ xoops_load('XoopsFormLoader'); - $module_handler = xoops_gethandler('module'); + $moduleHandler = xoops_gethandler('module'); // WF-Section /*$wfs_version = 0; - $moduleObj = $module_handler->getByDirname('wfsection'); + $moduleObj = $moduleHandler->getByDirname('wfsection'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version == 1.5) || $from_module_version == 1.04 || $from_module_version == 1.01 || $from_module_version == 2.07 || $from_module_version == 2.06) { @@ -60,7 +59,7 @@ // News $news_version = 0; - $moduleObj = $module_handler->getByDirname('news'); + $moduleObj = $moduleHandler->getByDirname('news'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version >= 1.1)) { @@ -71,7 +70,7 @@ // xNews $xnews_version = 0; - $moduleObj = $module_handler->getByDirname('xnews'); + $moduleObj = $moduleHandler->getByDirname('xnews'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version >= 1.1)) { @@ -82,7 +81,7 @@ // AMS $ams_version = 0; - $moduleObj = $module_handler->getByDirname('AMS'); + $moduleObj = $moduleHandler->getByDirname('AMS'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version >= 1.1)) { @@ -93,7 +92,7 @@ // Smartsection $smartsection_version = 0; - $moduleObj = $module_handler->getByDirname('smartsection'); + $moduleObj = $moduleHandler->getByDirname('smartsection'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version >= 1.1)) { @@ -104,7 +103,7 @@ // C-Jay Content $cjaycontent_version = 0; - $moduleObj = $module_handler->getByDirname('cjaycontent'); + $moduleObj = $moduleHandler->getByDirname('cjaycontent'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version >= 1.1)) { @@ -115,7 +114,7 @@ // FmContent $fmcontent_version = 0; - $moduleObj = $module_handler->getByDirname('fmcontent'); + $moduleObj = $moduleHandler->getByDirname('fmcontent'); if ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if (($from_module_version >= 1.1)) { @@ -126,7 +125,7 @@ // XF-Section /*$xfs_version = 0; - $moduleObj = $module_handler->getByDirname('xfsection'); + $moduleObj = $moduleHandler->getByDirname('xfsection'); If ($moduleObj) { $from_module_version = round($moduleObj->getVar('version') / 100, 2); if ($from_module_version > 1.00) { Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/index.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -33,8 +33,6 @@ // $indexAdmin->addConfigBoxLine(array($folder[$i], '777'), 'chmod'); } - - echo $indexAdmin->addNavigation('index.php'); echo $indexAdmin->renderIndex(); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/menu.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -22,8 +22,8 @@ // defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined"); $dirname = basename(dirname(__DIR__)); -$module_handler = xoops_gethandler('module'); -$module = $module_handler->getByDirname($dirname); +$moduleHandler = xoops_gethandler('module'); +$module = $moduleHandler->getByDirname($dirname); $pathIcon32 = $module->getInfo('icons32'); include_once dirname(__DIR__) . '/include/config.php'; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -48,7 +48,6 @@ $op = XoopsRequest::getString('op', 'default', 'GET'); - switch ($op) { case "add": PublisherMimetypesUtilities::add(); @@ -95,7 +94,7 @@ $publisher = PublisherPublisher::getInstance(); global $limit, $start; $error = array(); - if (!(XoopsRequest::get('add_mime', '', 'POST'))) { + if (!(XoopsRequest::getString('add_mime', '', 'POST'))) { publisherCpHeader(); //publisher_adminMenu(4, _AM_PUBLISHER_MIMETYPES); @@ -554,7 +553,6 @@ $order = XoopsRequest::getString('order', 'ASC', 'POST'); $sort = XoopsRequest::getString('sort', 'mime_name', 'POST'); - publisherCpHeader(); //publisher_adminMenu(4, _AM_PUBLISHER_MIMETYPES . " > " . _AM_PUBLISHER_BUTTON_SEARCH); @@ -714,7 +712,6 @@ $limit = XoopsRequest::getInt('limit', 0, 'GET'); $start = XoopsRequest::getInt('start', 0, 'GET'); - if (!(XoopsRequest::getString('id', '', 'GET'))) { redirect_header(PUBLISHER_ADMIN_URL . "/mimetypes.php", 3, _AM_PUBLISHER_MESSAGE_NO_ID); } else { @@ -774,7 +771,7 @@ */ public static function clearEditSessionVars($id) { - $id = intval($id); + $id = (int)($id); $session = PublisherSession::getInstance(); $session->del("publisher_editMime_$id"); $session->del("publisher_editMimeErr_$id"); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/preferences.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -40,7 +40,6 @@ $configcat = XoopsRequest::getString('configcat', '', 'GET'); - if ($op == 'showmod') { $config_handler = xoops_gethandler('config'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -24,11 +24,11 @@ $errors = array(); if (publisher_pagewrap_upload($errors)) { - redirect_header(XoopsRequest::get('backto', '', 'POST'), 2, _AM_PUBLISHER_FILEUPLOAD_SUCCESS); + redirect_header(XoopsRequest::getString('backto', '', 'POST'), 2, _AM_PUBLISHER_FILEUPLOAD_SUCCESS); } else { $errorstxt = implode('<br />', $errors); $message = sprintf(_CO_PUBLISHER_MESSAGE_FILE_ERROR, $errorstxt); - redirect_header(XoopsRequest::get('backto', '', 'POST'), 5, $message); + redirect_header(XoopsRequest::getString('backto', '', 'POST'), 5, $message); } /** Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/archive.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -81,8 +81,8 @@ foreach ($items as $item) { $time = XoopsLocal::formatTimestamp($item['datesub'], 'mysql', $useroffset); if (preg_match("/([0-9]{4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/", $time, $datetime)) { - $this_year = intval($datetime[1]); - $this_month = intval($datetime[2]); + $this_year = (int)($datetime[1]); + $this_month = (int)($datetime[2]); //first year if (empty($lastyear)) { $lastyear = $this_year; Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -72,6 +72,7 @@ unset($items, $categories, $itemObj, $catID, $catObj); if (count($block['categories']) == 0) return $block; + return $block; } Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2015-05-26 09:32:35 UTC (rev 13069) +++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php 2015-05-26 09:35:26 UTC (rev 13070) @@ -37,10 +37,10 @@ $publisher = PublisherPublisher::getInstance(); //Column Settings - $opt_num_columns = isset($options[0]) ? intval($options[0]) : '2'; + $opt_num_columns = isset($options[0]) ? (int)($options[0]) : '2'; $sel_categories = isset($options[1]) ? explode(',', $options[1]) : array(); - $opt_cat_items = intval($options[2]); - $opt_cat_truncate = isset($options[3]) ? intval($options[3]) : '0'; + $opt_cat_items = (int)($options[2]); + $opt_cat_truncate = isset($options[3]) ? (int)($options[3]) : '0'; $block = array(); $block['lang_reads'] = _MB_PUBLISHER_READS; @@ -130,7 +130,7 @@ $block['template'] = $options[4]; $block['columns'] = $columns; - $block['columnwidth'] = intval(100 / $opt_num_columns); + $block['columnwidth'] = (int)(100 / $opt_num_columns); $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/' . PUBLISHER_DIRNAME . '/assets/css/publisher.css'); Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php ===============================================... [truncated message content] |
From: <be...@us...> - 2015-05-26 09:32:39
|
Revision: 13069 http://sourceforge.net/p/xoops/svn/13069 Author: beckmi Date: 2015-05-26 09:32:35 +0000 (Tue, 26 May 2015) Log Message: ----------- 1.02 RC-1 for XOOPS 2.5.7.1 (see changelog.txt) Modified Paths: -------------- XoopsModules/publisher/trunk/publisher/admin/about.php XoopsModules/publisher/trunk/publisher/admin/admin_header.php XoopsModules/publisher/trunk/publisher/admin/category.php XoopsModules/publisher/trunk/publisher/admin/clone.php XoopsModules/publisher/trunk/publisher/admin/file.php XoopsModules/publisher/trunk/publisher/admin/import/ams.php XoopsModules/publisher/trunk/publisher/admin/import/cjaycontent.php XoopsModules/publisher/trunk/publisher/admin/import/news.php XoopsModules/publisher/trunk/publisher/admin/import/smartsection.php XoopsModules/publisher/trunk/publisher/admin/import/wfsection.php XoopsModules/publisher/trunk/publisher/admin/import/xfsection.php XoopsModules/publisher/trunk/publisher/admin/import/xnews.php XoopsModules/publisher/trunk/publisher/admin/import.php XoopsModules/publisher/trunk/publisher/admin/index.php XoopsModules/publisher/trunk/publisher/admin/item.php XoopsModules/publisher/trunk/publisher/admin/main.php XoopsModules/publisher/trunk/publisher/admin/menu.php XoopsModules/publisher/trunk/publisher/admin/mimetypes.php XoopsModules/publisher/trunk/publisher/admin/pagewrap.php XoopsModules/publisher/trunk/publisher/admin/permissions.php XoopsModules/publisher/trunk/publisher/admin/preferences.php XoopsModules/publisher/trunk/publisher/admin/pw_delete_file.php XoopsModules/publisher/trunk/publisher/admin/pw_upload_file.php XoopsModules/publisher/trunk/publisher/archive.php XoopsModules/publisher/trunk/publisher/assets/css/jquery.popeye.style.css XoopsModules/publisher/trunk/publisher/assets/css/publisher.css XoopsModules/publisher/trunk/publisher/assets/images/popeye/loading3.gif XoopsModules/publisher/trunk/publisher/assets/js/behavior.js XoopsModules/publisher/trunk/publisher/assets/js/funcs.js XoopsModules/publisher/trunk/publisher/assets/js/rating.js XoopsModules/publisher/trunk/publisher/assets/js/script.easing.js XoopsModules/publisher/trunk/publisher/author_items.php XoopsModules/publisher/trunk/publisher/backend.php XoopsModules/publisher/trunk/publisher/blocks/category_items_sel.php XoopsModules/publisher/trunk/publisher/blocks/date_to_date.php XoopsModules/publisher/trunk/publisher/blocks/items_columns.php XoopsModules/publisher/trunk/publisher/blocks/items_menu.php XoopsModules/publisher/trunk/publisher/blocks/items_new.php XoopsModules/publisher/trunk/publisher/blocks/items_random_item.php XoopsModules/publisher/trunk/publisher/blocks/items_recent.php XoopsModules/publisher/trunk/publisher/blocks/items_spot.php XoopsModules/publisher/trunk/publisher/blocks/latest_files.php XoopsModules/publisher/trunk/publisher/blocks/latest_news.php XoopsModules/publisher/trunk/publisher/blocks/search.php XoopsModules/publisher/trunk/publisher/category.php XoopsModules/publisher/trunk/publisher/class/blockform.php XoopsModules/publisher/trunk/publisher/class/category.php XoopsModules/publisher/trunk/publisher/class/file.php XoopsModules/publisher/trunk/publisher/class/form/category.php XoopsModules/publisher/trunk/publisher/class/form/file.php XoopsModules/publisher/trunk/publisher/class/form/item.php XoopsModules/publisher/trunk/publisher/class/formdatetime.php XoopsModules/publisher/trunk/publisher/class/groupperm.php XoopsModules/publisher/trunk/publisher/class/highlighter.php XoopsModules/publisher/trunk/publisher/class/item.php XoopsModules/publisher/trunk/publisher/class/metagen.php XoopsModules/publisher/trunk/publisher/class/mimetype.php XoopsModules/publisher/trunk/publisher/class/permission.php XoopsModules/publisher/trunk/publisher/class/publisher.php XoopsModules/publisher/trunk/publisher/class/rating.php XoopsModules/publisher/trunk/publisher/class/session.php XoopsModules/publisher/trunk/publisher/class/themetabform.php XoopsModules/publisher/trunk/publisher/class/uploader.php XoopsModules/publisher/trunk/publisher/comment_delete.php XoopsModules/publisher/trunk/publisher/comment_edit.php XoopsModules/publisher/trunk/publisher/comment_new.php XoopsModules/publisher/trunk/publisher/comment_post.php XoopsModules/publisher/trunk/publisher/comment_reply.php XoopsModules/publisher/trunk/publisher/docs/changelog.txt XoopsModules/publisher/trunk/publisher/docs/readme.txt XoopsModules/publisher/trunk/publisher/file.php XoopsModules/publisher/trunk/publisher/footer.php XoopsModules/publisher/trunk/publisher/header.php XoopsModules/publisher/trunk/publisher/include/ajax_rating.php XoopsModules/publisher/trunk/publisher/include/ajax_upload.php XoopsModules/publisher/trunk/publisher/include/comment_functions.php XoopsModules/publisher/trunk/publisher/include/common.php XoopsModules/publisher/trunk/publisher/include/functions.php XoopsModules/publisher/trunk/publisher/include/media.textsanitizer.php XoopsModules/publisher/trunk/publisher/include/notification.inc.php XoopsModules/publisher/trunk/publisher/include/plugin.tag.php XoopsModules/publisher/trunk/publisher/include/search.inc.php XoopsModules/publisher/trunk/publisher/include/seo.inc.php XoopsModules/publisher/trunk/publisher/include/seo_functions.php XoopsModules/publisher/trunk/publisher/index.php XoopsModules/publisher/trunk/publisher/item.php XoopsModules/publisher/trunk/publisher/language/english/admin.php XoopsModules/publisher/trunk/publisher/language/english/blocks.php XoopsModules/publisher/trunk/publisher/language/english/common.php XoopsModules/publisher/trunk/publisher/language/english/help/help.html XoopsModules/publisher/trunk/publisher/language/english/main.php XoopsModules/publisher/trunk/publisher/language/english/modinfo.php XoopsModules/publisher/trunk/publisher/list.tag.php XoopsModules/publisher/trunk/publisher/makepdf.php XoopsModules/publisher/trunk/publisher/notification_update.php XoopsModules/publisher/trunk/publisher/pop.php XoopsModules/publisher/trunk/publisher/print.php XoopsModules/publisher/trunk/publisher/rate.php XoopsModules/publisher/trunk/publisher/search.php XoopsModules/publisher/trunk/publisher/submit.php XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_category_items_sel.tpl XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_items_columns.tpl XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_items_new.tpl XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_items_recent.tpl XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_items_spot.tpl XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_latest_news.tpl XoopsModules/publisher/trunk/publisher/templates/blocks/publisher_search_block.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_addfile.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_archive.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_display_full.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_display_list.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_display_summary.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_display_wfsection.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_header.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_item.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_print.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_rss.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_search.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_singleitem.tpl XoopsModules/publisher/trunk/publisher/templates/publisher_submit.tpl XoopsModules/publisher/trunk/publisher/thumb.php XoopsModules/publisher/trunk/publisher/view.tag.php XoopsModules/publisher/trunk/publisher/visit.php XoopsModules/publisher/trunk/publisher/xoops_version.php Added Paths: ----------- XoopsModules/publisher/trunk/publisher/admin/import/fmcontent.php XoopsModules/publisher/trunk/publisher/assets/css/jquery.popeye.css XoopsModules/publisher/trunk/publisher/assets/css/style.css XoopsModules/publisher/trunk/publisher/assets/images/logo.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/compact1.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/compact2.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/compact4.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/enlarge1.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/enlarge2.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/enlarge4.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/loading1.gif XoopsModules/publisher/trunk/publisher/assets/images/popeye/loading2.gif XoopsModules/publisher/trunk/publisher/assets/images/popeye/next1.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/pause3.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/play3.png XoopsModules/publisher/trunk/publisher/assets/images/popeye/prev1.png XoopsModules/publisher/trunk/publisher/assets/js/jquery.popeye-2.1.js XoopsModules/publisher/trunk/publisher/assets/js/jquery.popeye-2.1.min.js XoopsModules/publisher/trunk/publisher/class/constants.php XoopsModules/publisher/trunk/publisher/class/plugins/ XoopsModules/publisher/trunk/publisher/class/plugins/plugin.tag.php XoopsModules/publisher/trunk/publisher/class/utilities.php XoopsModules/publisher/trunk/publisher/config/ XoopsModules/publisher/trunk/publisher/config/index.html XoopsModules/publisher/trunk/publisher/include/config.php XoopsModules/publisher/trunk/publisher/include/oninstall.php XoopsModules/publisher/trunk/publisher/include/onupdate.php XoopsModules/publisher/trunk/publisher/tests/todo.txt Removed Paths: ------------- XoopsModules/publisher/trunk/publisher/admin/import/ams0.php XoopsModules/publisher/trunk/publisher/assets/images/module_logo.png XoopsModules/publisher/trunk/publisher/assets/js/jquery.popeye-2.0.4.js XoopsModules/publisher/trunk/publisher/class/request.php XoopsModules/publisher/trunk/publisher/include/constants.php XoopsModules/publisher/trunk/publisher/include/install.php XoopsModules/publisher/trunk/publisher/include/update.php Modified: XoopsModules/publisher/trunk/publisher/admin/about.php =================================================================== --- XoopsModules/publisher/trunk/publisher/admin/about.php 2015-05-25 21:36:01 UTC (rev 13068) +++ XoopsModules/publisher/trunk/publisher/admin/about.php 2015-05-26 09:32:35 UTC (rev 13069) @@ -1,14 +1,14 @@ <?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. +/** + * 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. + */ - 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. -*/ - /** * Publisher * @@ -20,7 +20,7 @@ * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); @@ -29,4 +29,11 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); +// if (version_compare(PHP_VERSION, '5.4.0') >= 0) { +// echo 'I am at least PHP version 5.4.0, my version: ' . PHP_VERSION . "\n"; +// } else { +// echo 'I am using PHP lower than 5.4, my version: ' . PHP_VERSION . "\n"; +// } + + xoops_cp_footer(); Modified: XoopsModules/publisher/trunk/publisher/admin/admin_header.php =================================================================== --- XoopsModules/publisher/trunk/publisher/admin/admin_header.php 2015-05-25 21:36:01 UTC (rev 13068) +++ XoopsModules/publisher/trunk/publisher/admin/admin_header.php 2015-05-26 09:32:35 UTC (rev 13069) @@ -1,12 +1,12 @@ <?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. +/** + * 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. */ /** @@ -19,24 +19,21 @@ * @version $Id$ */ -include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; -include_once dirname(dirname(__FILE__)) . '/include/common.php'; -include_once XOOPS_ROOT_PATH . '/include/cp_header.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +include_once dirname(__DIR__) . '/include/common.php'; +include_once $GLOBALS['xoops']->path('include/cp_header.php'); //xoops_loadLanguage('admin', PUBLISHER_DIRNAME); xoops_loadLanguage('modinfo', PUBLISHER_DIRNAME); $imagearray = array( - 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />", + 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />", 'deleteimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_delete.png' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />", - 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />", - 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />", + 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />", + 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />", ); -if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) { - include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); -} else { - echo xoops_error('/Frameworks/moduleclasses/moduleadmin/ is required!!!'); -} +include_once $GLOBALS['xoops']->path('Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); + /* $myts = MyTextSanitizer::getInstance(); Modified: XoopsModules/publisher/trunk/publisher/admin/category.php =================================================================== --- XoopsModules/publisher/trunk/publisher/admin/category.php 2015-05-25 21:36:01 UTC (rev 13068) +++ XoopsModules/publisher/trunk/publisher/admin/category.php 2015-05-26 09:32:35 UTC (rev 13069) @@ -19,32 +19,30 @@ * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; -$op = PublisherRequest::getString('op'); +$op = XoopsRequest::getString('op', '', 'GET'); -$op = isset($_POST['editor']) ? 'mod' : $op; -if (isset($_POST['addcategory'])) { - $op = 'addcategory'; -} +$op = (XoopsRequest::getString('editor', '', 'POST')) ? 'mod' : $op; +$op = (XoopsRequest::getString('addcategory', '', 'POST')) ? 'addcategory' : $op; // Where do we start ? -$startcategory = PublisherRequest::getInt('startcategory'); -$categoryid = PublisherRequest::getInt('categoryid'); +$startcategory = XoopsRequest::getInt('startcategory', 0, 'GET'); +$categoryid = XoopsRequest::getInt('categoryid'); switch ($op) { case "del": $categoryObj = $publisher->getHandler('category')->get($categoryid); - $confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0; - $name = (isset($_POST['name'])) ? $_POST['name'] : ''; + $confirm = XoopsRequest::getInt('confirm', '', 'POST'); + $name = XoopsRequest::getString('name', '', 'POST'); if ($confirm) { if (!$publisher->getHandler('category')->delete($categoryObj)) { redirect_header("category.php", 1, _AM_PUBLISHER_DELETE_CAT_ERROR); - exit(); +// exit(); } redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name)); - exit(); +// exit(); } else { xoops_cp_header(); xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE); @@ -54,18 +52,18 @@ case "mod": //Added by fx2024 - $nb_subcats = isset($_POST['nb_subcats']) ? intval($_POST['nb_subcats']) : 0; - $nb_subcats = $nb_subcats + (isset($_POST['nb_sub_yet']) ? intval($_POST['nb_sub_yet']) : 4); + $nb_subcats = XoopsRequest::getInt('nb_subcats', 0, 'POST'); + $nb_subcats = $nb_subcats + (XoopsRequest::getInt('nb_sub_yet', 4, 'POST')); //end of fx2024 code - publisher_cpHeader(); - publisher_editCat(true, $categoryid, $nb_subcats); + publisherCpHeader(); + PublisherUtilities::editCategory(true, $categoryid, $nb_subcats); break; case "addcategory": global $modify; - $parentid = PublisherRequest::getInt('parentid'); + $parentid = XoopsRequest::getInt('parentid'); if ($categoryid != 0) { $categoryObj = $publisher->getHandler('category')->get($categoryid); @@ -75,136 +73,121 @@ // Uploading the image, if any // Retreive the filename to be uploaded - if (isset($_FILES['image_file']['name']) && $_FILES['image_file']['name'] != "") { - $filename = $_POST["xoops_upload_file"][0]; - if (!empty($filename) || $filename != "") { + if ($image_file = XoopsRequest::getArray('image_file', '', 'FILES')['name']) { +// $filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]; + if ($filename = XoopsRequest::getArray('xoops_upload_file', array(), 'POST')[0]) { // TODO : implement publisher mimetype management - $max_size = $publisher->getConfig('maximum_filesize'); - $max_imgwidth = $publisher->getConfig('maximum_image_width'); - $max_imgheight = $publisher->getConfig('maximum_image_height'); - $allowed_mimetypes = publisher_getAllowedImagesTypes(); + $max_size = $publisher->getConfig('maximum_filesize'); + $max_imgwidth = $publisher->getConfig('maximum_image_width'); + $max_imgheight = $publisher->getConfig('maximum_image_height'); + $allowed_mimetypes = publisherGetAllowedImagesTypes(); - if ($_FILES[$filename]['tmp_name'] == "" || !is_readable($_FILES[$filename]['tmp_name'])) { + if (!($tmp_name = (XoopsRequest::getArray('filename', array(), 'FILES')['tmp_name'])) || !is_readable($tmp_name)) { redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR); - exit(); +// exit(); } xoops_load('XoopsMediaUploader'); - $uploader = new XoopsMediaUploader(publisher_getImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight); + $uploader = new XoopsMediaUploader(publisherGetImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight); if ($uploader->fetchMedia($filename) && $uploader->upload()) { $categoryObj->setVar('image', $uploader->getSavedFileName()); } else { redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors()); - exit(); +// exit(); } } } else { - if (isset($_POST['image'])) { - $categoryObj->setVar('image', $_POST['image']); - } + $categoryObj->setVar('image', XoopsRequest::getString('image', '', 'POST')); } - $categoryObj->setVar('parentid', (isset($_POST['parentid'])) ? intval($_POST['parentid']) : 0); + $categoryObj->setVar('parentid', (XoopsRequest::getInt('parentid', 0, 'POST'))); - $applyall = isset($_POST['applyall']) ? intval($_POST['applyall']) : 0; - $categoryObj->setVar('weight', isset($_POST['weight']) ? intval($_POST['weight']) : 1); + $applyall = XoopsRequest::getInt('applyall', 0, 'POST'); + $categoryObj->setVar('weight', XoopsRequest::getInt('weight', 1, 'POST')); // Groups and permissions - $grpread = isset($_POST['groups_read']) ? $_POST['groups_read'] : array(); - $grpsubmit = isset($_POST['groups_submit']) ? $_POST['groups_submit'] : array(); - $grpmoderation = isset($_POST['groups_moderation']) ? $_POST['groups_moderation'] : array(); + $grpread = XoopsRequest::getArray('groupsRead', array(), 'POST'); + $grpsubmit = XoopsRequest::getArray('groupsSubmit', array(), 'POST'); + $grpmoderation = XoopsRequest::getArray('groupsModeration', array(), 'POST'); - $categoryObj->setVar('name', $_POST['name']); + $categoryObj->setVar('name', XoopsRequest::getString('name', '', 'POST')); //Added by skalpa: custom template support - if (isset($_POST['template'])) { - $categoryObj->setVar('template', $_POST['template']); - } + $categoryObj->setVar('template', XoopsRequest::getString('template', '', 'POST')); + $categoryObj->setVar('meta_description', XoopsRequest::getString('meta_description', '', 'POST')); + $categoryObj->setVar('meta_keywords', XoopsRequest::getString('meta_keywords', '', 'POST')); + $categoryObj->setVar('short_url', XoopsRequest::getString('short_url', '', 'POST')); + $categoryObj->setVar('moderator', XoopsRequest::getInt('moderator', 0, 'POST')); + $categoryObj->setVar('description', XoopsRequest::getString('description', '', 'POST')); + $categoryObj->setVar('header', XoopsRequest::getString('header', '', 'POST')); - if (isset($_POST['meta_description'])) { - $categoryObj->setVar('meta_description', $_POST['meta_description']); - } - if (isset($_POST['meta_keywords'])) { - $categoryObj->setVar('meta_keywords', $_POST['meta_keywords']); - } - if (isset($_POST['short_url'])) { - $categoryObj->setVar('short_url', $_POST['short_url']); - } - $categoryObj->setVar('moderator', intval($_POST['moderator'])); - $categoryObj->setVar('description', $_POST['description']); - - if (isset($_POST['header'])) { - $categoryObj->setVar('header', $_POST['header']); - } - if ($categoryObj->isNew()) { $redirect_msg = _AM_PUBLISHER_CATCREATED; - $redirect_to = 'category.php?op=mod'; + $redirect_to = 'category.php?op=mod'; } else { $redirect_msg = _AM_PUBLISHER_COLMODIFIED; - $redirect_to = 'category.php'; + $redirect_to = 'category.php'; } if (!$categoryObj->store()) { - redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors())); - exit; + redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors())); +// exit; } // TODO : put this function in the category class - publisher_saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read'); - publisher_saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit'); - publisher_saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation'); + publisherSaveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read'); + publisherSaveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit'); + publisherSaveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation'); //Added by fx2024 $parentCat = $categoryObj->categoryid(); - $sizeof = sizeof($_POST['scname']); + $sizeof = count(XoopsRequest::getString('scname', '', 'POST')); for ($i = 0; $i < $sizeof; ++$i) { - if ($_POST['scname'][$i] != '') { + if (XoopsRequest::getArray('scname', array(), 'POST')[$i] != '') { $categoryObj = $publisher->getHandler('category')->create(); - $categoryObj->setVar('name', $_POST['scname'][$i]); + $categoryObj->setVar('name', XoopsRequest::getArray('scname', array(), 'POST')[$i]); $categoryObj->setVar('parentid', $parentCat); if (!$categoryObj->store()) { - redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors())); - exit; + redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisherFormatErrors($categoryObj->getErrors())); +// exit; } // TODO : put this function in the category class - publisher_saveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read'); - publisher_saveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit'); - publisher_saveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation'); + publisherSaveCategoryPermissions($grpread, $categoryObj->categoryid(), 'category_read'); + publisherSaveCategoryPermissions($grpsubmit, $categoryObj->categoryid(), 'item_submit'); + publisherSaveCategoryPermissions($grpmoderation, $categoryObj->categoryid(), 'category_moderation'); } } //end of fx2024 code redirect_header($redirect_to, 2, $redirect_msg); - exit(); +// exit(); break; //Added by fx2024 case "addsubcats": $categoryid = 0; - $nb_subcats = intval($_POST['nb_subcats']) + $_POST['nb_sub_yet']; + $nb_subcats = XoopsRequest::getInt('nb_subcats', 0, 'POST') + XoopsRequest::getInt('nb_sub_yet', 0, 'POST'); $categoryObj = $publisher->getHandler('category')->create(); - $categoryObj->setVar('name', $_POST['name']); - $categoryObj->setVar('description', $_POST['description']); - $categoryObj->setVar('weight', $_POST['weight']); + $categoryObj->setVar('name', XoopsRequest::getString('name', '', 'POST')); + $categoryObj->setVar('description', XoopsRequest::getString('description', '', 'POST')); + $categoryObj->setVar('weight', XoopsRequest::getInt('weight', 0, 'POST')); if (isset($parentCat)) { $categoryObj->setVar('parentid', $parentCat); } - publisher_cpHeader(); - publisher_editCat(true, $categoryid, $nb_subcats, $categoryObj); + publisherCpHeader(); + PublisherUtilities::editCategory(true, $categoryid, $nb_subcats, $categoryObj); exit(); - break; //end of fx2024 code case "cancel": redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_BACK2IDX, '')); - exit(); - +// exit(); + break; case "default": default: - publisher_cpHeader(); + publisherCpHeader(); //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES); echo "<br />\n"; @@ -216,7 +199,7 @@ // Creating the objects for top categories $categoriesObj = $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_perpage'), $startcategory, 0); - publisher_openCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC); + publisherOpenCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC); echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; echo "<tr>"; @@ -228,8 +211,9 @@ $totalCategories = $publisher->getHandler('category')->getCategoriesCount(0); if (count($categoriesObj) > 0) { foreach ($categoriesObj as $key => $thiscat) { - publisher_displayCategory($thiscat); + PublisherUtilities::displayCategory($thiscat); } + unset($key, $thiscat); } else { echo "<tr>"; echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . "</td>"; @@ -237,174 +221,14 @@ $categoryid = '0'; } echo "</table>\n"; - include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + include_once $GLOBALS['xoops']->path('class/pagenav.php'); $pagenav = new XoopsPageNav($totalCategories, $publisher->getConfig('idxcat_perpage'), $startcategory, 'startcategory'); echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>'; echo "<br />"; - publisher_closeCollapsableBar('createdcategories', 'createdcategoriesicon'); + publisherCloseCollapsableBar('createdcategories', 'createdcategoriesicon'); echo "<br>"; //editcat(false); break; } xoops_cp_footer(); - -function publisher_displayCategory($categoryObj, $level = 0) -{ - $publisher = PublisherPublisher::getInstance(); - - $description = $categoryObj->description(); - if (!XOOPS_USE_MULTIBYTES) { - if (strlen($description) >= 100) { - $description = substr($description, 0, (100 - 1)) . "..."; - } - } - $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "&parentid=" . $categoryObj->parentid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "' /></a>"; - $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>"; - - $spaces = ''; - for ($j = 0; $j < $level; $j++) { - $spaces .= ' '; - } - - echo "<tr>"; - echo "<td class='even' align='center'>" . $categoryObj->categoryid() . "</td>"; - echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . "/category.php?categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/assets/images/links/subcat.gif' alt='' /> " . $categoryObj->name() . "</a></td>"; - echo "<td class='even' align='center'>" . $categoryObj->weight() . "</td>"; - echo "<td class='even' align='center'> $modify $delete </td>"; - echo "</tr>"; - $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid()); - if (count($subCategoriesObj) > 0) { - $level++; - foreach ($subCategoriesObj as $key => $thiscat) { - publisher_displayCategory($thiscat, $level); - } - } - unset($categoryObj); -} - -function publisher_editCat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryObj = null) -{ - $publisher = PublisherPublisher::getInstance(); - - // if there is a parameter, and the id exists, retrieve data: we're editing a category - if ($categoryid != 0) { - // Creating the category object for the selected category - $categoryObj = $publisher->getHandler('category')->get($categoryid); - if ($categoryObj->notLoaded()) { - redirect_header("category.php", 1, _AM_PUBLISHER_NOCOLTOEDIT); - exit(); - } - } else { - if (!$categoryObj) { - $categoryObj = $publisher->getHandler('category')->create(); - } - } - - if ($categoryid != 0) { - if ($showmenu) { - //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_EDITING); - } - echo "<br />\n"; - publisher_openCollapsableBar('edittable', 'edittableicon', _AM_PUBLISHER_EDITCOL, _AM_PUBLISHER_CATEGORY_EDIT_INFO); - } else { - if ($showmenu) { - //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_CREATINGNEW); - } - publisher_openCollapsableBar('createtable', 'createtableicon', _AM_PUBLISHER_CATEGORY_CREATE, _AM_PUBLISHER_CATEGORY_CREATE_INFO); - } - - $sform = $categoryObj->getForm($nb_subcats); - $sform->display(); - - if (!$categoryid) { - publisher_closeCollapsableBar('createtable', 'createtableicon'); - } else { - publisher_closeCollapsableBar('edittable', 'edittableicon'); - } - - //Added by fx2024 - if ($categoryid) { - $sel_cat = $categoryid; - - publisher_openCollapsableBar('subcatstable', 'subcatsicon', _AM_PUBLISHER_SUBCAT_CAT, _AM_PUBLISHER_SUBCAT_CAT_DSC); - // Get the total number of sub-categories - $categoriesObj = $publisher->getHandler('category')->get($sel_cat); - $totalsubs = $publisher->getHandler('category')->getCategoriesCount($sel_cat); - // creating the categories objects that are published - $subcatsObj = $publisher->getHandler('category')->getCategories(0, 0, $categoriesObj->categoryid()); - $totalSCOnPage = count($subcatsObj); - echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; - echo "<tr>"; - echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . "</strong></td>"; - echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . "</strong></td>"; - echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . "</strong></td>"; - echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>"; - echo "</tr>"; - if ($totalsubs > 0) { - foreach ($subcatsObj as $subcat) { - $modify = "<a href='category.php?op=mod&categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_MODIFY . "' alt='" . _AM_PUBLISHER_MODIFY . "' /></a>"; - $delete = "<a href='category.php?op=del&categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETE . "' alt='" . _AM_PUBLISHER_DELETE . "' /></a>"; - echo "<tr>"; - echo "<td class='head' align='left'>" . $subcat->categoryid() . "</td>"; - echo "<td class='even' align='left'><a href='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/category.php?categoryid=" . $subcat->categoryid() . "&parentid=" . $subcat->parentid() . "'>" . $subcat->name() . "</a></td>"; - echo "<td class='even' align='left'>" . $subcat->description() . "</td>"; - echo "<td class='even' align='right'> {$modify} {$delete} </td>"; - echo "</tr>"; - } - } else { - echo "<tr>"; - echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . "</td>"; - echo "</tr>"; - } - echo "</table>\n"; - echo "<br />\n"; - publisher_closeCollapsableBar('subcatstable', 'subcatsicon'); - - publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC); - $startitem = PublisherRequest::getInt('startitem'); - // Get the total number of published ITEMS - $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(_PUBLISHER_STATUS_PUBLISHED)); - // creating the items objects that are published - $itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $sel_cat); - $totalitemsOnPage = count($itemsObj); - $allcats = $publisher->getHandler('category')->getObjects(null, true); - echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; - echo "<tr>"; - echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>"; - echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . "</strong></td>"; - echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . "</strong></td>"; - echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>"; - echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>"; - echo "</tr>"; - if ($totalitems > 0) { - for ($i = 0; $i < $totalitemsOnPage; ++$i) { - $categoryObj = $allcats[$itemsObj[$i]->categoryid()]; - $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>"; - $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>"; - echo "<tr>"; - echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>"; - echo "<td class='even' align='left'>" . $categoryObj->name() . "</td>"; - echo "<td class='even' align='left'>" . $itemsObj[$i]->getitemLink() . "</td>"; - echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub('s') . "</td>"; - echo "<td class='even' align='center'> $modify $delete </td>"; - echo "</tr>"; - } - } else { - $itemid = -1; - echo "<tr>"; - echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>"; - echo "</tr>"; - } - echo "</table>\n"; - echo "<br />\n"; - $parentid = PublisherRequest::getInt('parentid'); - $pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid"; - xoops_load('XoopsPageNav'); - $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args); - echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>'; - echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'> "; - echo "</div>"; - } - //end of fx2024 code -} Modified: XoopsModules/publisher/trunk/publisher/admin/clone.php =================================================================== --- XoopsModules/publisher/trunk/publisher/admin/clone.php 2015-05-25 21:36:01 UTC (rev 13068) +++ XoopsModules/publisher/trunk/publisher/admin/clone.php 2015-05-26 09:32:35 UTC (rev 13069) @@ -18,45 +18,45 @@ * @version $Id$ */ -include_once dirname(__FILE__) . "/admin_header.php"; +include_once __DIR__ . "/admin_header.php"; -publisher_cpHeader(); +publisherCpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_CLONE); -publisher_openCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC); +publisherOpenCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC); -if (@$_POST['op'] == 'submit') { - +if ('submit' == XoopsRequest::getString('op', '', 'POST')) { if (!$GLOBALS['xoopsSecurity']->check()) { redirect_header('clone.php', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); - exit(); +// exit(); } - $clone = $_POST['clone']; +// $clone = $_POST['clone']; + $clone = XoopsRequest::getString('clone', '', 'POST'); //check if name is valid if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) { redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_INVALIDNAME, $clone)); - exit(); +// exit(); } // Check wether the cloned module exists or not - if ($clone && is_dir(XOOPS_ROOT_PATH . '/modules/' . $clone)) { + if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) { redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_EXISTS, $clone)); } $patterns = array( - strtolower(PUBLISHER_DIRNAME) => strtolower($clone), - strtoupper(PUBLISHER_DIRNAME) => strtoupper($clone), + strtolower(PUBLISHER_DIRNAME) => strtolower($clone), + strtoupper(PUBLISHER_DIRNAME) => strtoupper($clone), ucfirst(strtolower(PUBLISHER_DIRNAME)) => ucfirst(strtolower($clone)) ); - $patKeys = array_keys($patterns); + $patKeys = array_keys($patterns); $patValues = array_values($patterns); - publisher_cloneFileFolder(PUBLISHER_ROOT_PATH); - $logocreated = publisher_createLogo(strtolower($clone)); + PublisherClone::cloneFileFolder(PUBLISHER_ROOT_PATH); + $logocreated = PublisherClone::createLogo(strtolower($clone)); $msg = ""; - if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($clone))) { + if (is_dir($GLOBALS['xoops']->path('modules/' . strtolower($clone)))) { $msg .= sprintf(_AM_PUBLISHER_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(strtolower($clone)) . "</a>") . "<br />\n"; if (!$logocreated) { $msg .= _AM_PUBLISHER_CLONE_IMAGEFAIL; @@ -67,8 +67,8 @@ echo $msg; } else { - include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; - $form = new XoopsThemeForm(sprintf(_AM_PUBLISHER_CLONE_TITLE, $publisher->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true); + include_once $GLOBALS['xoops']->path('class/xoopsformloader.php'); + $form = new XoopsThemeForm(sprintf(_AM_PUBLISHER_CLONE_TITLE, $publisher->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true); $clone = new XoopsFormText(_AM_PUBLISHER_CLONE_NAME, 'clone', 20, 20, ''); $clone->setDescription(_AM_PUBLISHER_CLONE_NAME_DSC); $form->addElement($clone, true); @@ -78,89 +78,106 @@ } // End of collapsable bar -publisher_closeCollapsableBar('clone', 'cloneicon'); +publisherCloseCollapsableBar('clone', 'cloneicon'); xoops_cp_footer(); // work around for PHP < 5.0.x +/* if (!function_exists('file_put_contents')) { function file_put_contents($filename, $data, $file_append = false) { - if ($fp = fopen($filename, (!$file_append ? 'w+' : 'a+'))) { + if ($fp == fopen($filename, (!$file_append ? 'w+' : 'a+'))) { fputs($fp, $data); fclose($fp); } } } +*/ +/** + * Class PublisherClone + */ +class PublisherClone +{ + // recursive clonning script -function publisher_cloneFileFolder($path) -{ + /** + * @param $path + */ + public static function cloneFileFolder($path) + { global $patKeys; global $patValues; - $newPath = str_replace($patKeys[0], $patValues[0], $path); + $newPath = str_replace($patKeys[0], $patValues[0], $path); - if (is_dir($path)) { - // create new dir - mkdir($newPath); + if (is_dir($path)) { + // create new dir + mkdir($newPath); - // check all files in dir, and process it - if ($handle = opendir($path)) { - while ($file = readdir($handle)) { - if ($file != '.' && $file != '..' && $file != '.svn') { - publisher_cloneFileFolder("{$path}/{$file}"); + // check all files in dir, and process it + if ($handle == opendir($path)) { + while (($file = readdir($handle)) !== false) { + if ($file != '.' && $file != '..' && $file != '.svn') { + self::cloneFileFolder("{$path}/{$file}"); + } } + closedir($handle); } - closedir($handle); - } - } else { - - if (preg_match('/(.jpg|.gif|.png|.zip)$/i', $path)) { - // image - copy($path, $newPath); } else { - // file, read it - $content = file_get_contents($path); - $content = str_replace($patKeys, $patValues, $content); - file_put_contents($newPath, $content); + if (preg_match('/(.jpg|.gif|.png|.zip)$/i', $path)) { + // image + copy($path, $newPath); + } else { + // file, read it + $content = file_get_contents($path); + $content = str_replace($patKeys, $patValues, $content); + file_put_contents($newPath, $content); + } } } -} -function publisher_createLogo($dirname) -{ - if (!extension_loaded("gd")) { - return false; - } else { - $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox"); - foreach ($required_functions as $func) { - if (!function_exists($func)) { - return false; + /** + * @param $dirname + * + * @return bool + */ + public static function createLogo($dirname) + { + if (!extension_loaded("gd")) { + return false; + } else { + $required_functions = array("imagecreatetruecolor", "imagecolorallocate", "imagefilledrectangle", "imagejpeg", "imagedestroy", "imageftbbox"); + foreach ($required_functions as $func) { + if (!function_exists($func)) { + return false; + } } + unset($func); } - } - if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png") || !file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/VeraBd.ttf")) { - return false; - } + if (!file_exists($imageBase = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png")) || !file_exists($font = $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/VeraBd.ttf"))) { + return false; + } - $imageModule = imagecreatefrompng($imageBase); + $imageModule = imagecreatefrompng($imageBase); - //Erase old text - $grey_color = imagecolorallocate($imageModule, 237, 237, 237); - imagefilledrectangle($imageModule, 5, 35, 85, 46, $grey_color); + //Erase old text + $grey_color = imagecolorallocate($imageModule, 237, 237, 237); + imagefilledrectangle($imageModule, 5, 35, 85, 46, $grey_color); - // Write text - $text_color = imagecolorallocate($imageModule, 0, 0, 0); - $space_to_border = (80 - strlen($dirname) * 6.5) / 2; - imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($dirname), array()); + // Write text + $text_color = imagecolorallocate($imageModule, 0, 0, 0); + $space_to_border = (80 - strlen($dirname) * 6.5) / 2; + imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $text_color, $font, ucfirst($dirname), array()); - // Set transparency color - $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127); - imagefill($imageModule, 0, 0, $white); - imagecolortransparent($imageModule, $white); - imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/module_logo.png"); - imagedestroy($imageModule); + // Set transparency color + $white = imagecolorallocatealpha($imageModule, 255, 255, 255, 127); + imagefill($imageModule, 0, 0, $white); + imagecolortransparent($imageModule, $white); + imagepng($imageModule, $GLOBALS['xoops']->path("modules/" . $dirname . "/assets/images/module_logo.png")); + imagedestroy($imageModule); - return true; + return true; + } } Modified: XoopsModules/publisher/trunk/publisher/admin/file.php =================================================================== --- XoopsModules/publisher/trunk/publisher/admin/file.php 2015-05-25 21:36:01 UTC (rev 13068) +++ XoopsModules/publisher/trunk/publisher/admin/file.php 2015-05-26 09:32:35 UTC (rev 13069) @@ -19,24 +19,28 @@ * @version $Id$ */ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; -$op = PublisherRequest::getString('op'); +$op = XoopsRequest::getString('op'); +/** + * @param bool $showmenu + * @param int $fileid + * @param int $itemid + */ function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0) { $publisher = PublisherPublisher::getInstance(); - include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; + include_once $GLOBALS['xoops']->path('class/xoopsformloader.php'); // if there is a parameter, and the id exists, retrieve data: we're editing a file if ($fileid != 0) { - // Creating the File object $fileObj = $publisher->getHandler('file')->get($fileid); if ($fileObj->notLoaded()) { redirect_header("javascript:history.go(-1)", 1, _AM_PUBLISHER_NOFILESELECTED); - exit(); +// exit(); } if ($showmenu) { @@ -44,9 +48,9 @@ } echo "<br />\n"; - echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>"; + echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>"; echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_EDITING_DSC . "</span>"; - publisher_openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS); + publisherOpenCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS); } else { // there's no parameter, so we're adding an item $fileObj = $publisher->getHandler('file')->create(); @@ -54,9 +58,9 @@ if ($showmenu) { //publisher_adminMenu(2, _AM_PUBLISHER_FILE . " > " . _AM_PUBLISHER_FILE_ADD); } - echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>"; + echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>"; echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_ADDING_DSC . "</span>"; - publisher_openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS); + publisherOpenCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS); } // FILES UPLOAD FORM @@ -64,9 +68,9 @@ $files_form->display(); if ($fileid != 0) { - publisher_closeCollapsableBar('editfile', 'editfileicon'); + publisherCloseCollapsableBar('editfile', 'editfileicon'); } else { - publisher_closeCollapsableBar('addfile', 'addfileicon'); + publisherCloseCollapsableBar('addfile', 'addfileicon'); } } @@ -75,31 +79,31 @@ /* -- Available operations -- */ switch ($op) { case "uploadfile"; - publisher_uploadFile(false, true, $false); + publisherUploadFile(false, true, $false); exit; break; case "uploadanother"; - publisher_uploadFile(true, true, $false); + publisherUploadFile(true, true, $false); exit; break; case "mod": - $fileid = isset($_GET['fileid']) ? $_GET['fileid'] : 0; - $itemid = isset($_GET['itemid']) ? $_GET['itemid'] : 0; + $fileid = XoopsRequest::getInt('fileid', 0, 'GET'); + $itemid = XoopsRequest::getInt('itemid', 0, 'GET'); if (($fileid == 0) && ($itemid == 0)) { redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_NOITEMSELECTED); - exit(); +// exit(); } - publisher_cpHeader(); - include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; + publisherCpHeader(); + include_once $GLOBALS['xoops']->path('class/xoopsformloader.php'); publisher_editFile(true, $fileid, $itemid); break; case "modify": - $fileid = isset($_POST['fileid']) ? intval($_POST['fileid']) : 0; + $fileid = XoopsRequest::getInt('fileid', 0, 'POST'); // Creating the file object if ($fileid != 0) { @@ -109,43 +113,43 @@ } // Putting the values in the file object - $fileObj->setVar('name', $_POST['name']); - $fileObj->setVar('description', $_POST['description']); - $fileObj->setVar('status', intval($_POST['file_status'])); + $fileObj->setVar('name', XoopsRequest::getString('name', '', 'POST')); + $fileObj->setVar('description', XoopsRequest::getString('description', '', 'POST')); + $fileObj->setVar('status', XoopsRequest::getInt('status', 0, 'POST')); // Storing the file if (!$fileObj->store()) { - redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . publisher_formatErrors($fileObj->getErrors())); - exit; + redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 3, _AM_PUBLISHER_FILE_EDITING_ERROR . publisherFormatErrors($fileObj->getErrors())); +// exit; } redirect_header('item.php?op=mod&itemid=' . $fileObj->itemid(), 2, _AM_PUBLISHER_FILE_EDITING_SUCCESS); - exit(); +// exit(); break; case "del": - $fileid = isset($_POST['fileid']) ? intval($_POST['fileid']) : 0; - $fileid = isset($_GET['fileid']) ? intval($_GET['fileid']) : $fileid; + $fileid = XoopsRequest::getInt('fileid', 0, 'POST'); + $fileid = XoopsRequest::getInt('fileid', $fileid, 'GET'); $fileObj = $publisher->getHandler('file')->get($fileid); - $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0; - $title = isset($_POST['title']) ? $_POST['title'] : ''; + $confirm = XoopsRequest::getInt('confirm', 0, 'POST'); + $title = XoopsRequest::getString('title', '', 'POST'); if ($confirm) { if (!$publisher->getHandler('file')->delete($fileObj)) { redirect_header('item.php', 2, _AM_PUBLISHER_FILE_DELETE_ERROR); - exit; +// exit; } redirect_header('item.php', 2, sprintf(_AM_PUBLISHER_FILEISDELETED, $fileObj->name())); - exit(); +// exit(); } else { // no confirm: show deletion condition - $fileid = isset($_GET['fileid']) ? intval($_GET['fileid']) : 0; + $fileid = XoopsRequest::getInt('fileid', 0, 'GET'); - publisher_cpHeader(); + publisherCpHeader(); xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php', _AM_PUBLISHER_DELETETHISFILE . " <br />" . $fileObj->name() . " <br /> <br />", _AM_PUBLISHER_DELETE); xoops_cp_footer(); } @@ -155,7 +159,7 @@ case "default": default: - publisher_cpHeader(); + publisherCpHeader(); //publisher_adminMenu(2, _AM_PUBLISHER_ITEMS); break; } Modified: XoopsModules/publisher/trunk/publisher/admin/import/ams.php =================================================================== --- XoopsModules/publisher/trunk/publisher/admin/import/ams.php 2015-05-25 21:36:01 UTC (rev 13068) +++ XoopsModules/publisher/trunk/publisher/admin/import/ams.php 2015-05-26 09:32:35 UTC (rev 13069) @@ -20,52 +20,32 @@ * @version $Id$ */ -include_once dirname(dirname(__FILE__)) . '/admin_header.php'; +include_once dirname(__DIR__) . '/admin_header.php'; $myts = MyTextSanitizer::getInstance(); -$importFromModuleName = "xNews " . @$_POST['ams_version']; +$importFromModuleName = "xNews " . XoopsRequest::getString('ams_version', '', 'POST'); $scriptname = "ams.php"; -$op = 'start'; +$op = ('go' == XoopsRequest::getString('op', '', 'POST')) ? 'go' : 'start'; -if (isset($_POST['op']) && ($_POST['op'] == 'go')) { - $op = $_POST['op']; -} - -function recurse_copy($src,$dst) -{ - $dir = opendir($src); -// @mkdir($dst); - while (false !== ( $file = readdir($dir)) ) { - if (( $file != '.' ) && ( $file != '..' )) { - if ( is_dir($src . '/' . $file) ) { - recurse_copy($src . '/' . $file,$dst . '/' . $file); - } else { - copy($src . '/' . $file,$dst . '/' . $file); - } - } - } - closedir($dir); -} - if ($op == 'start') { xoops_load('XoopsFormLoader'); - publisher_cpHeader(); + publisherCpHeader(); //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT); - publisher_openCollapsableBar('amsimport', 'amsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO); + publisherOpenCollapsableBar('amsimport', 'amsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO); - $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("ams_topics")); - list ($totalCat) = $xoopsDB->fetchRow($result); + $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM " . $GLOBALS['xoopsDB']->prefix("ams_topics")); + list ($totalCat) = $GLOBALS['xoopsDB']->fetchRow($result); if ($totalCat == 0) { echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>"; } else { - include_once XOOPS_ROOT_PATH . '/class/xoopstree.php'; + include_once $GLOBALS['xoops']->path('class/xoopstree.php'); - $result = $xoopsDB->query... [truncated message content] |
From: <txm...@us...> - 2015-05-25 21:36:03
|
Revision: 13068 http://sourceforge.net/p/xoops/svn/13068 Author: txmodxoops Date: 2015-05-25 21:36:01 +0000 (Mon, 25 May 2015) Log Message: ----------- - Fix url logo - Fix language groups - Fix array file notifications Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageModinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 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-25 20:22:35 UTC (rev 13067) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-25 21:36:01 UTC (rev 13068) @@ -116,17 +116,17 @@ $this->structure->makeDirAndCopyFile('class', $indexFile, 'index.html'); // Creation of "assets" folder and index.html file $this->structure->makeDirAndCopyFile('assets', $indexFile, 'index.html'); - // Creation of "css" folder and index.html file + // Creation of "assets/css" folder and index.html file $this->structure->makeDirAndCopyFile('assets/css', $indexFile, 'index.html'); - // Creation of "icons" folder and index.html file + // Creation of "assets/icons" folder and index.html file $this->structure->makeDirAndCopyFile('assets/icons', $indexFile, 'index.html'); - // Creation of "images/icons/16" folder and index.html file + // Creation of "assets/icons/16" folder and index.html file $this->structure->makeDirAndCopyFile('assets/icons/16', $indexFile, 'index.html'); - // Creation of "images/icons/32" folder and index.html file + // Creation of "assets/icons/32" folder and index.html file $this->structure->makeDirAndCopyFile('assets/icons/32', $indexFile, 'index.html'); - // Creation of "images" folder and index.html file + // Creation of "assets/images" folder and index.html file $this->structure->makeDirAndCopyFile('assets/images', $indexFile, 'index.html'); - // Creation of "images" folder and index.html file + // Creation of "assets/js" folder and index.html file $this->structure->makeDirAndCopyFile('assets/js', $indexFile, 'index.html'); //Copy the logo of the module $modImage = str_replace(' ', '', strtolower($module->getVar('mod_image'))); @@ -136,12 +136,12 @@ // If file exists if (!file_exists($logoGifFrom)) { // Rename file - $copyFile = TDMC_IMAGE_LOGOS_PATH . '/xoopsdevelopmentteam_logo.gif'; + $copyFile = TDMC_IMAGE_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif'; $copyNewFile = $logoGifFrom; copy($copyFile, $copyNewFile); } else { // Copy file - $copyFile = TDMC_IMAGE_LOGOS_PATH . '/' . $stlModuleAuthor . '_logo.gif'; + $copyFile = TDMC_IMAGE_LOGOS_URL . '/' . $stlModuleAuthor . '_logo.gif'; $copyNewFile = $logoGifFrom; copy($copyFile, $copyNewFile); } 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-25 20:22:35 UTC (rev 13067) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageModinfo.php 2015-05-25 21:36:01 UTC (rev 13068) @@ -138,8 +138,8 @@ private function getLanguageAdmin($language) { $ret = $this->defines->getAboveHeadDefines('Admin Nav'); - $ret .= $this->defines->getDefine($language, "ADMINPAGER", "Admin pager"); - $ret .= $this->defines->getDefine($language, "ADMINPAGER_DESC", "Admin per page list"); + $ret .= $this->defines->getDefine($language, "ADMIN_PAGER", "Admin pager"); + $ret .= $this->defines->getDefine($language, "ADMIN_PAGER_DESC", "Admin per page list"); return $ret; } @@ -206,8 +206,8 @@ private function getLanguageUser($language) { $ret = $this->defines->getAboveDefines('User'); - $ret .= $this->defines->getDefine($language, "USERPAGER", "User pager"); - $ret .= $this->defines->getDefine($language, "USERPAGER_DESC", "User per page list"); + $ret .= $this->defines->getDefine($language, "USER_PAGER", "User pager"); + $ret .= $this->defines->getDefine($language, "USER_PAGER_DESC", "User per page list"); return $ret; } @@ -232,6 +232,12 @@ $ret .= $this->defines->getDefine($language, "KEYWORDS", "Keywords"); $ret .= $this->defines->getDefine($language, "KEYWORDS_DESC", "Insert here the keywords (separate by comma)"); if (is_object($table)) { + /*if ($table->getVar('table_permissions') != 0) { + $ret .= $this->defines->getDefine($language, "GROUPS", "Groups"); + $ret .= $this->defines->getDefine($language, "GROUPS_DESC", "Groups to have permissions"); + $ret .= $this->defines->getDefine($language, "ADMIN_GROUPS", "Admin Groups"); + $ret .= $this->defines->getDefine($language, "ADMIN_GROUPS_DESC", "Admin Groups to have permissions access"); + }*/ if ($table->getVar('table_image') != '') { $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size"); $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte"); @@ -310,20 +316,20 @@ } /* - * @private function getLanguagePermissions + * @private function getLanguagePermissionsGroups * @param string $language */ /** * @param $language * @return string */ - private function getLanguagePermissions($language) + private function getLanguagePermissionsGroups($language) { $ret = $this->defines->getAboveDefines('Permissions Groups'); $ret .= $this->defines->getDefine($language, "GROUPS", "Groups access"); $ret .= $this->defines->getDefine($language, "GROUPS_DESC", "Select general access permission for groups."); - $ret .= $this->defines->getDefine($language, "ADMINGROUPS", "Admin Group Permissions"); - $ret .= $this->defines->getDefine($language, "ADMINGROUPS_DESC", "Which groups have access to tools and permissions page"); + $ret .= $this->defines->getDefine($language, "ADMIN_GROUPS", "Admin Group Permissions"); + $ret .= $this->defines->getDefine($language, "ADMIN_GROUPS_DESC", "Which groups have access to tools and permissions page"); return $ret; } @@ -378,7 +384,7 @@ $content .= $this->getLanguageNotifications($language); } if (1 == $table->getVar('table_permissions')) { - $content .= $this->getLanguagePermissions($language); + $content .= $this->getLanguagePermissionsGroups($language); } } $content .= $this->getLanguageFooter(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-25 20:22:35 UTC (rev 13067) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-25 21:36:01 UTC (rev 13068) @@ -496,7 +496,7 @@ } } } - if (1 == $module->getVar('mod_permissions') && 1 == $table->getVar('table_permissions')) { + if (1 == $table->getVar('table_permissions')) { $ret .= <<<EOT // Get groups \$memberHandler =& xoops_gethandler('member'); @@ -523,8 +523,8 @@ } \$modversion['config'][] = array( 'name' => "admin_groups", - 'title' => "{$language}ADMINGROUPS", - 'description' => "{$language}ADMINGROUPS_DESC", + 'title' => "{$language}ADMIN_GROUPS", + 'description' => "{$language}ADMIN_GROUPS_DESC", 'formtype' => "select_multi", 'valuetype' => "array", 'options' => \$admin_groups, @@ -576,8 +576,8 @@ $ret .= <<<EOT \$modversion['config'][] = array( 'name' => "adminpager", - 'title' => "{$language}ADMINPAGER", - 'description' => "{$language}ADMINPAGER_DESC", + 'title' => "{$language}ADMIN_PAGER", + 'description' => "{$language}ADMIN_PAGER_DESC", 'formtype' => "textbox", 'valuetype' => "int", 'default' => 10);\n\n @@ -587,8 +587,8 @@ $ret .= <<<EOT \$modversion['config'][] = array( 'name' => "userpager", - 'title' => "{$language}USERPAGER", - 'description' => "{$language}USERPAGER_DESC", + 'title' => "{$language}USER_PAGER", + 'description' => "{$language}USER_PAGER_DESC", 'formtype' => "textbox", 'valuetype' => "int", 'default' => 10);\n\n @@ -644,12 +644,12 @@ * @param $typeOfNotify */ /** - * @param $language + * @param $language * @param $type - * @param $tableName - * @param $notifyFile - * @param $item - * @param $typeOfNotify + * @param $tableName + * @param $notifyFile + * @param $item + * @param $typeOfNotify * @return string */ private function getTypeNotifications($language, $type = 'category', $tableName, $notifyFile, $item, $typeOfNotify) @@ -699,7 +699,7 @@ */ private function getXoopsVersionNotifications($moduleDirname, $tables, $language, $filename) { - $notifyFiles = array(); + $notifyFiles = ''; $single = 'single'; foreach (array_keys($tables) as $t) { $tableId = $tables[$t]->getVar('table_id'); @@ -713,7 +713,7 @@ if ($t <= count($tableName)) { /*$notifyFiles[] = "'" . $tableName . ".php', "; } else {*/ - $notifyFiles[] = "'" . $tableName . ".php'"; + $notifyFiles = "'" . $tableName . ".php'"; } } if (1 == $tables[$t]->getVar('table_single')) { @@ -779,6 +779,7 @@ private function getXoopsVersionNotificationCodeShort($language, $type, $name, $title, $from) { $title = strtoupper($title); + $from = explode(', ', $from); $from = implode(', ', $from); $ret = <<<EOT \$modversion['notification']['{$type}'][] = array( |
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'); |
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] |
From: <be...@us...> - 2015-05-23 04:29:29
|
Revision: 13065 http://sourceforge.net/p/xoops/svn/13065 Author: beckmi Date: 2015-05-23 04:29:24 +0000 (Sat, 23 May 2015) Log Message: ----------- Updating jQuery to 1.11.3, UI to 1.11.4 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_50_3baae3_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_72a7cf_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_217bc0_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_469bdd_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_d8e7f3_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/ui-icons_f9bd01_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_95_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_25_67b021_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_808080_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_847e71_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_8dc262_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_eeeeee_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_20_555555_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_4b8e0b_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_a83300_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_cccccc_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_228ef1_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/jquery.js XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.ui.js Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.structure.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/theme.css Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.all.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.base.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.button.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.core.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.datepicker.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.dialog.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.menu.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.progressbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.resizable.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.selectable.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.slider.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.spinner.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.tabs.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery.ui.tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.accordion.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.autocomplete.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.button.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.core.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.datepicker.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.dialog.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.menu.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.progressbar.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.resizable.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.selectable.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.slider.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.spinner.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.tabs.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery.ui.tooltip.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/cupertino/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/redmond/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/smoothness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/south-street/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-darkness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/ui-lightness/jquery.ui.theme.css Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-05-23 04:29:24 UTC (rev 13065) @@ -27,6 +27,8 @@ Updated: - TinyMCE to 3.5.11 (mamba) - PHPMailer to 5.2.9 (rgriffith) + - jQuery to 1.11.3 (mamba) + - jQuery UI 1.11.4 (mamba) =============================== Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/animated-overlay.gif =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_18_b81900_40x40.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_diagonals-thick_20_666666_40x40.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_10_000000_40x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_flat_75_ffffff_40x100.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_f6f6f6_1x400.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_100_fdf5ce_1x400.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png =================================================================== (Binary files differ) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_65_ffffff_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_dadada_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_glass_95_fef1ec_1x400.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_gloss-wave_35_f6a828_500x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_100_eeeeee_1x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_ffe45c_1x100.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_222222_256x240.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_228ef1_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_2e83ff_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_454545_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_888888_256x240.png =================================================================== (Binary files differ) Deleted: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_cd0a0a_256x240.png =================================================================== (Binary files differ) Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ef8c08_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffd27a_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png =================================================================== (Binary files differ) Index: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png 2015-05-23 04:29:24 UTC (rev 13065) Property changes on: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/images/ui-icons_ffffff_256x240.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css 2015-05-19 18:10:46 UTC (rev 13064) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css 2015-05-23 04:29:24 UTC (rev 13065) @@ -1,7 +1,9 @@ -/*! jQuery UI - v1.10.4 - 2014-01-17 +/*! jQuery UI - v1.11.4 - 2015-05-23 * http://jqueryui.com -* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css -* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */ +* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ + /* Layout helpers ----------------------------------*/ .ui-helper-hidden { @@ -46,7 +48,7 @@ left: 0; position: absolute; opacity: 0; - filter:Alpha(Opacity=0); + filter:Alpha(Opacity=0); /* support: IE8 */ } .ui-front { @@ -84,21 +86,105 @@ width: 100%; height: 100%; } - +.ui-draggable-handle { + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} +.ui-selectable { + -ms-touch-action: none; + touch-action: none; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} +.ui-sortable-handle { + -ms-touch-action: none; + touch-action: none; +} .ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; - margin-top: 2px; + margin: 2px 0 0 0; padding: .5em .5em .5em .7em; min-height: 0; /* support: IE7 */ + font-size: 100%; } .ui-accordion .ui-accordion-icons { padding-left: 2.2em; } -.ui-accordion .ui-accordion-noicons { - padding-left: .7em; -} .ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; } @@ -113,14 +199,12 @@ border-top: 0; overflow: auto; } - .ui-autocomplete { position: absolute; top: 0; left: 0; cursor: default; } - .ui-button { display: inline-block; position: relative; @@ -225,7 +309,6 @@ border: 0; padding: 0; } - .ui-datepicker { width: 17em; padding: .2em .2em 0; @@ -278,7 +361,7 @@ } .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year { - width: 49%; + width: 45%; } .ui-datepicker table { width: 100%; @@ -391,7 +474,6 @@ border-right-width: 0; border-left-width: 1px; } - .ui-dialog { overflow: hidden; position: absolute; @@ -452,77 +534,59 @@ .ui-draggable .ui-dialog-titlebar { cursor: move; } - .ui-menu { list-style: none; - padding: 2px; + padding: 0; margin: 0; display: block; outline: none; } .ui-menu .ui-menu { - margin-top: -3px; position: absolute; } .ui-menu .ui-menu-item { + position: relative; margin: 0; - padding: 0; - width: 100%; + padding: 3px 1em 3px .4em; + cursor: pointer; + min-height: 0; /* support: IE7 */ /* support: IE10, see #8844 */ - list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7); + list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"); } .ui-menu .ui-menu-divider { - margin: 5px -2px 5px -2px; + margin: 5px 0; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; } -.ui-menu .ui-menu-item a { - text-decoration: none; - display: block; - padding: 2px .4em; - line-height: 1.5; - min-height: 0; /* support: IE7 */ - font-weight: normal; -} -.ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; +.ui-menu .ui-state-focus, +.ui-menu .ui-state-active { margin: -1px; } -.ui-menu .ui-state-disabled { - font-weight: normal; - margin: .4em 0 .2em; - line-height: 1.5; -} -.ui-menu .ui-state-disabled a { - cursor: default; -} - /* icon support */ .ui-menu-icons { position: relative; } -.ui-menu-icons .ui-menu-item a { - position: relative; +.ui-menu-icons .ui-menu-item { padding-left: 2em; } /* left-aligned */ .ui-menu .ui-icon { position: absolute; - top: .2em; + top: 0; + bottom: 0; left: .2em; + margin: auto 0; } /* right-aligned */ .ui-menu .ui-menu-icon { - position: static; - float: right; + left: auto; + right: 0; } - .ui-progressbar { height: 2em; text-align: left; @@ -533,90 +597,63 @@ height: 100%; } .ui-progressbar .ui-progressbar-overlay { - background: url("images/animated-overlay.gif"); + background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw=="); height: 100%; - filter: alpha(opacity=25); + filter: alpha(opacity=25); /* support: IE8 */ opacity: 0.25; } .ui-progressbar-indeterminate .ui-progressbar-value { background-image: none; } - -.ui-resizable { - position: relative; -} -.ui-resizable-handle { +.ui-selectmenu-menu { + padding: 0; + margin: 0; position: absolute; - font-size: 0.1px; - display: block; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { + top: 0; + left: 0; display: none; } -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; +.ui-selectmenu-menu .ui-menu { + overflow: auto; + /* Support: IE7 */ + overflow-x: hidden; + padding-bottom: 1px; } -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; +.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup { + font-size: 1em; + font-weight: bold; + line-height: 1.5; + padding: 2px 0.4em; + margin: 0.5em 0 0 0; + height: auto; + border: 0; } -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; +.ui-selectmenu-open { + display: block; } -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; +.ui-selectmenu-button { + display: inline-block; + overflow: hidden; + position: relative; + text-decoration: none; + cursor: pointer; } -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; +.ui-selectmenu-button span.ui-icon { + right: 0.5em; + left: auto; + margin-top: -8px; + position: absolute; + top: 50%; } -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; +.ui-selectmenu-button span.ui-selectmenu-text { + text-align: left; + padding: 0.4em 2.1em 0.4em 1em; + display: block; + line-height: 1.4; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} - -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} - .ui-slider { position: relative; text-align: left; @@ -627,6 +664,8 @@ width: 1.2em; height: 1.2em; cursor: default; + -ms-touch-action: none; + touch-action: none; } .ui-slider .ui-slider-range { position: absolute; @@ -637,7 +676,7 @@ background-position: 0 0; } -/* For IE8 - See #6727 */ +/* support: IE8 - See #6727 */ .ui-slider.ui-state-disabled .ui-slider-handle, .ui-slider.ui-state-disabled .ui-slider-range { filter: inherit; @@ -680,7 +719,6 @@ .ui-slider-vertical .ui-slider-range-max { top: 0; } - .ui-spinner { position: relative; display: inline-block; @@ -736,7 +774,6 @@ /* need to fix icons sprite */ background-position: -65px -16px; } - .ui-tabs { position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ padding: .2em; @@ -778,7 +815,6 @@ padding: 1em 1.4em; background: none; } - .ui-tooltip { padding: 8px; position: absolute; @@ -794,8 +830,8 @@ /* Component containers ----------------------------------*/ .ui-widget { - font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; - font-size: 1.1em/*{fsDefault}*/; + font-family: Verdana,Arial,sans-serif; + font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; @@ -804,25 +840,25 @@ .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; + font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { - border: 1px solid #aaaaaa/*{borderColorContent}*/; - background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; - color: #222222/*{fcContent}*/; + border: 1px solid #aaaaaa; + background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x; + color: #222222; } .ui-widget-content a { - color: #222222/*{fcContent}*/; + color: #222222; } .ui-widget-header { - border: 1px solid #aaaaaa/*{borderColorHeader}*/; - background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; - color: #222222/*{fcHeader}*/; + border: 1px solid #aaaaaa; + background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x; + color: #222222; font-weight: bold; } .ui-widget-header a { - color: #222222/*{fcHeader}*/; + color: #222222; } /* Interaction states @@ -830,15 +866,15 @@ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3/*{borderColorDefault}*/; - background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; - font-weight: normal/*{fwDefault}*/; - color: #555555/*{fcDefault}*/; + border: 1px solid #d3d3d3; + background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x; + font-weight: normal; + color: #555555; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - color: #555555/*{fcDefault}*/; + color: #555555; text-decoration: none; } .ui-state-hover, @@ -847,10 +883,10 @@ .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #999999/*{borderColorHover}*/; - background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; - font-weight: normal/*{fwDefault}*/; - color: #212121/*{fcHover}*/; + border: 1px solid #999999; + background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x; + font-weight: normal; + color: #212121; } .ui-state-hover a, .ui-state-hover a:hover, @@ -860,21 +896,21 @@ .ui-state-focus a:hover, .ui-state-focus a:link, .ui-state-focus a:visited { - color: #212121/*{fcHover}*/; + color: #212121; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa/*{borderColorActive}*/; - background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; - font-weight: normal/*{fwDefault}*/; - color: #212121/*{fcActive}*/; + border: 1px solid #aaaaaa; + background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x; + font-weight: normal; + color: #212121; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #212121/*{fcActive}*/; + color: #212121; text-decoration: none; } @@ -883,31 +919,31 @@ .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1/*{borderColorHighlight}*/; - background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; - color: #363636/*{fcHighlight}*/; + border: 1px solid #fcefa1; + background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; + color: #363636; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a { - color: #363636/*{fcHighlight}*/; + color: #363636; } .ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a/*{borderColorError}*/; - background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; - color: #cd0a0a/*{fcError}*/; + border: 1px solid #cd0a0a; + background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; + color: #cd0a0a; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { - color: #cd0a0a/*{fcError}*/; + color: #cd0a0a; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { - color: #cd0a0a/*{fcError}*/; + color: #cd0a0a; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, @@ -918,18 +954,18 @@ .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; - filter:Alpha(Opacity=70); + filter:Alpha(Opacity=70); /* support: IE8 */ font-weight: normal; } .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; - filter:Alpha(Opacity=35); + filter:Alpha(Opacity=35); /* support: IE8 */ background-image: none; } .ui-state-disabled .ui-icon { - filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ + filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */ } /* Icons @@ -942,27 +978,27 @@ } .ui-icon, .ui-widget-content .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; + background-image: url("images/ui-icons_222222_256x240.png"); } .ui-widget-header .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; + background-image: url("images/ui-icons_222222_256x240.png"); } .ui-state-default .ui-icon { - background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; + background-image: url("images/ui-icons_888888_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; + background-image: url("images/ui-icons_454545_256x240.png"); } .ui-state-active .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; + background-image: url("images/ui-icons_454545_256x240.png"); } .ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; + background-image: url("images/ui-icons_2e83ff_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; + background-image: url("images/ui-icons_cd0a0a_256x240.png"); } /* positioning */ @@ -1152,38 +1188,38 @@ .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-top-left-radius: 4px/*{cornerRadius}*/; + border-top-left-radius: 4px; } .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-top-right-radius: 4px/*{cornerRadius}*/; + border-top-right-radius: 4px; } .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { - border-bottom-left-radius: 4px/*{cornerRadius}*/; + border-bottom-left-radius: 4px; } .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { - border-bottom-right-radius: 4px/*{cornerRadius}*/; + border-bottom-right-radius: 4px; } /* Overlays */ .ui-widget-overlay { - background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; - opacity: .3/*{opacityOverlay}*/; - filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; + background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ } .ui-widget-shadow { - margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; - padding: 8px/*{thicknessShadow}*/; - background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; - opacity: .3/*{opacityShadow}*/; - filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; - border-radius: 8px/*{cornerRadiusShadow}*/; + margin: -8px 0 0 -8px; + padding: 8px; + background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ + border-radius: 8px; } Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css 2015-05-23 04:29:24 UTC (rev 13065) @@ -0,0 +1,833 @@ +/*! + * jQuery UI CSS Framework 1.11.4 + * http://jqueryui.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * http://api.jqueryui.com/category/theming/ + */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); /* support: IE8 */ +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; +} + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden;... [truncated message content] |
From: <txm...@us...> - 2015-05-19 18:10:50
|
Revision: 13064 http://sourceforge.net/p/xoops/svn/13064 Author: txmodxoops Date: 2015-05-19 18:10:46 +0000 (Tue, 19 May 2015) Log Message: ----------- Added settings.php for customized module informazions Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/menu.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/css/admin/style.css XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldattributes.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldelements.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldkey.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldnull.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldtype.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.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/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/docs/changelog.txt XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/docs/credits.txt XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/modinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_building.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields_item.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_tables.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_tables_item.tpl XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/xoops_version.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/32/settings.png XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/index.html XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_settings.tpl Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/fields.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -60,7 +60,7 @@ if ($countTables == 0) { redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES ); } - unset($countTables); + unset($countTables); // Get the list of tables $criteria = new CriteriaCompo(); $criteria->add(new Criteria('table_mid', $handlerTables->getVar('table_mid'))); @@ -160,9 +160,10 @@ if ( !$GLOBALS['xoopsSecurity']->check() ) { redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); } - $fieldId = XoopsRequest::getInt('field_id'); + $fieldId = XoopsRequest::getInt('field_id'); // Fields Handler - $fields = $tdmcreate->getHandler('fields'); + $fields = $tdmcreate->getHandler('fields'); + $fieldOrder = 1; // Set Variables foreach($_POST['field_id'] as $key => $value) { @@ -171,8 +172,7 @@ } else { $fieldsObj =& $fields->create(); } - $fieldOrder = XoopsRequest::getInt('field_order'); - $order = $fieldsObj->isNew() ? $fieldOrder++ : $fieldOrder; + $order = $fieldsObj->isNew() ? $fieldOrder : XoopsRequest::getInt('field_order'); // Set Data $fieldsObj->setVar( 'field_mid', $fieldMid ); $fieldsObj->setVar( 'field_tid', $fieldTid ); @@ -196,7 +196,9 @@ $fieldsObj->setVar( 'field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0); // Insert Data $tdmcreate->getHandler('fields')->insert($fieldsObj); + $fieldOrder++; } + unset($fieldOrder); // Get table name from field table id $tables =& $tdmcreate->getHandler('tables')->get($fieldTid); $tableName = $tables->getVar('table_name'); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/menu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/menu.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/menu.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -29,22 +29,26 @@ $adminmenu[$i]['icon'] = $sysPathIcon32 . '/dashboard.png'; $i++; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU2; +$adminmenu[$i]['link'] = 'admin/settings.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/settings.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU3; $adminmenu[$i]['link'] = 'admin/modules.php'; $adminmenu[$i]['icon'] = 'assets/icons/32/addmodule.png'; $i++; -$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU3; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU4; $adminmenu[$i]['link'] = 'admin/tables.php'; $adminmenu[$i]['icon'] = 'assets/icons/32/addtable.png'; $i++; -$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU4; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU5; $adminmenu[$i]['link'] = 'admin/fields.php'; $adminmenu[$i]['icon'] = 'assets/icons/32/fields.png'; $i++; -$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU5; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6; $adminmenu[$i]['link'] = 'admin/building.php'; $adminmenu[$i]['icon'] = 'assets/icons/32/builder.png'; $i++; -$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU7; $adminmenu[$i]['link'] = 'admin/about.php'; $adminmenu[$i]['icon'] = $sysPathIcon32 . '/about.png'; unset($i); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/modules.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -22,7 +22,7 @@ // Recovered value of argument op in the URL $ $op = XoopsRequest::getString('op', 'list'); // -$mod_id = XoopsRequest::getInt('mod_id'); +$modId = XoopsRequest::getInt('mod_id'); // switch ($op) { case 'list': @@ -98,8 +98,8 @@ if (!$GLOBALS['xoopsSecurity']->check()) { redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); } - if (isset($mod_id)) { - $modulesObj =& $tdmcreate->getHandler('modules')->get($mod_id); + if (isset($modId)) { + $modulesObj =& $tdmcreate->getHandler('modules')->get($modId); } else { $modulesObj =& $tdmcreate->getHandler('modules')->create(); } @@ -184,13 +184,13 @@ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list'); $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); - $modulesObj = $tdmcreate->getHandler('modules')->get($mod_id); + $modulesObj = $tdmcreate->getHandler('modules')->get($modId); $form = $modulesObj->getForm(); $GLOBALS['xoopsTpl']->assign('form', $form->render()); break; case 'delete': - $modulesObj =& $tdmcreate->getHandler('modules')->get($mod_id); + $modulesObj =& $tdmcreate->getHandler('modules')->get($modId); if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) { if (!$GLOBALS['xoopsSecurity']->check()) { redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); @@ -201,12 +201,12 @@ $GLOBALS['xoopsTpl']->assign('error', $modulesObj->getHtmlErrors()); } } else { - xoops_confirm(array('ok' => 1, 'mod_id' => $mod_id, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $modulesObj->getVar('mod_name'))); + xoops_confirm(array('ok' => 1, 'mod_id' => $modId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $modulesObj->getVar('mod_name'))); } break; case 'display': - //if ( $mod_id > 0 ) { + //if ( $modId > 0 ) { $mod_admin = XoopsRequest::getInt('mod_admin'); $mod_user = XoopsRequest::getInt('mod_user'); $mod_blocks = XoopsRequest::getInt('mod_blocks'); @@ -225,7 +225,7 @@ $mod_notifications = tdmcreate_CleanVars($_REQUEST, 'mod_notifications'); $mod_permissions = tdmcreate_CleanVars($_REQUEST, 'mod_permissions'); */ - $modulesObj =& $tdmcreate->getHandler('modules')->get($mod_id); + $modulesObj =& $tdmcreate->getHandler('modules')->get($modId); if (isset($mod_admin)) { $modulesObj->setVar('mod_admin', $mod_admin); } elseif (isset($mod_user)) { Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/settings.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -0,0 +1,100 @@ +<?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.5 + * @author Txmod Xoops <su...@tx...> + * @version $Id: 1.59 settings.php 11297 2013-03-24 10:58:10Z timgno $ + */ +include __DIR__ . '/header.php'; +// Recovered value of argument op in the URL $ +$op = XoopsRequest::getString('op', 'edit'); +// +$modId = XoopsRequest::getInt('set_id'); +// +switch ($op) { + case 'edit': + default: + // Define main template + $template_main = 'tdmcreate_settings.tpl'; + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('settings.php')); + $settingsObj = $tdmcreate->getHandler('settings')->get($modId); + $form = $settingsObj->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'save': + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('settings.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if (isset($modId)) { + $settingsObj =& $tdmcreate->getHandler('settings')->get($modId); + } + $moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['set_dirname'])); + //Form module save + $settingsObj->setVars(array( + 'set_name' => $_POST['set_name'], + 'set_dirname' => $moduleDirname, + 'set_version' => $_POST['set_version'], + 'set_since' => $_POST['set_since'], + 'set_min_php' => $_POST['set_min_php'], + 'set_min_xoops' => $_POST['set_min_xoops'], + 'set_min_admin' => $_POST['set_min_admin'], + 'set_min_mysql' => $_POST['set_min_mysql'], + 'set_description' => $_POST['set_description'], + 'set_author' => $_POST['set_author'], + 'set_author_mail' => $_POST['set_author_mail'], + 'set_author_website_url' => $_POST['set_author_website_url'], + 'set_author_website_name' => $_POST['set_author_website_name'], + 'set_credits' => $_POST['set_credits'], + 'set_license' => $_POST['set_license'], + 'set_release_info' => $_POST['set_release_info'], + 'set_release_file' => $_POST['set_release_file'], + 'set_manual' => $_POST['set_manual'], + 'set_manual_file' => $_POST['set_manual_file'])); + //Form mod_image + $settingsObj->setVar('set_image', $_POST['set_image']); + //Form module save + $settingsObj->setVars(array( + 'set_demo_site_url' => $_POST['set_demo_site_url'], + 'set_demo_site_name' => $_POST['set_demo_site_name'], + 'set_support_url' => $_POST['set_support_url'], + 'set_support_name' => $_POST['set_support_name'], + 'set_website_url' => $_POST['set_website_url'], + 'set_website_name' => $_POST['set_website_name'], + 'set_release' => $_POST['set_release'], + 'set_status' => $_POST['set_status'], + 'set_admin' => ((1 == $_REQUEST['set_admin']) ? 1 : 0), + 'set_user' => ((1 == $_REQUEST['set_user']) ? 1 : 0), + 'set_blocks' => ((1 == $_REQUEST['set_blocks']) ? 1 : 0), + 'set_search' => ((1 == $_REQUEST['set_search']) ? 1 : 0), + 'set_comments' => ((1 == $_REQUEST['set_comments']) ? 1 : 0), + 'set_notifications' => ((1 == $_REQUEST['set_notifications']) ? 1 : 0), + 'set_permissions' => ((1 == $_REQUEST['set_permissions']) ? 1 : 0), + 'set_inroot_copy' => ((1 == $_REQUEST['set_inroot_copy']) ? 1 : 0), + 'set_donations' => $_POST['set_donations'], + 'set_subversion' => $_POST['set_subversion']) + ); + + if ($tdmcreate->getHandler('settings')->insert($settingsObj)) { + redirect_header('settings.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_UPDATED_OK, $_POST['set_name'])); + } + + $GLOBALS['xoopsTpl']->assign('error', $settingsObj->getHtmlErrors()); + $form =& $settingsObj->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; +} +include __DIR__ . '/footer.php'; 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/css/admin/style.css 2015-05-19 18:10:46 UTC (rev 13064) @@ -50,6 +50,10 @@ vertical-align: middle; } +tr.modules td.name { + min-width: 70px; +} + tr.tables td { /* display: block; Problems in FireFox and Opera */ margin: 0; @@ -59,15 +63,36 @@ vertical-align: middle; } +tr.tables td.name { + min-width: 70px; +} + +tr.tables-fields td { + /* display: block; Problems in FireFox and Opera */ + margin: 0; + padding: 5px; + border-bottom: 1px solid #ccc; + background-color:rgba(230,130,100,0.3); + vertical-align: middle; +} + +tr.tables-fields td.name { + min-width: 70px; +} + tr.fields td { /* display: block; Problems in FireFox and Opera */ margin: 0; padding: 5px; border-bottom: 1px solid #ccc; - background-color:rgba(0,255,0,0.3); + background-color:rgba(10,215,10,0.3); vertical-align: middle; } +tr.fields td.name { + min-width: 80px; +} + /*#show_rows { margin: 0; padding: 0; width: 60%; } #sortable tr { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; font-size: 1.1em; height: 16px; }*/ @@ -170,7 +195,7 @@ } .cell.cell-width3 { - width: 8%; + width: 9%; } .cell.cell-width4 { @@ -217,13 +242,8 @@ .field-list tr td { padding: 5px 2px; - margin-bottom: 3px; - /* background-color: #efefef; - background-image: -moz-linear-gradient(top, #efefef, #e1e1e1); - background-image: -webkit-gradient(linear, left top,left bottom, from(#efefef), to(#e1e1e1)); - background-image: linear-gradient(top, #efefef, #e1e1e1); - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, StartColorStr=#efefef, EndColorStr=#e1e1e1); vale solo per IE */ - text-shadow:1px 1px 0 #fff; + margin-bottom: 3px; + text-shadow: 1px 1px 1px #fff; color:#ff8400; } Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/32/settings.png =================================================================== (Binary files differ) Index: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/32/settings.png =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/32/settings.png 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/32/settings.png 2015-05-19 18:10:46 UTC (rev 13064) Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/assets/icons/32/settings.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/cache/classpaths.cache 2015-05-19 18:10:46 UTC (rev 13064) @@ -0,0 +1 @@ +a:5:{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:18:"TDMCreateThemeForm";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\form\TDMCreateThemeForm.php";s:18:"TDMCreateFormLabel";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\html\TDMCreateFormLabel.php";s:18:"TDMCreateFormRadio";s:100:"D:\UwAmp\www\xoops-2.5.7testTDMCreate1.91\htdocs\modules\tdmcreate\class\form\TDMCreateFormRadio.php";} \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldattributes.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldattributes.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldattributes.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -39,7 +39,6 @@ */ public function __construct() { - $this->XoopsObject(); $this->initVar('fieldattribute_id', XOBJ_DTYPE_INT); $this->initVar('fieldattribute_name', XOBJ_DTYPE_TXTBOX); $this->initVar('fieldattribute_value', XOBJ_DTYPE_TXTBOX); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldelements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldelements.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldelements.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -39,7 +39,6 @@ */ public function __construct() { - $this->XoopsObject(); $this->initVar('fieldelement_id', XOBJ_DTYPE_INT); $this->initVar('fieldelement_mid', XOBJ_DTYPE_INT); $this->initVar('fieldelement_tid', XOBJ_DTYPE_INT); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldkey.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldkey.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldkey.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -39,7 +39,6 @@ */ public function __construct() { - $this->XoopsObject(); $this->initVar('fieldkey_id', XOBJ_DTYPE_INT); $this->initVar('fieldkey_name', XOBJ_DTYPE_TXTBOX); $this->initVar('fieldkey_value', XOBJ_DTYPE_TXTBOX); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldnull.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldnull.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldnull.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -39,7 +39,6 @@ */ public function __construct() { - $this->XoopsObject(); $this->initVar('fieldnull_id', XOBJ_DTYPE_INT); $this->initVar('fieldnull_name', XOBJ_DTYPE_TXTBOX); $this->initVar('fieldnull_value', XOBJ_DTYPE_TXTBOX); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldtype.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldtype.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fieldtype.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -39,7 +39,6 @@ */ public function __construct() { - $this->XoopsObject(); $this->initVar('fieldtype_id', XOBJ_DTYPE_INT); $this->initVar('fieldtype_name', XOBJ_DTYPE_TXTBOX); $this->initVar('fieldtype_value', XOBJ_DTYPE_TXTBOX); 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -80,10 +80,10 @@ $modId = $module->getVar('mod_id'); $language = $GLOBALS['xoopsConfig']['language']; // Id of tables - $criteriaTables = new CriteriaCompo(); - $criteriaTables->add(new Criteria('table_mid', $modId)); - $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteriaTables); - unset($criteriaTables); + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('table_mid', $modId)); + $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria); + unset($criteria); // $table = null; foreach (array_keys($tables) as $t) { @@ -214,10 +214,11 @@ $moduleDirname = $module->getVar('mod_dirname'); $icon32 = 'assets/icons/32'; // Id of tables - $criteriaTables = new CriteriaCompo(); - $criteriaTables->add(new Criteria('table_mid', $modId)); - $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteriaTables); - unset($criteriaTables); + $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(); // $table = array(); 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -42,6 +42,7 @@ { $criteria = new CriteriaCompo(); $criteria->add(new Criteria('field_tid', $tableId)); + $criteria->setSort('field_order'); $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria); unset($criteria); 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminFooter.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -85,7 +85,7 @@ $content = $this->getHeaderFilesComments($module, $filename); $content .= <<<EOT if ( isset(\$template_main) ) { - \$GLOBALS['xoopsTpl']->display("db:{\$template_main}"); + \$GLOBALS['xoopsTpl']->display("db:{\$templateMain}"); } xoops_cp_footer(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -86,7 +86,7 @@ $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $language = $this->getLanguage($moduleDirname, 'AM'); - $language_thereare = $this->getLanguage($moduleDirname, 'AM', 'THEREARE_'); + $languageThereAre = $this->getLanguage($moduleDirname, 'AM', 'THEREARE_'); $content = $this->getHeaderFilesComments($module, $filename); $content .= <<<EOT include __DIR__ . '/header.php'; @@ -96,15 +96,16 @@ if (is_array($tables)) { foreach (array_keys($tables) as $i) { $tableName = $tables[$i]->getVar('table_name'); + $ucfTableName = ucfirst($tableName); $content .= <<<EOT //\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}'); -\$count_{$tableName} = \${$tableName}Handler->getCount();\n +\$count{$ucfTableName} = \${$tableName}Handler->getCount();\n EOT; } } $content .= <<<EOT // Template Index -\$template_main = '{$moduleDirname}_admin_index.tpl';\n +\$templateMain = '{$moduleDirname}_admin_index.tpl';\n EOT; if (is_array($tables)) { $content .= <<<EOT @@ -114,9 +115,9 @@ EOT; foreach (array_keys($tables) as $i) { $tableName = $tables[$i]->getVar('table_name'); - $stuTableName = $language_thereare . strtoupper($tableName); + $stuTableName = $languageThereAre . strtoupper($tableName); $content .= <<<EOT -\$adminMenu->addInfoBoxLine({$language}STATISTICS, '<label>'.{$stuTableName}.'</label>', \$count_{$tableName});\n +\$adminMenu->addInfoBoxLine({$language}STATISTICS, '<label>'.{$stuTableName}.'</label>', \$count{$ucfTableName});\n EOT; } } 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -156,7 +156,7 @@ * @param string $fieldName * @return string */ - public function getUploadImageSetVar($moduleDirname, $tableName, $fieldName) + public function getUploadImageSetVar($moduleDirname, $tableName, $fieldName, $fpmf) { $stuModuleDirname = strtoupper($moduleDirname); $ret = <<<EOT @@ -165,9 +165,11 @@ \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/images/{$tableName}'; \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) { - //\$uploader->setPrefix('{$fieldName}_'); - //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][]); + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { + \$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '' , \$_FILES['attachedfile']['name']); + \$imgName = str_replace(' ', '', \$_POST['{$fpmf}']).'.'.\$extension; + \$uploader->setPrefix(\$imgName); + \$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -77,10 +77,10 @@ * @public function getAdminPagesHeader * @param string $moduleDirname * @param string $tableName - * @param $fpif + * @param $fieldId * @return string */ - public function getAdminPagesHeader($moduleDirname, $tableName, $fpif) + public function getAdminPagesHeader($moduleDirname, $tableName, $fieldId) { $ucfModuleDirname = ucfirst($moduleDirname); $ucfTableName = ucfirst($tableName); @@ -88,8 +88,8 @@ include __DIR__ . '/header.php'; //It recovered the value of argument op in URL$ \$op = XoopsRequest::getString('op', 'list'); -// Request {$fpif} -\${$fpif} = XoopsRequest::getInt('{$fpif}'); +// Request {$fieldId} +\${$fieldId} = XoopsRequest::getInt('{$fieldId}'); // Switch options switch (\$op) {\n @@ -105,12 +105,12 @@ * @param $tableFieldname * @param $language * @param $fields - * @param $fpif + * @param $fieldId * @param $fieldInForm - * @param $fpmf + * @param $fieldMain * @return string */ - public function getAdminPagesList($moduleDirname, $table, $language, $fields, $fpif, $fieldInForm, $fpmf) + public function getAdminPagesList($moduleDirname, $table, $language, $fields, $fieldId, $fieldInForm, $fieldMain) { $stuModuleDirname = strtoupper($moduleDirname); $tableName = $table->getVar('table_name'); @@ -125,7 +125,7 @@ default: \$start = XoopsRequest::getInt('start', 0); \$limit = XoopsRequest::getInt('limit', \${$moduleDirname}->getConfig('adminpager')); - \$template_main = '{$moduleDirname}_admin_{$tableName}.tpl'; + \$templateMain = '{$moduleDirname}_admin_{$tableName}.tpl'; \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));\n EOT; if (1 == $fieldInForm) { @@ -138,11 +138,12 @@ \$criteria = new CriteriaCompo(); \$criteria->setStart(\$start); \$criteria->setLimit(\$limit); - \$criteria->setSort('{$fpif} ASC, {$fpmf}'); + \$criteria->setSort('{$fieldId} ASC, {$fieldMain}'); \$criteria->setOrder('ASC'); \${$tableName}Count = \${$tableName}Handler->getCount(\$criteria); \${$tableName}All = \${$tableName}Handler->getAll(\$criteria); unset(\$criteria); + \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_count', \${$tableName}Count); \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL); \$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL); // Table view @@ -267,26 +268,26 @@ * @param string $tableName * @param string $language * @param string $fields - * @param string $fpif - * @param string $fpmf + * @param string $fieldId + * @param string $fieldMain * @return string */ - public function getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf) + public function getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fieldId, $fieldMain) { $ret = <<<EOT case 'save': if ( !\$GLOBALS['xoopsSecurity']->check() ) { redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors())); } - if (isset(\${$fpif})) { - \${$tableName}Obj =& \${$tableName}Handler->get(\${$fpif}); + if (isset(\${$fieldId})) { + \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId}); } else { \${$tableName}Obj =& \${$tableName}Handler->create(); } // Set Vars\n EOT; foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); + $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); if ($f > 0) { // If we want to hide field id switch ($fieldElement) { @@ -301,7 +302,10 @@ $ret .= $this->adminobjects->getUrlFileSetVar($moduleDirname, $tableName, $fieldName); break; case 13: - $ret .= $this->adminobjects->getUploadImageSetVar($moduleDirname, $tableName, $fieldName); + 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); @@ -336,10 +340,10 @@ * @param string $tableName * @param string $tableFieldname * @param string $language - * @param string $fpif + * @param string $fieldId * @return string */ - public function getAdminPagesEdit($moduleDirname, $table, $language, $fpif) + public function getAdminPagesEdit($moduleDirname, $table, $language, $fieldId) { $tableName = $table->getVar('table_name'); $tableSoleName = $table->getVar('table_solename'); @@ -355,7 +359,7 @@ \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php')); \$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton()); // Get Form - \${$tableName}Obj = \${$tableName}Handler->get(\${$fpif}); + \${$tableName}Obj = \${$tableName}Handler->get(\${$fieldId}); \$form = \${$tableName}Obj->getForm(); \$GLOBALS['xoopsTpl']->assign('form', \$form->render()); break;\n @@ -368,15 +372,15 @@ * @public function getAdminPagesDelete * @param string $tableName * @param string $language - * @param string $fpif - * @param string $fpmf + * @param string $fieldId + * @param string $fieldMain * @return string */ - public function getAdminPagesDelete($tableName, $language, $fpif, $fpmf) + public function getAdminPagesDelete($tableName, $language, $fieldId, $fieldMain) { $ret = <<<EOT case 'delete': - \${$tableName}Obj =& \${$tableName}Handler->get(\${$fpif}); + \${$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())); @@ -387,7 +391,7 @@ echo \${$tableName}Obj->getHtmlErrors(); } } else { - xoops_confirm(array('ok' => 1, '{$fpif}' => \${$fpif}, 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORMSUREDEL, \${$tableName}Obj->getVar('{$fpmf}'))); + xoops_confirm(array('ok' => 1, '{$fieldId}' => \${$fieldId}, 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORMSUREDEL, \${$tableName}Obj->getVar('{$fieldMain}'))); } break;\n EOT; @@ -400,17 +404,17 @@ * @param string $moduleDirname * @param string $tableName * @param string $language - * @param string $fpif - * @param string $fpmf + * @param string $fieldId + * @param string $fieldMain * @return string */ - public function getAdminPagesUpdate($moduleDirname, $tableName, $language, $fpif, $fpmf) + public function getAdminPagesUpdate($moduleDirname, $tableName, $language, $fieldId, $fieldMain) { $upModuleName = strtoupper($moduleDirname); $ret = <<<EOT case 'update': - if (isset(\${$fpif})) { - \${$tableName}Obj =& \${$tableName}Handler->get(\${$fpif}); + if (isset(\${$fieldId})) { + \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId}); } \${$tableName}Obj->setVar("\${$tableName}_display", \$_POST["\${$tableName}_display"]); @@ -461,21 +465,21 @@ $fieldName = $fields[$f]->getVar('field_name'); $fieldInForm = $fields[$f]->getVar('field_inform'); if (0 == $f) { - $fpif = $fieldName; + $fieldId = $fieldName; } if (1 == $fields[$f]->getVar('field_main')) { - $fpmf = $fieldName; + $fieldMain = $fieldName; } } $content = $this->getHeaderFilesComments($module, $filename); - $content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fpif); - $content .= $this->getAdminPagesList($moduleDirname, $table, $language, $fields, $fpif, $fieldInForm, $fpmf); + $content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fieldId); + $content .= $this->getAdminPagesList($moduleDirname, $table, $language, $fields, $fieldId, $fieldInForm, $fieldMain); if (1 == $fieldInForm) { $content .= $this->getAdminPagesNew($moduleDirname, $tableName, $language); - $content .= $this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf); - $content .= $this->getAdminPagesEdit($moduleDirname, $table, $language, $fpif); + $content .= $this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fieldId, $fieldMain); + $content .= $this->getAdminPagesEdit($moduleDirname, $table, $language, $fieldId); } - $content .= $this->getAdminPagesDelete($tableName, $language, $fpif, $fpmf); + $content .= $this->getAdminPagesDelete($tableName, $language, $fieldId, $fieldMain); $content .= $this->getAdminPagesFooter(); // $this->tdmcfile->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -99,7 +99,7 @@ if (count ( array_intersect ( \$group, \$groups ) ) <= 0) { redirect_header ( 'index.php', 3, _NOPERM ); }*/ -\$template_main = '{$moduleDirname}_admin_permissions.tpl'; +\$templateMain = '{$moduleDirname}_admin_permissions.tpl'; echo \$adminMenu->addNavigation('permissions.php'); \$permission = {$moduleDirname}_CleanVars(\$_REQUEST, 'permission', 1, 'int'); Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/classpaths.cache 2015-05-19 18:10:46 UTC (rev 13064) @@ -0,0 +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 Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/index.html =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/index.html (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/cache/index.html 2015-05-19 18:10:46 UTC (rev 13064) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -286,14 +286,14 @@ /* * @private function getPermissionsInForm * @param string $moduleDirname - * @param string $fpif + * @param string $fieldId */ /** * @param $moduleDirname - * @param $fpif + * @param $fieldId * @return string */ - private function getPermissionsInForm($moduleDirname, $fpif) + private function getPermissionsInForm($moduleDirname, $fieldId) { $permissionApprove = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_APPROVE'); $permissionSubmit = $this->getLanguage($moduleDirname, 'AM', 'PERMISSIONS_SUBMIT'); @@ -306,9 +306,9 @@ \$full_list = array_keys ( \$group_list ); global \$xoopsModule; if ( !\$this->isNew() ) { - \$groups_ids_approve = \$gperm_handler->getGroupIds ( '{$moduleDirname}_approve', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) ); - \$groups_ids_submit = \$gperm_handler->getGroupIds ( '{$moduleDirname}_submit', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) ); - \$groups_ids_view = \$gperm_handler->getGroupIds ( '{$moduleDirname}_view', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) ); + \$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[]', \$groups_ids_approve ); \$groups_ids_submit = array_values ( \$groups_ids_submit ); @@ -388,19 +388,19 @@ * @public function getClassHandler * @param string $moduleDirname * @param string $tableName - * @param string $fpif - * @param string $fpmf + * @param string $fieldId + * @param string $fieldMain */ /** * @param $moduleDirname * @param $tableName * @param $tableCategory * @param $tableFieldname - * @param $fpif - * @param $fpmf + * @param $fieldId + * @param $fieldMain * @return string */ - private function getClassHandler($moduleDirname, $table, $fpif, $fpmf) + private function getClassHandler($moduleDirname, $table, $fieldId, $fieldMain) { $tableName = $table->getVar('table_name'); $tableCategory = $table->getVar('table_category'); @@ -408,7 +408,7 @@ $tableFieldname = $table->getVar('table_fieldname'); $ucfModuleDirname = ucfirst($moduleDirname); $ucfTableName = ucfirst($tableName); - $ucfTableSoleName = ucfirst($tableSoleName); + $ucfTableSoleName = ucfirst($tableSoleName); $ucfModuleTable = $ucfModuleDirname . $ucfTableName; $ret = <<<EOT /* @@ -427,7 +427,7 @@ */ public function __construct(&\$db) { - parent::__construct(\$db, '{$moduleDirname}_{$tableName}', '{$moduleDirname}{$tableName}', '{$fpif}', '{$fpmf}'); + parent::__construct(\$db, '{$moduleDirname}_{$tableName}', '{$moduleDirname}{$tableName}', '{$fieldId}', '{$fieldMain}'); \$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance(); } @@ -505,7 +505,7 @@ \${$tableName}Handler = \$this->{$moduleDirname}->getHandler( '{$tableName}' ); \${$tableSoleName}Obj = & \${$tableName}Handler->get( \${$tableSoleName}Id ); if (is_object( \${$tableSoleName}Obj )) { - \${$tableSoleName} = \${$tableSoleName}Obj->getVar( '{$fpmf}' ); + \${$tableSoleName} = \${$tableSoleName}Obj->getVar( '{$fieldMain}' ); } } return \${$tableSoleName}; @@ -538,10 +538,10 @@ $fieldName = $fields[$f]->getVar('field_name'); $fieldInForm = $fields[$f]->getVar('field_inform'); if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { - $fpif = $fieldName; // $fpif = fields parameter index field + $fieldId = $fieldName; // $fieldId = fields parameter index field } if (1 == $fields[$f]->getVar('field_main')) { - $fpmf = $fieldName; // $fpmf = fields parameter main field + $fieldMain = $fieldName; // $fieldMain = fields parameter main field } } $content = $this->getHeaderFilesComments($module, $filename); @@ -549,12 +549,12 @@ if (1 == $fieldInForm) { $content .= $this->getHeadInForm($module, $table); if (1 == $table->getVar('table_permissions')) { - $content .= $this->getPermissionsInForm($moduleDirname, $fpif); + $content .= $this->getPermissionsInForm($moduleDirname, $fieldId); } $content .= $this->getFootInForm(); } $content .= $this->getToArray(); - $content .= $this->getClassHandler($moduleDirname, $table, $fpif, $fpmf); + $content .= $this->getClassHandler($moduleDirname, $table, $fieldId, $fieldMain); $this->tdmcfile->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -78,17 +78,25 @@ * @param string $required */ /** - * @param $language - * @param $fieldName - * @param string $required + * @param $language + * @param $fieldName + * @param $required * @return string */ - private function getXoopsFormText($language, $fieldName, $required = 'false') + private function getXoopsFormText($language, $fieldName, $fieldDefault, $required = 'false') { - $ret = <<<EOT + if($fieldDefault != '') { + $ret = <<<EOT // Form Text {$fieldName} + \${$fieldName} = \$this->isNew() ? '{$fieldDefault}' : \$this->getVar('{$fieldName}'); + \$form->addElement( new XoopsFormText({$language}, '{$fieldName}', 20, 150, \${$fieldName}){$required} );\n +EOT; + } else { + $ret = <<<EOT + // Form Text {$fieldName} \$form->addElement( new XoopsFormText({$language}, '{$fieldName}', 50, 255, \$this->getVar('{$fieldName}')){$required} );\n EOT; + } return $ret; } @@ -621,7 +629,7 @@ case 1: break; case 2: - $ret .= $this->getXoopsFormText($language, $fieldName, $required); + $ret .= $this->getXoopsFormText($language, $fieldName, $fieldDefault, $required); break; case 3: $ret .= $this->getXoopsFormTextArea($language, $fieldName, $required); 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-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -185,6 +185,7 @@ } // $ret .= $this->defines->getDefine($language, $tableSoleName .'_'. $rpFieldName, $fieldNameDesc); + $stuTableName = strtoupper($tableName); // switch ($fieldElement) { case 10: Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-16 05:58:18 UTC (rev 13063) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-19 18:10:46 UTC (rev 13064) @@ -81,7 +81,7 @@ $tableSoleName = $table->getVar('table_solename'); $ret = <<<EOT <{include file="db:{$moduleDirname}_admin_header.tpl"}> -<{if {$tableName}_list}> +<{if {$tableName}_count}> <table class="outer {$tableName} width100"> <thead> <tr class="head">\n @@ -250,15 +250,15 @@ <div class="xo-pagenav floatright"><{\$pagenav}></div><div class="clear spacer"></div> <{/if}> <{/if}> +<{if \$... [truncated message content] |
From: <be...@us...> - 2015-05-16 05:58:22
|
Revision: 13063 http://sourceforge.net/p/xoops/svn/13063 Author: beckmi Date: 2015-05-16 05:58:18 +0000 (Sat, 16 May 2015) Log Message: ----------- Adding module translations (from ?\197?\189irafka) Added Paths: ----------- XoopsLanguages/czech/modules/amhterror/ XoopsLanguages/czech/modules/amhterror/0.06/ XoopsLanguages/czech/modules/amhterror/0.06/czech/ XoopsLanguages/czech/modules/amhterror/0.06/czech/admin.php XoopsLanguages/czech/modules/amhterror/0.06/czech/main.php XoopsLanguages/czech/modules/amhterror/0.06/czech/modinfo.php XoopsLanguages/czech/modules/amhterror/0.06/info_o_cestine.txt XoopsLanguages/czech/modules/amhterror/0.06/licence_cz.txt XoopsLanguages/czech/modules/amhterror/0.06/licence_en.txt XoopsLanguages/czech/modules/avatarmaker/ XoopsLanguages/czech/modules/avatarmaker/1.1/ XoopsLanguages/czech/modules/avatarmaker/1.1/czech/ XoopsLanguages/czech/modules/avatarmaker/1.1/czech/index.html XoopsLanguages/czech/modules/avatarmaker/1.1/czech/main.php XoopsLanguages/czech/modules/avatarmaker/1.1/czech/modinfo.php XoopsLanguages/czech/modules/avatarmaker/1.1/info_o_cestine.txt XoopsLanguages/czech/modules/avatarmaker/1.1/licence_cz.txt XoopsLanguages/czech/modules/avatarmaker/1.1/licence_en.txt XoopsLanguages/czech/modules/extgallery/ XoopsLanguages/czech/modules/extgallery/1.08/ XoopsLanguages/czech/modules/extgallery/1.08/czech/ XoopsLanguages/czech/modules/extgallery/1.08/czech/admin.php XoopsLanguages/czech/modules/extgallery/1.08/czech/blocks.php XoopsLanguages/czech/modules/extgallery/1.08/czech/extention.php XoopsLanguages/czech/modules/extgallery/1.08/czech/index.html XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/ XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/album_new_photo.tpl XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/ecard_html.tpl XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/ecard_text.tpl XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/global_new_photo.tpl XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/global_new_photo_pending.tpl XoopsLanguages/czech/modules/extgallery/1.08/czech/mail_template/index.html XoopsLanguages/czech/modules/extgallery/1.08/czech/main.php XoopsLanguages/czech/modules/extgallery/1.08/czech/modinfo.php XoopsLanguages/czech/modules/membership/ XoopsLanguages/czech/modules/membership/2.3/ XoopsLanguages/czech/modules/membership/2.3/czech/ XoopsLanguages/czech/modules/membership/2.3/czech/admin.php XoopsLanguages/czech/modules/membership/2.3/czech/blocks.php XoopsLanguages/czech/modules/membership/2.3/czech/index.html XoopsLanguages/czech/modules/membership/2.3/czech/main.php XoopsLanguages/czech/modules/membership/2.3/czech/modinfo.php XoopsLanguages/czech/modules/mycomments/ XoopsLanguages/czech/modules/mycomments/1.0/ XoopsLanguages/czech/modules/mycomments/1.0/czech/ XoopsLanguages/czech/modules/mycomments/1.0/czech/blocks.php XoopsLanguages/czech/modules/mycomments/1.0/czech/index.html XoopsLanguages/czech/modules/mycomments/1.0/czech/main.php XoopsLanguages/czech/modules/mycomments/1.0/czech/modinfo.php XoopsLanguages/czech/modules/spiders/ XoopsLanguages/czech/modules/spiders/1.13/ XoopsLanguages/czech/modules/spiders/1.13/czech/ XoopsLanguages/czech/modules/spiders/1.13/czech/admin.php XoopsLanguages/czech/modules/spiders/1.13/czech/modinfo.php XoopsLanguages/czech/modules/tag/ XoopsLanguages/czech/modules/tag/2.3rc/ XoopsLanguages/czech/modules/tag/2.3rc/tag/ XoopsLanguages/czech/modules/tag/2.3rc/tag/language/ XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/ XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/admin.php XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/blocks.php XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/config.php XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/index.html XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/main.php XoopsLanguages/czech/modules/tag/2.3rc/tag/language/czech/modinfo.php XoopsLanguages/czech/modules/xfguestbook/ XoopsLanguages/czech/modules/xfguestbook/2.5.01/ XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/ XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/admin.php XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/blocks.php XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/images/ XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/images/index.html XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/images/logo.gif XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/index.html XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/main.php XoopsLanguages/czech/modules/xfguestbook/2.5.01/czech/modinfo.php XoopsLanguages/czech/modules/xoopsfaq/ XoopsLanguages/czech/modules/xoopsfaq/1.15/ XoopsLanguages/czech/modules/xoopsfaq/1.15/czech/ XoopsLanguages/czech/modules/xoopsfaq/1.15/czech/admin.php XoopsLanguages/czech/modules/xoopsfaq/1.15/czech/index.html XoopsLanguages/czech/modules/xoopsfaq/1.15/czech/main.php XoopsLanguages/czech/modules/xoopsfaq/1.15/czech/modinfo.php XoopsLanguages/czech/modules/xoopsfaq/New folder/ XoopsLanguages/czech/modules/xoopspoll/ XoopsLanguages/czech/modules/xoopspoll/1.30/ XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/ XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/ XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/ XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/admin.php XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/blocks.php XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/index.html XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/mail_template/ XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/mail_template/mail_results.tpl XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/main.php XoopsLanguages/czech/modules/xoopspoll/1.30/xoopspoll/language/czech/modinfo.php XoopsLanguages/czech/modules/xoopspoll/1.31/ XoopsLanguages/czech/modules/xoopspoll/1.31/czech/ XoopsLanguages/czech/modules/xoopspoll/1.31/czech/admin.php XoopsLanguages/czech/modules/xoopspoll/1.31/czech/blocks.php XoopsLanguages/czech/modules/xoopspoll/1.31/czech/index.html XoopsLanguages/czech/modules/xoopspoll/1.31/czech/mail_template/ XoopsLanguages/czech/modules/xoopspoll/1.31/czech/mail_template/mail_results.tpl XoopsLanguages/czech/modules/xoopspoll/1.31/czech/main.php XoopsLanguages/czech/modules/xoopspoll/1.31/czech/modinfo.php Added: XoopsLanguages/czech/modules/amhterror/0.06/czech/admin.php =================================================================== --- XoopsLanguages/czech/modules/amhterror/0.06/czech/admin.php (rev 0) +++ XoopsLanguages/czech/modules/amhterror/0.06/czech/admin.php 2015-05-16 05:58:18 UTC (rev 13063) @@ -0,0 +1,116 @@ +<?php +// $Id: admin.php,v 1.2 2007/05/04 18:56:00 andrew Exp $ +// ------------------------------------------------------------------------ // +// Author: Andrew Mills // +// Email: aj...@si... // +// About: // +// // +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// 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. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + + +/** +* Admin navbar +*/ +define("_AM_AMHTERR_GENERALSET", "P\xF8edvolby"); +define("_AM_AMHTERR_GOTOMOD", "P\xF8ej\xEDt na modul"); +define("_AM_AMHTERR_HELP", "N\xE1pov\xECda"); +define("_AM_AMHTERR_ABOUT", "O modulu"); +define("_AM_AMHTERR_MODULEADMIN", "admin:"); +define("_AM_AMHTERR_INDEX", "P\xF8ehled"); +define("_AM_AMHTERR_ERROR", "Chybov\xE9 hl\xE1\x9Aky"); + + +/** +* Form captions +*/ +define("_AM_AMHTERR_FRMTTLCAP", "Typy chyb:"); // Error types +define("_AM_AMHTERR_FRMCAPHDRID", "ID"); +define("_AM_AMHTERR_FRMCAPHDRTTL", "Nadpis"); +define("_AM_AMHTERR_FRMCAPERRNUM", "\xC8\xEDslo chyby"); +define("_AM_AMHTERR_FRMCAPNOERRS", "Nejsou definov\xE1ny \x9E\xE1dn\xE9 chybov\xE9 hl\xE1\x9Aky."); +define("_AM_AMHTERR_STATUSSHOW", "Stav: Publikov\xE1no"); +define("_AM_AMHTERR_STATUSHIDE", "Stav: Skryto"); +define("_AM_AMHTERR_FRMCAPLNKEDT", "Upravit"); +define("_AM_AMHTERR_FRMCAPLNKDLT", "Vymazat"); +define("_AM_AMHTERR_CAPDSPLY", "Zobrazit:"); +define("_AM_AMHTERR_CAPDSPLYTXT", " Vybrat pro zobrazen\xED."); + +define("_AM_AMHTERR_CAPTTL", "Nadpis:"); +define("_AM_AMHTERR_CAPERRNUM", "\xC8\xEDslo chyby:"); +define("_AM_AMHTERR_CAPMAINTXT", "Zpr\xE1va:"); + + +/** +* errors.php +*/ +define("_AM_AMHTERR_ENTCAPADD", "P\xF8idat typ chyby:"); +define("_AM_AMHTERR_ENTCAPEDIT", "Upravit typ chyby:"); +define("_AM_AMHTERR_ENTCAPSAVE", "Ulo\x9Eit"); +define("_AM_AMHTERR_CODEEXISTS", "Tento typ chyby ji\x9E existuje!"); + + +/** +* Misc +*/ +define("_AM_AMHTERR_DBUPDATED", "Aktualizace datab\xE1ze v po\xF8\xE1dku skon\xE8ila."); +define("_AM_AMHTERR_DBNOUPDATED", "Aktualizace datab\xE1ze se nezda\xF8ila!"); +define("_AM_AMHTERR_DBCONFMDEL", "Mysl\xEDte to v\xE1\x9En\xEC? Opravdu chcete vymazat tuto polo\x9Eku?"); + + +/** +* index.php +*/ +define("_AM_AMHTERR_INTRO", " Informace "); + +define("_AM_AMHTERR_INFO", "<p><strong>Pros\xEDm pamatujte:</strong> Tento modul pot\xF8ebuje od serveru podporu soubor\xF9 .htaccess (a tak\xE9 jejich povolen\xED pro V\xE1\x9A \xFA\xE8et na serveru), nebo n\xECjak\xFD jin\xFD zp\xF9sob p\xF8esm\xECrov\xE1n\xED p\xF8i v\xFDskytu chyby.</p>"); + +define("_AM_AMHTERR_FILECHK", "Kontrola souboru .htaccess :<br />"); +define("_AM_AMHTERR_FILEEXISTS", "<span style=\"color: green; font-weight: bold;\">OK</span>"); +define("_AM_AMHTERR_FILENOEXIST", "<span style=\"color: red; font-weight: bold;\">soubor .htaccess neexistuje - pros\xEDm vytvo\xF8te jej s t\xEDmto obsahem (pamatujte, \x9Ee mus\xEDte vlo\x9Eit kompletn\xED hlavi\xE8ku i pati\xE8ku souboru, toto je jen \xE8\xE1st obsahu souboru nutn\xE1 pro chod modulu).</span>"); +define("_AM_AMHTERR_ADDCODE", "Do souboru <b>.htaccess</b>, um\xEDst\xECn\xE9ho v ko\xF8enov\xE9m adres\xE1\xF8i va\x9Aeho XOOPSu, vlo\x9Eit n\xE1sleduj\xEDc\xED \xF8\xE1dky. Bez t\xE9to \xFApravy nem\xF9\x9Ee modul fungovat."); +define("_AM_AMHTERR_NOCODE", "<span style=\"color: red; font-weight: bold;\">Moment\xE1ln\xEC nejsou nadefinov\xE1ny \x9E\xE1dn\xE9 chybov\xE9 hl\xE1\x9Aky.</span>"); + + +/** +* reports.php +*/ +define("_AM_AMHTERR_REPORTS", "Z\xE1znamy"); +define("_AM_AMHTERR_REPCAPTTL", "Z\xE1znamy:"); +define("_AM_AMHTERR_REPUSER", "U\x9Eivatel"); +define("_AM_AMHTERR_REPERRCD", "\xC8\xEDslo chyby"); +define("_AM_AMHTERR_REPDATE", "Datum"); +define("_AM_AMHTERR_REPREFER", "Referrer"); +define("_AM_AMHTERR_REPUAGENT", "Prohl\xED\x9Ee\xE8"); +define("_AM_AMHTERR_REPADDR", "IP adresa"); +define("_AM_AMHTERR_REPREQ", "Po\x9Eadovan\xE1 str\xE1nka"); + + +/** +* about.php +*/ +define("_AM_AMHTERR_ABOUTABOUT", "O modulu"); + +?> Added: XoopsLanguages/czech/modules/amhterror/0.06/czech/main.php =================================================================== --- XoopsLanguages/czech/modules/amhterror/0.06/czech/main.php (rev 0) +++ XoopsLanguages/czech/modules/amhterror/0.06/czech/main.php 2015-05-16 05:58:18 UTC (rev 13063) @@ -0,0 +1,39 @@ +<?php +// $Id: main.php,v 1.1 2006/08/13 17:34:48 andrew Exp $ +// ------------------------------------------------------------------------ // +// Author: Andrew Mills // +// Email: aj...@si... // +// About: // +// // +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// 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. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + + +// index.php +define("_MD_AMHT_SRCHCAP", "Prohledat str\xE1nky"); + + + +?> Added: XoopsLanguages/czech/modules/amhterror/0.06/czech/modinfo.php =================================================================== --- XoopsLanguages/czech/modules/amhterror/0.06/czech/modinfo.php (rev 0) +++ XoopsLanguages/czech/modules/amhterror/0.06/czech/modinfo.php 2015-05-16 05:58:18 UTC (rev 13063) @@ -0,0 +1,76 @@ +<?php +// $Id: modinfo.php,v 1.4 2007/05/07 20:21:29 andrew Exp $ +// ------------------------------------------------------------------------ // +// Author: Andrew Mills // +// Email: aj...@si... // +// About: // +// // +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// 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. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + + +/** +* xoops_version.php +*/ +define("_MI_AM_HTERROR_NAME", "AM HTError"); +define("_MI_AM_HTERROR_DESC", "Modul pro zpr\xE1vu chybov\xFDch hl\xE1\x9Aen\xED serveru v syst\xE9mu XOOPS."); + +// config options +define("_MI_AMHTERR_IGNOREADMIN", "Ignorovat administr\xE1tory:"); +define("_MI_AMHTERR_IGNOREADMINDSC", "Do datab\xE1ze nezapisovat chyby zp\xF9soben\xE9 \xE8leny administr\xE1torsk\xE9 skupiny."); +define("_MI_AMHTERR_REPORTING", "Vypnout protokoly:"); +define("_MI_AMHTERR_REPORTINGDSC", "Pro hojn\xEC nav\x9At\xECvovan\xE9 str\xE1nky je n\xECkdy lep\x9A\xED vypnout logov\xE1n\xED, proto\x9Ee by z\xE1znam mohl b\xFDt p\xF8\xEDli\x9A velik\xFD."); +define("_MI_AMHTERR_PAGETTL", "Nadpis str\xE1nky:"); +define("_MI_AMHTERR_PAGETTLDSC", "Vlo\x9Eit \xE8\xEDslo chyby do nadpisu str\xE1nky"); +define("_MI_AMHTERR_PAGETTL1", "Nevkl\xE1dat"); +define("_MI_AMHTERR_PAGETTL2", "Ano: <jm\xE9no modulu> - <chyba>"); +define("_MI_AMHTERR_PAGETTL3", "Ano: <chyba> - <jm\xE9no modulu>"); +define("_MI_AMHTERR_DATEFRMT", "Form\xE1t datumu:"); +define("_MI_AMHTERR_DATEFRMTDSC", 'Form\xE1t data ve v\xFDpisech. Prohl\xE9dn\xECte si dokumentaci PHP <a href="http://www.php.net/date" target="_blank">date format page</a> kde zjist\xEDte, jak\xE9 form\xE1tov\xE1n\xED lze pou\x9E\xEDt.'); +define("_MI_AMHTERR_NUMREPS", "Po\xE8et z\xE1znam\xF9:"); +define("_MI_AMHTERR_NUMREPSDSC", "Po\xE8et z\xE1znam\xF9 kter\xE9 se zobraz\xED ve v\xFDpisu."); +define("_MI_AMHTERR_LINEBRKS", "Zalamov\xE1n\xED \xF8\xE1dek:"); +define("_MI_AMHTERR_LINEBRKSDSC", "Zapnut\xED automatick\xE9ho zalamov\xE1n\xED \xF8\xE1dek v chybov\xFDch hl\xE1\x9Ak\xE1ch (co\x9E ale m\xF9\x9Ee zp\xF9sobit pot\xED\x9Ee p\xF8i pou\x9Eit\xED HTML)."); + + +/** +* Admin navbar +*/ +define("_MI_AMHTERR_GENERALSET", "P\xF8edvolby"); +define("_MI_AMHTERR_GOTOMOD", "P\xF8ej\xEDt na modul"); +define("_MI_AMHTERR_HELP", "N\xE1pov\xECda"); +define("_MI_AMHTERR_MODULEADMIN", "admin:"); +define("_MI_AMHTERR_INDEX", "P\xF8ehled"); + + +/** +* Admin menu +*/ +define("_MI_AMHTERROR_MENU1", "P\xF8ehled"); +define("_MI_AMHTERROR_MENU2", "Chybov\xE9 hl\xE1\x9Aky"); +define("_MI_AMHTERROR_MENU3", "Protokoly"); + + +?> Added: XoopsLanguages/czech/modules/amhterror/0.06/info_o_cestine.txt =================================================================== --- XoopsLanguages/czech/modules/amhterror/0.06/info_o_cestine.txt (rev 0) +++ XoopsLanguages/czech/modules/amhterror/0.06/info_o_cestine.txt 2015-05-16 05:58:18 UTC (rev 13063) @@ -0,0 +1,25 @@ +--[ Cestina AM HTError ]------------------------------------------------------ + +Modul slouzi ke sprave chybovych hlasek od serveru a jejich zobrazeni tak, aby +vypadaly stejne jako kazda jina stranka webu. Take tyto chyby zapisuje do logu. + +Verze modulu: 0.06 +Verze cestiny: 1.1 +Posledni upravy: 23.07.2008 +Obsah: Jazykove soubory + + +--[ Preklad ]------------------------------------------------------------------ + +Sasa K. Svobodova - www.zirafoviny.cz + +--[ Navod k instalaci ]-------------------------------------------------------- + +1. rozbalit archiv +2. prekopirovat adresar "czech" do podadresare "language" v modulu + + +--[ Dalsi informace ]---------------------------------------------------------- + +Dalsi informace a pripadne aktualizace najdete na strankach http://xoops.zpc.cz +nebo na http://www.zirafoviny.cz \ No newline at end of file Added: XoopsLanguages/czech/modules/amhterror/0.06/licence_cz.txt =================================================================== --- XoopsLanguages/czech/modules/amhterror/0.06/licence_cz.txt (rev 0) +++ XoopsLanguages/czech/modules/amhterror/0.06/licence_cz.txt 2015-05-16 05:58:18 UTC (rev 13063) @@ -0,0 +1,333 @@ + \xC8esk\xFD p\xF8eklad GNU General Public License + +Tento text je neofici\xE1ln\xEDm p\xF8ekladem GNU General Public License (GNU GPL). +Nebyl vyd\xE1n nadac\xED Free Software Foundation a nevyjad\xF8uje pr\xE1vn\xED podstatu +podm\xEDnek pro \x9A\xED\xF8en\xED softwaru pou\x9E\xEDvaj\xEDc\xEDho GNU GPL -tomuto \xFA\xE8elu slou\x9E\xED +v\xFDhradn\xEC p\xF9vodn\xED anglick\xE1 verze GNU GPL. P\xF8esto douf\xE1me, \x9Ee tento p\xF8eklad +pom\xF9\x9Ee \xE8esk\xFDm \xE8ten\xE1\xF8\xF9m l\xE9pe porozum\xECt licenci GNU GPL. + +This is an unofficial translation of the GNU General Public License into +Czech. It was not published by the Free Software Foundation, and does not +legally state the distribution terms for software that uses the +GNU GPL -only the original English text of the GNU GPL does that. However, +we hope that this translation will help Czech speakers understand the +GNU GPL better. + + GNU General Public License + \xC8esk\xFD p\xF8eklad verze 2, \xE8erven 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +675 Mass Ave, Cambridge, MA 02139, USA + +Kop\xEDrov\xE1n\xED a distribuce doslovn\xFDch kopi\xED tohoto licen\xE8n\xEDho dokumentu jsou +dovoleny komukoliv, jeho zm\xECny jsou v\x9Aak zak\xE1z\xE1ny. + + Preambule + +Softwarov\xE9 licence jsou v\xECt\x9Ainou navr\x9Eeny tak, \x9Ee v\xE1m odeb\xEDraj\xED pr\xE1vo +svobodn\xE9ho sd\xEDlen\xED a \xFAprav program\xF9. Smyslem GNU General Public License +je naproti tomu zaru\xE8it svobodu ke sd\xEDlen\xED a \xFAprav\xE1m svobodn\xE9ho softwaru +-pro zaji\x9At\xECn\xED svobodn\xE9ho p\xF8\xEDstupu k tomuto softwaru pro v\x9Aechny jeho +u\x9Eivatele. Tato General Public License se vztahuje na v\xECt\x9Ainu softwaru +nadace Free Software Foundation a na jak\xFDkoli jin\xFD program, jeho\x9E autor se +p\xF8iklon\xED k jej\xEDmu pou\x9E\xEDv\xE1n\xED. (N\xECkter\xFD dal\x9A\xED software od Free Software Foundation +je nam\xEDsto toho pokryt GNU Lesser General Public License.) M\xF9\x9Eete ji rovn\xEC\x9E +pou\x9E\xEDt pro sv\xE9 programy. + +Pokud mluv\xEDme o svobodn\xE9m softwaru, m\xE1me na mysli svobodu, nikoliv cenu. +Na\x9Ae General Public License je navr\x9Eena pro zaji\x9At\xECn\xED toho, \x9Ee m\xF9\x9Eete svobodn\xEC +\x9A\xED\xF8it kopie svobodn\xE9ho softwaru (a \xFA\xE8tovat si poplatek za tuto slu\x9Ebu, pokud +chcete), \x9Ee obdr\x9E\xEDte zdrojov\xFD k\xF3d anebo jej m\xF9\x9Eete z\xEDskat, pokud ho chcete, +\x9Ee m\xF9\x9Eete tento software modifikovat nebo jeho \xE8\xE1sti pou\x9E\xEDt v nov\xFDch svobodn\xFDch +programech; a \x9Ee v\xEDte, \x9Ee tyto v\xECci sm\xEDte d\xEClat. + +Abychom mohli va\x9Ae pr\xE1va chr\xE1nit, mus\xEDme vytvo\xF8it omezen\xED, kter\xE1 zak\xE1\x9E\xED komukoli +v\xE1m tato pr\xE1va odep\xEDrat nebo v\xE1s \x9E\xE1dat, abyste se t\xECchto pr\xE1v vzdal. +Tato omezen\xED se prom\xEDtaj\xED do jist\xFDch povinnost\xED, kter\xFDm mus\xEDte dost\xE1t, pokud +\x9A\xED\xF8\xEDte kopie doty\xE8n\xE9ho softwaru anebo ho modifikujete. + +Nap\xF8\xEDklad, \x9A\xED\xF8\xEDte-li kopie takov\xE9ho programu, a\x9D ji\x9E zdarma nebo za poplatek, +mus\xEDte poskytnout p\xF8\xEDjemc\xF9m v\x9Aechna pr\xE1va, kter\xE1 m\xE1te s\xE1m. Mus\xEDte zaru\xE8it, +\x9Ee p\xF8\xEDjemci rovn\xEC\x9E dostanou anebo mohou z\xEDskat zdrojov\xFD k\xF3d. A mus\xEDte jim uk\xE1zat +tyto podm\xEDnky, aby znali sv\xE1 pr\xE1va. + +Va\x9Ae pr\xE1va chr\xE1n\xEDme ve dvou kroc\xEDch: (1) autorizac\xED softwaru a (2) nab\xEDdkou t\xE9to +licence, kter\xE1 v\xE1m d\xE1v\xE1 pr\xE1voplatn\xE9 svolen\xED ke kop\xEDrov\xE1n\xED, \x9A\xED\xF8en\xED a modifikaci +softwaru. + +Kv\xF9li ochran\xEC ka\x9Ed\xE9ho autora i n\xE1s samotn\xFDch chceme zajistit, aby ka\x9Ed\xFD ch\xE1pal +skute\xE8nost, \x9Ee pro svobodn\xFD software neplat\xED \x9E\xE1dn\xE9 z\xE1ruky. Je-li software n\xECk\xFDm +jin\xFDm modifikov\xE1n a posl\xE1n d\xE1le, chceme, aby p\xF8\xEDjemci v\xECd\xECli, \x9Ee to, co maj\xED, +nen\xED origin\xE1l, tak\x9Ee jak\xE9koliv probl\xE9my vnesen\xE9 jin\xFDmi se neodraz\xED na reputaci +p\xF9vodn\xEDch autor\xF9. + +Kone\xE8n\xEC, ka\x9Ed\xFD svobodn\xFD program je neust\xE1le ohro\x9Een softwarov\xFDmi patenty. +P\xF8ejeme si zamezit nebezpe\xE8\xED, \x9Ee redistributo\xF8i svobodn\xE9ho programu obdr\x9E\xED +samostatn\xEC patentov\xE1 osv\xECd\xE8en\xED a t\xEDm u\xE8in\xED program v\xE1zan\xFDm. Abychom tomu +zamezili, deklarovali jsme, \x9Ee ka\x9Ed\xFD patent mus\xED b\xFDt bu\xEF vyd\xE1n s t\xEDm, \x9Ee +umo\x9E\xF2uje ka\x9Ed\xE9mu svobodn\xE9 u\x9Eit\xED, anebo nesm\xED b\xFDt vyd\xE1n v\xF9bec. + +P\xF8esn\xE1 ustanoven\xED a podm\xEDnky pro kop\xEDrov\xE1n\xED, \x9A\xED\xF8en\xED a modifikaci jsou +uvedeny d\xE1le. + +Ustanoven\xED a podm\xEDnky pro kop\xEDrov\xE1n\xED, distribuci a modifikaci + +0. Tato licence se vztahuje na kter\xFDkoliv program \xE8i jin\xE9 d\xEDlo, kter\xE9 obsahuje + zm\xEDnku, um\xEDst\xECnou v n\xECm dr\x9Eitelem autorsk\xFDch pr\xE1v, o tom, \x9Ee d\xEDlo m\xF9\x9Ee b\xFDt + \x9A\xED\xF8eno podle ustanoven\xED GNU General Public License. V dal\x9A\xEDm textu znamen\xE1 + "program" ka\x9Ed\xFD takov\xFD program nebo d\xEDlo a "d\xEDlo zalo\x9Een\xE9 na programu" znamen\xE1 + bu\xEF program samotn\xFD anebo ka\x9Ed\xE9 jin\xE9 d\xEDlo z n\xECj odvozen\xE9, kter\xE9 podl\xE9h\xE1 + autorsk\xE9mu z\xE1konu: t\xEDm se m\xEDn\xED d\xEDlo obsahuj\xEDc\xED program nebo jeho \xE8\xE1st, bu\xEF + doslovn\xEC anebo s modifikacemi, pop\xF8\xEDpad\xEC v p\xF8ekladu do jin\xE9ho jazyka. + (Nad\xE1le je p\xF8eklad zahrnov\xE1n bez omezen\xED pod pojem "modifikace".) + Ka\x9Ed\xFD u\x9Eivatel licence je ozna\xE8ov\xE1n jako "vy". Jin\xE9 \xE8innosti ne\x9E kop\xEDrov\xE1n\xED, + \x9A\xED\xF8en\xED a modifikace nejsou pokryty touto licenc\xED; sahaj\xED mimo jej\xED r\xE1mec. + Akt spu\x9At\xECn\xED programu nen\xED omezen a v\xFDstup z programu je pokryt pouze tehdy, + jestli\x9Ee obsah v\xFDstupu tvo\xF8\xED d\xEDlo zalo\x9Een\xE9 na programu (nez\xE1visle na tom, + zda bylo vytvo\xF8eno \xE8innost\xED programu). Posouzen\xED platnosti p\xF8edchoz\xED v\xECty + z\xE1vis\xED na tom, co program d\xECl\xE1. + +1. Sm\xEDte kop\xEDrovat a \x9A\xED\xF8it doslovn\xE9 kopie zdrojov\xE9ho k\xF3du programu tak, + jak jste jej obdr\x9Eel a na libovoln\xE9m m\xE9diu, za p\xF8edpokladu, \x9Ee na ka\x9Ed\xE9 kopii + viditeln\xEC a n\xE1le\x9Eit\xEC zve\xF8ejn\xEDte zm\xEDnku o autorsk\xFDch pr\xE1vech a absenci z\xE1ruky; + ponech\xE1te nedot\xE8en\xE9 v\x9Aechny zm\xEDnky vztahuj\xEDc\xED se k t\xE9to licenci a k absenci + z\xE1ruky; a d\xE1te ka\x9Ed\xE9mu p\xF8\xEDjemci spolu s programem kopii t\xE9to licence. + Za fyzick\xFD akt p\xF8enesen\xED kopie m\xF9\x9Eete \x9E\xE1dat poplatek a podle vlastn\xEDho uv\xE1\x9Een\xED + m\xF9\x9Eete nab\xEDdnout za poplatek z\xE1ru\xE8n\xED ochranu. + +2. M\xF9\x9Eete modifikovat va\x9Ai kopii \xE8i kopie programu anebo kter\xE9koliv jeho \xE8\xE1sti, + a tak vytvo\xF8it d\xEDlo zalo\x9Een\xE9 na programu a kop\xEDrovat a roz\x9Ai\xF8ovat takov\xE9 + modifikace \xE8i d\xEDlo podle podm\xEDnek paragrafu 1 v\xFD\x9Ae, za p\xF8edpokladu, + \x9Ee spln\xEDte v\x9Aechny tyto podm\xEDnky: + +a) Modifikovan\xE9 soubory mus\xEDte opat\xF8it z\xF8etelnou zm\xEDnkou uv\xE1d\xECj\xEDc\xED, + \x9Ee jste soubory zm\xECnil a datum ka\x9Ed\xE9 zm\xECny. + +b) Mus\xEDte umo\x9Enit, aby jak\xE9koliv v\xE1mi publikovan\xE9 \xE8i roz\x9Ai\xF8ovan\xE9 d\xEDlo, + kter\xE9 obsahuje zcela nebo z\xE8\xE1sti program nebo jakoukoli jeho \xE8\xE1st, + pop\xF8\xEDpad\xEC je z programu nebo jeho \xE8\xE1sti odvozeno, mohlo b\xFDt jako celek + bezplatn\xEC poskytnuto ka\x9Ed\xE9 t\xF8et\xED osob\xEC v souladu s ustanoven\xEDmi t\xE9to licence. + +c) Pokud modifikovan\xFD program pracuje norm\xE1ln\xEC tak, \x9Ee \xE8te interaktivn\xEC povely, + mus\xEDte zajistit, \x9Ee p\xF8i nejb\xEC\x9En\xECj\x9A\xEDm zp\xF9sobu jeho spu\x9At\xECn\xED vytiskne nebo + zobraz\xED hl\xE1\x9Aen\xED zahrnuj\xEDc\xED p\xF8\xEDslu\x9Anou zm\xEDnku o autorsk\xE9m pr\xE1vu a uvede, + \x9Ee neexistuje \x9E\xE1dn\xE1 z\xE1ruka (nebo p\xF8\xEDpadn\xEC, \x9Ee z\xE1ruku poskytujete vy), a \x9Ee + u\x9Eivatel\xE9 mohou za t\xECchto podm\xEDnek program redistribuovat, a mus\xED u\x9Eivateli + sd\xEClit, jak\xFDm zp\xF9sobem m\xF9\x9Ee nahl\xE9dnout do kopie t\xE9to licence. + (V\xFDjimka: v p\xF8\xEDpad\xEC, \x9Ee s\xE1m program je interaktivn\xED, av\x9Aak \x9E\xE1dn\xE9 takov\xE9 hl\xE1\x9Aen\xED + nevypisuje, nepo\x9Eaduje se, aby va\x9Ae d\xEDlo zalo\x9Een\xE9 na programu takov\xE9 hl\xE1\x9Aen\xED + vypisovalo.) Tyto po\x9Eadavky se vztahuj\xED k modifikovan\xE9mu d\xEDlu jako celku. + Pokud lze identifikovat \xE8\xE1sti takov\xE9ho d\xEDla, kter\xE9 z\xF8ejm\xEC nejsou odvozeny z + programu a mohou b\xFDt samy o sob\xEC rozumn\xEC pova\x9Eov\xE1ny za nez\xE1visl\xE1 a samostatn\xE1 + d\xEDla, pak se tato licence a jej\xED ustanoven\xED nevztahuj\xED na tyto \xE8\xE1sti, + jsou-li \x9A\xED\xF8eny jako nez\xE1visl\xE1 d\xEDla. Av\x9Aak jakmile tyt\xE9\x9E \xE8\xE1sti roz\x9Ai\xF8ujete jako + \xE8\xE1st celku, j\xEDm\x9E je d\xEDlo zalo\x9Een\xE9 na programu, mus\xED b\xFDt roz\x9Ai\xF8ov\xE1n\xED tohoto + celku pod\xF8\xEDzeno ustanoven\xEDm t\xE9to licence tak, \x9Ee povolen\xED poskytnut\xE1 dal\x9A\xEDm + u\x9Eivatel\xF9m se roz\x9A\xED\xF8\xED na cel\xE9 d\xEDlo, tedy na v\x9Aechny jeho \xE8\xE1sti bez ohledu na to, + kdo kterou \xE8\xE1st napsal. Smyslem tohoto paragrafu tedy nen\xED z\xEDsk\xE1n\xED pr\xE1v na + d\xEDlo zcela napsan\xE9 v\xE1mi ani pop\xEDr\xE1n\xED va\x9Aich pr\xE1v v\xF9\xE8i n\xECmu; skute\xE8n\xFDm smyslem + je v\xFDkon pr\xE1va na \xF8\xEDzen\xED distribuce odvozen\xFDch nebo kolektivn\xEDch d\xECl zalo\x9Een\xFDch + na programu. + +Pouh\xE9 spojen\xED jin\xE9ho d\xEDla, je\x9E nen\xED na programu zalo\x9Eeno, s programem +(anebo d\xEDlem zalo\x9Een\xFDm na programu) na pam\xEC\x9Dov\xE9m nebo distribu\xE8n\xEDm m\xE9diu neuvazuje toto +jin\xE9 d\xEDlo do p\xF9sobnosti t\xE9to licence. + +3. M\xF9\x9Eete kop\xEDrovat a roz\x9Ai\xF8ovat program (nebo d\xEDlo na n\xECm zalo\x9Een\xE9, viz paragraf 2) + v objektov\xE9 anebo spustiteln\xE9 podob\xEC podle ustanoven\xED paragraf\xF9 1 a 2 v\xFD\x9Ae, + pokud spln\xEDte n\xECkterou z n\xE1sleduj\xEDc\xEDch n\xE1le\x9Eitost\xED: + +a) Doprovod\xEDte jej zdrojov\xFDm k\xF3dem ve strojov\xEC \xE8iteln\xE9 form\xEC. + Zdrojov\xFD k\xF3d mus\xED b\xFDt roz\x9Ai\xF8ov\xE1n podle ustanoven\xED paragraf\xF9 1 a 2 v\xFD\x9Ae, + a to na m\xE9diu b\xEC\x9En\xEC pou\x9E\xEDvan\xE9m pro v\xFDm\xECnu softwaru; nebo + +b) Doprovod\xEDte jej p\xEDsemnou nab\xEDdkou s platnost\xED nejm\xE9n\xEC t\xF8i roky, + podle n\xED\x9E poskytnete jak\xE9koli t\xF8et\xED stran\xEC, za poplatek nep\xF8evy\x9Auj\xEDc\xED + va\x9Ae v\xFDdaje vynalo\x9Een\xE9 na fyzickou v\xFDrobou zdrojov\xE9 distribuce, + kompletn\xED strojov\xEC \xE8itelnou kopii odpov\xEDdaj\xEDc\xEDho zdrojov\xE9ho k\xF3du, + jen\x9E mus\xED b\xFDt \x9A\xED\xF8en podle ustanoven\xED paragraf\xF9 1 a 2 v\xFD\x9Ae na m\xE9diu b\xEC\x9En\xEC + pou\x9E\xEDvan\xE9m pro v\xFDm\xECnu softwaru; nebo + +c) Doprovod\xEDte jej informacemi, kter\xE9 jste dostal ohledn\xEC nab\xEDdky na poskytnut\xED + zdrojov\xE9ho k\xF3du. (Tato alternativa je povolena jen pro nekomer\xE8n\xED \x9A\xED\xF8en\xED a jenom + tehdy, pokud jste obdr\x9Eel program v objektov\xE9m nebo spustiteln\xE9m tvaru spolu s + takovou nab\xEDdkou, v souladu s polo\x9Ekou b v\xFD\x9Ae.) + +Zdrojov\xFD k\xF3d k d\xEDlu je nejvhodn\xECj\x9A\xED formou d\xEDla z hlediska jeho p\xF8\xEDpadn\xFDch +modifikac\xED. Pro d\xEDlo ve spustiteln\xE9m tvaru znamen\xE1 \xFApln\xFD zdrojov\xFD k\xF3d ve\x9Aker\xFD +zdrojov\xFD k\xF3d pro v\x9Aechny moduly, kter\xE9 obsahuje, plus jak\xE9koli dal\x9A\xED soubory +pro definici rozhran\xED, plus d\xE1vkov\xE9 soubory pot\xF8ebn\xE9 pro kompilaci a instalaci +spustiteln\xE9ho programu. Zvl\xE1\x9Atn\xED v\xFDjimkou jsou v\x9Aak ty softwarov\xE9 komponenty, +kter\xE9 jsou norm\xE1ln\xEC \x9A\xED\xF8eny (bu\xEF ve zdrojov\xE9 nebo bin\xE1rn\xED form\xEC) s hlavn\xEDmi +sou\xE8\xE1stmi opera\xE8n\xEDho syst\xE9mu, na n\xECm\x9E spustiteln\xFD program b\xEC\x9E\xED +(tj. s p\xF8eklada\xE8em, j\xE1drem apod.). Tyto komponenty nemus\xED b\xFDt \x9A\xED\xF8eny se zdrojov\xFDm +k\xF3dem, pokud ov\x9Aem komponenta sama nedoprov\xE1z\xED spustitelnou podobu d\xEDla. + +Je-li \x9A\xED\xF8en\xED objektov\xE9ho nebo spustiteln\xE9ho k\xF3du \xE8in\xECno nab\xEDdkou p\xF8\xEDstupu ke +kop\xEDrov\xE1n\xED z ur\xE8it\xE9ho m\xEDsta, potom se za distribuci zdrojov\xE9ho k\xF3du po\xE8\xEDt\xE1 i +nab\xEDdnut\xED ekvivalentn\xEDho p\xF8\xEDstupu ke kop\xEDrov\xE1n\xED zdrojov\xE9ho k\xF3du ze stejn\xE9ho m\xEDsta, +by\x9D p\xF8itom nejsou t\xF8et\xED strany nuceny ke zkop\xEDrov\xE1n\xED zdrojov\xE9ho k\xF3du spolu s +objektov\xFDm. + +4. Nesm\xEDte kop\xEDrovat, modifikovat, poskytovat sublicence anebo \x9A\xED\xF8it program jin\xFDm + zp\xF9sobem ne\x9E v\xFDslovn\xEC uveden\xFDm v t\xE9to licenci. Jak\xFDkoli jin\xFD pokus o kop\xEDrov\xE1n\xED, + modifikov\xE1n\xED, poskytnut\xED sublicence anebo \x9A\xED\xF8en\xED programu je neplatn\xFD a + automaticky ukon\xE8\xED va\x9Ae pr\xE1va dan\xE1 touto licenc\xED. Strany, kter\xE9 od v\xE1s obdr\x9Eely + kopie anebo pr\xE1va v souladu s touto licenc\xED, v\x9Aak nemaj\xED sv\xE9 licence ukon\xE8eny, + dokud se jim pln\xEC pod\xF8izuj\xED. + +5. Nen\xED va\x9A\xED povinost\xED tuto licenci p\xF8ijmout, proto\x9Ee jste ji nepodepsal. + Nic jin\xE9ho v\xE1m v\x9Aak ned\xE1v\xE1 mo\x9Enost kop\xEDrovat nebo \x9A\xED\xF8it program nebo odvozen\xE1 + d\xEDla. V p\xF8\xEDpad\xEC, \x9Ee tuto licenci nep\xF8ijmete, jsou tyto \xE8innosti z\xE1konem zak\xE1z\xE1ny. + T\xEDm p\xE1dem modifikac\xED anebo \x9A\xED\xF8en\xEDm programu (anebo ka\x9Ed\xE9ho d\xEDla zalo\x9Een\xE9ho na + programu) vyjad\xF8ujete sv\xE9 pod\xF8\xEDzen\xED se licenci a v\x9Aem jej\xEDm ustanoven\xEDm a + podm\xEDnk\xE1m pro kop\xEDrovan\xED, modifikov\xE1n\xED a \x9A\xED\xF8en\xED programu a d\xECl na n\xECm zalo\x9Een\xFDch. + +6. Poka\x9Ed\xE9, kdy\x9E redistribuujete program (nebo d\xEDlo zalo\x9Een\xE9 na programu), + z\xEDsk\xE1v\xE1 p\xF8\xEDjemce od p\xF9vodn\xEDho dr\x9Eitele licence pr\xE1vo kop\xEDrovat, modifikovat a + \x9A\xED\xF8it program v souladu s t\xECmito ustanoven\xEDmi a podm\xEDnkami. Nesm\xEDte kl\xE1st \x9E\xE1dn\xE9 + dal\x9A\xED p\xF8ek\xE1\x9Eky v\xFDkonu zde zaru\xE8en\xFDch p\xF8\xEDjemcov\xFDch pr\xE1v. Nejste odpov\xECdn\xFD za + vym\xE1h\xE1n\xED dodr\x9Eov\xE1n\xED t\xE9to licence t\xF8et\xEDmi stranami. + +7. Jsou-li v\xE1m z rozhodnut\xED soudu, obvin\xECn\xEDm z poru\x9Aen\xED patentu nebo z jak\xE9hokoli + jin\xE9ho d\xF9vodu (nejen v souvislosti s patenty) ulo\x9Eeny takov\xE9 podm\xEDnky (a\x9D ji\x9E + p\xF8\xEDkazem soudu, smlouvou nebo jinak), kter\xE9 se vylu\xE8uj\xED s podm\xEDnkami t\xE9to + licence, nejste t\xEDm osvobozen od podm\xEDnek t\xE9to licence. + +Pokud nem\xF9\x9Eete \x9A\xED\xF8it program tak, abyste vyhov\xECl z\xE1rove\xF2 sv\xFDm z\xE1vazk\xF9m vypl\xFDvaj\xEDc\xEDm +z t\xE9to licence a jin\xFDm platn\xFDm z\xE1vazk\xF9m, nesm\xEDte jej v d\xF9sledku toho \x9A\xED\xF8it v\xF9bec. +Pokud by nap\xF8\xEDklad patentov\xE9 osv\xECd\xE8en\xED nepovolovalo bezplatnou redistribuci programu +v\x9Aemi, kdo va\x9A\xEDm p\xF8i\xE8in\xECn\xEDm z\xEDskaj\xED p\xF8\xEDmo nebo nep\xF8\xEDmo jeho kopie, pak by jedin\xFD +mo\x9En\xFD zp\xF9sob jak vyhov\xECt z\xE1rove\xF2 patentov\xE9mu osv\xECd\xE8en\xED i t\xE9to licenci spo\xE8\xEDval v +ukon\xE8en\xED distribuce programu. + +Pokud by se za n\xECjak\xFDch specifick\xFDch okolnost\xED jevila n\xECkter\xE1 \xE8\xE1st tohoto paragrafu +jako neplatn\xE1 nebo nevynutiteln\xE1, pova\x9Euje se za sm\xECrodatnou rovnov\xE1ha vyj\xE1d\xF8en\xE1 +t\xEDmto paragrafem a paragraf jako celek se pova\x9Euje za sm\xECrodatn\xFD za jin\xFDch okolnost\xED. + +Smyslem tohoto paragrafu nen\xED nav\xE1d\xECt v\xE1s k poru\x9Aov\xE1n\xED patent\xF9 \xE8i jin\xFDch ustanoven\xED +vlastnick\xE9ho pr\xE1va, anebo tato ustanoven\xED zpochyb\xF2ovat; jedin\xFDm jeho smyslem je +ochrana integrity syst\xE9mu \x9A\xED\xF8en\xED svobodn\xE9ho softwaru, kter\xFD je podlo\x9Een ve\xF8ejn\xFDmi +licen\xE8n\xEDmi p\xF8edpisy. Mnoz\xED lid\xE9 poskytli sv\xE9 p\xF8\xEDsp\xECvky do \x9Airok\xE9ho okruhu softwaru +\x9A\xED\xF8en\xE9ho t\xEDmto syst\xE9mem, spolehnuv\x9Ae se na jeho d\xF9sledn\xE9 uplat\xF2ov\xE1n\xED; +z\xE1le\x9E\xED na autorovi/d\xE1rci, aby rozhodl, zda si p\xF8eje \x9A\xED\xF8it software pomoc\xED n\xECjak\xE9ho +jin\xE9ho syst\xE9mu a \x9E\xE1dn\xFD u\x9Eivatel licence nem\xF9\x9Ee takov\xE9 rozhodnut\xED zpochyb\xF2ovat. + +Smyslem tohoto paragrafu je zevrubn\xEC osv\xECtlit to, co je pova\x9Eov\xE1no za d\xF9sledek +plynouc\xED ze zbytku t\xE9to licence. + +8. Pokud je \x9A\xED\xF8en\xED \xE8i pou\x9Eit\xED programu v n\xECkter\xFDch zem\xEDch omezeno bu\xEF patenty + anebo autorsky chr\xE1n\xECn\xFDmi rozhran\xEDmi, m\xF9\x9Ee dr\x9Eitel p\xF9vodn\xEDch autorsk\xFDch pr\xE1v, + kter\xFD sv\xEC\xF8uje program do p\xF9sobnosti t\xE9to licence, p\xF8idat v\xFDslovn\xE9 omezen\xED pro + geografick\xE9 \x9A\xED\xF8en\xED, vylu\xE8uj\xEDc\xED takov\xE9 zem\xEC, tak\x9Ee \x9A\xED\xF8en\xED je povoleno jen v t\xECch + zem\xEDch nebo mezi t\xECmi zem\xECmi, kter\xE9 nejsou t\xEDmto zp\xF9sobem vylou\xE8eny. + Tato licence zahrnuje v tomto p\xF8\xEDpad\xEC takov\xE9 omezen\xED p\xF8esn\xEC tak, + jako by bylo zaps\xE1no v textu t\xE9to licence. + +9. Free Software Foundation m\xF9\x9Ee \xE8as od \xE8asu vyd\xE1vat upraven\xE9 nebo nov\xE9 + verze General Public License. Takov\xE9 nov\xE9 verze se budou sv\xFDm duchem podobat + sou\xE8asn\xE9 verzi, v jednotlivostech se v\x9Aak mohou li\x9Ait s ohledem na nov\xE9 + probl\xE9my \xE8i z\xE1jmy. Ka\x9Ed\xE9 verzi je p\xF8id\xECleno rozli\x9Auj\xEDc\xED \xE8\xEDslo verze. + Pokud program specifikuje \xE8\xEDslo verze, kter\xE1 se na n\xECj vztahuje, + a "v\x9Aechny n\xE1sleduj\xEDc\xED verze", m\xF9\x9Eete se podle uv\xE1\x9Een\xED \xF8\xEDdit ustanoven\xEDmi + a podm\xEDnkami bu\xEFto on\xE9 konkr\xE9tn\xED verze anebo kter\xE9koliv n\xE1sleduj\xEDc\xED verze, + kterou vydala Free Software Foundation. Jestli\x9Ee program nespecifikuje \xE8\xEDslo + verze t\xE9to licence, m\xF9\x9Eete si vybrat libovolnou verzi, + kterou kdy Free Software Foundation vydala. + +10. Pokud si p\xF8ejete zahrnout \xE8\xE1sti programu do jin\xFDch svobodn\xFDch program\xF9, + jejich\x9E distribu\xE8n\xED podm\xEDnky jsou odli\x9An\xE9, za\x9Alete autorovi \x9E\xE1dost o povolen\xED. + V p\xF8\xEDpad\xEC softwaru, k n\xECmu\x9E vlastn\xED autorsk\xE1 pr\xE1va Free Software Foundation, + napi\x9Ate Free Software Foundation; n\xECkdy \xE8in\xEDme v\xFDjimky ze zde uveden\xFDch + ustanoven\xED. Na\x9Ae rozhodnut\xED bude vedeno dv\xECma c\xEDli: zachov\xE1n\xEDm svobodn\xE9 + povahy v\x9Aech odvozenin na\x9Aeho svobodn\xE9ho softwaru a podporou sd\xEDlen\xED a + op\xECtovn\xE9ho vyu\x9Eit\xED softwaru obecn\xEC. + +Z\xC1RUKA SE NEPOSKYTUJE + +11. VZHLEDEM K BEZPLATN\xC9MU POSKYTNUT\xCD LICENCE K PROGRAMU SE NA PROGRAM NEVZTAHUJE + \x8E\xC1DN\xC1 Z\xC1RUKA, A TO V M\xCD\xD8E POVOLEN\xC9 PLATN\xDDMZ\xC1KONEM. POKUD NEN\xCD P\xCDSEMN\xCC STANOVENO + JINAK, POSKYTUJ\xCD DR\x8EITEL\xC9 AUTORSK\xDDCH PR\xC1V POP\xD8\xCDPAD\xCC JIN\xC9 STRANY + PROGRAM "TAK, JAK JE", BEZ Z\xC1RUKY JAK\xC9HOKOLI DRUHU, A\x8D V\xDDSLOVN\xC9 NEBO VYPL\xDDVAJ\xCDC\xCD, + V\xC8ETN\xCC, ALENIKOLI JEN, Z\xC1RUK PRODEJNOSTI A VHODNOSTI PRO UR\xC8IT\xDD \xDA\xC8EL. + POKUD JDE OKVALITU A V\xDDKONNOST PROGRAMU, LE\x8E\xCD VE\x8AKER\xC9 RIZIKO NA V\xC1S. + POKUD BY SEU PROGRAMU PROJEVILY Z\xC1VADY, PADAJ\xCD N\xC1KLADY ZA V\x8AECHNU POT\xD8EBNOU + \xDADR\x8EBU, OPRAVU \xC8I N\xC1PRAVU NA V\xC1\x8A VRUB. + +12. V \x8E\xC1DN\xC9M P\xD8\xCDPAD\xCC, S V\xDDJIMKOU TOHO, KDY\x8E TO VY\x8EADUJE PLATN\xDD Z\xC1KON, + ANEBO KDY\x8E TO BYLO P\xCDSEMN\xCC ODSOUHLASENO, V\xC1M NEBUDE \x8E\xC1DN\xDD Z DR\x8EITEL\xD9 AUTORSK\xDDCH + PR\xC1V ANI \x8E\xC1DN\xC1 JIN\xC1 STRANA, KTER\xC1 SM\xCD MODIFIKOVAT \xC8I \x8A\xCD\xD8IT PROGRAM V SOULADU S + P\xD8EDCHOZ\xCDMI USTANOVEN\xCDMI, ODPOV\xCCDNI ZA \x8AKODY, V\xC8ETN\xCC V\x8AECH OBECN\xDDCH, + SPECI\xC1LN\xCDCH, NAHODIL\xDDCHNEBO N\xC1SLEDN\xDDCH \x8AKOD VYPL\xDDVAJ\xCDC\xCDCH Z U\x8E\xCDV\xC1N\xCD ANEBO + NESCHOPNOSTI U\x8E\xCDVAT PROGRAMU (V\xC8ETN\xCC, ALE NIKOLI JEN, ZTR\xC1TY NEBO ZKRESLEN\xCD DAT, + NEBO TRVAL\xDDCH \x8AKOD ZP\xD9SOBEN\xDDCH V\xC1M NEBO T\xD8ET\xCDM STRAN\xC1M, NEBO SELH\xC1N\xCD FUNKCE + PROGRAMU V SOU\xC8INNOSTI S JIN\xDDMI PROGRAMY), A TO I VP\xD8\xCDPAD\xCC, \x8EE TAKOV\xDD DR\x8EITEL + AUTORSK\xDDCH PR\xC1V NEBO JIN\xC1 STRANA BYLIUPOZORN\xCCNI NA MO\x8ENOST TAKOV\xDDCH \x8AKOD. + + KONEC USTANOVEN\xCD A PODM\xCDNEK + +Dopln\xECk: Jak uplatnit tato ustanoven\xED na va\x9Ae nov\xE9 programy + +Pokud vyvinete nov\xFD program a chcete, aby byl ve\xF8ejnosti co nejv\xEDce k u\x9Eitku, +m\xF9\x9Eete toho nejl\xE9pe dos\xE1hnout t\xEDm, \x9Ee jej prohl\xE1s\xEDte za svobodn\xFD software, +kter\xFD m\xF9\x9Ee kdokoliv redistribuovat a m\xECnit za zde uveden\xFDch podm\xEDnek. + +K tomu sta\xE8\xED p\xF8ipojit k programu n\xE1sleduj\xEDc\xED \xFAdaje. Nejbezpe\xE8n\xECj\x9A\xED cestou je +jejich p\xF8ipojen\xED na za\xE8\xE1tek ka\x9Ed\xE9ho zdrojov\xE9ho souboru, \xE8\xEDm\x9E se nej\xFA\xE8inn\xECji sd\xECl\xED +vylou\xE8en\xED z\xE1ruky; a v ka\x9Ed\xFD souboru by pak m\xECla b\xFDt prinejmen\x9A\xEDm \xF8\xE1dka s +"copyrightem" a odkaz na m\xEDsto, kde lze nal\xE9zt \xFApln\xE9 \xFAdaje. + +<\xF8\xE1dka se jm\xE9nem programu a n\xE1stinem toho, co d\xECl\xE1> + +Copyright (C)<rok> <jm\xE9no autora> + +Tento program je svobodn\xFD software; m\xF9\x9Eete jej \x9A\xED\xF8it a modifikovat podle +ustanoven\xED GNU General Public License, vyd\xE1van\xE9 Free Software Foundation; +a to bu\xEF verze 2 t\xE9to licence anebo (podle va\x9Aeho uv\xE1\x9Een\xED) kter\xE9koli pozd\xECj\x9A\xED verze. + +Tento program je roz\x9Ai\xF8ov\xE1n v nad\xECji, \x9Ee bude u\x9Eite\xE8n\xFD, av\x9Aak BEZ JAK\xC9KOLI Z\xC1RUKY; +neposkytuj\xED se ani odvozen\xE9 z\xE1ruky PRODEJNOSTI anebo VHODNOSTI PRO UR\xC8IT\xDD \xDA\xC8EL. +Dal\x9A\xED podrobnosti hledejte ve GNU General Public License. + + +Kopii GNU General Public License jste m\xECl obdr\x9Eet spolu s t\xEDmto programem; +pokud se tak nestalo, napi\x9Ate o ni Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. + +P\xF8ipojte rovn\xEC\x9E informaci o tom, jak je mo\x9En\xE9 se s v\xE1mi spojit +elektronickou a pap\xEDrovou po\x9Atou. + +Pokud je program interaktivn\xED, za\xF8i\xEFte, aby se p\xF8i startu v +interaktivn\xEDm m\xF3du vypsalo hl\xE1\x9Aen\xED podobn\xE9 tomuto: + +Packal verze 69, Copyright (C) 19xx jm\xE9no autora. + +Program Packal je ABSOLUTN\xCC BEZ Z\xC1RUKY; podrobnosti se dozv\xEDte zad\xE1n\xEDm 'show w'. + +Jde o svobodn\xFD software a jeho\x9A\xED\xF8en\xED za jist\xFDch podm\xEDnek je v\xEDt\xE1no; +podrobnosti z\xEDsk\xE1te zad\xE1n\xEDm 'show c'. + + +Hypotetick\xE9 povely 'show w' a 'show c' by m\xECly zobrazit p\xF8\xEDslu\x9An\xE9 pas\xE1\x9Ee +General Public License. Odpov\xEDdaj\xEDc\xED povely ov\x9Aem nemus\xED b\xFDt pr\xE1v\xEC 'show w' a +'show c'; mohou to b\xFDt t\xF8eba stisky tla\xE8\xEDtka na my\x9Ai nebo polo\x9Eky v menu--cokoliv, +co se do va\x9Aeho programu hod\xED. + +Pokud je to nutn\xE9, m\xECl byste tak\xE9 p\xF8im\xECt sv\xE9ho zam\xECstnavatele (jestli\x9Ee pracujete +jako program\xE1tor) nebo p\xF8edstavitele va\x9A\xED \x9Akoly, je-li n\xECkdo takov\xFD, +k tomu, aby podepsal "z\xF8eknut\xED se autorsk\xFDch pr\xE1v". + +Zde je vzor; jm\xE9na pozm\xEC\xF2te: + +Jojotechna, a.s., se t\xEDmto z\xF8\xEDk\xE1 ve\x9Aker\xE9ho z\xE1jmu o autorsk\xE1 pr\xE1va k programu +'Packal' (p\xF8eklada\xE8 s naklada\xE8em) napsan\xE9mu Jakubem Bastlem. + +<Tom\xE1\x9A Slo\x9Eit\xFD--podpis>, 1. dubna 1989 +Tom\xE1\x9A Slo\x9Eit\xFD, v\xEDce ne\x9E prezident + + +Tato General Public License neumo\x9E\xF2uje zahrnut\xED va\x9Aeho programu do jin\xFDch +ne\x9E svobodn\xFDch program\xF9. Je-li v\xE1\x9A program knihovnou podprogram\xF9, m\xF9\x9Eete zv\xE1\x9Eit, +zda je u\x9Eite\xE8n\xE9 umo\x9Enit sestavov\xE1n\xED i v\xE1zan\xFDch aplika\xE8n\xEDch program\xF9 s va\x9A\xED +knihovnou. V takov\xE9m p\xF8\xEDpad\xEC pou\x9Eijte GNU Lesser General Public License +nam\xEDsto t\xE9to licence. \ No newline at end of file Added: XoopsLanguages/czech/modules/amhterror/0.06/licence_en.txt =================================================================== --- XoopsLanguages/czech/modules/amhterror/0.06/licence_en.txt (rev 0) +++ XoopsLanguages/czech/modules/amhterror/0.06/licence_en.txt 2015-05-16 05:58:18 UTC (rev 13063) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +... [truncated message content] |
From: <be...@us...> - 2015-05-16 05:23:35
|
Revision: 13062 http://sourceforge.net/p/xoops/svn/13062 Author: beckmi Date: 2015-05-16 05:23:30 +0000 (Sat, 16 May 2015) Log Message: ----------- Adding 2.5.7.1 from Zirafka Added Paths: ----------- XoopsLanguages/czech/core/2.5.7.1/ XoopsLanguages/czech/core/2.5.7.1/extras/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/filemanager.php XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/index.html XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/filemanager.php XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/index.html XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/class/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cs.php XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cz.php XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/czech.php XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/textarea/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/czech.php XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/czech.php XoopsLanguages/czech/core/2.5.7.1/htdocs/images/ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/aim.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/delete.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/edit.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/email.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/icq_add.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ip.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/msnm.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/pm.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/post.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/profile.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/reply.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/www.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/yim.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/auth.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/backend.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/banners.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/calendar.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/captcha.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/comment.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/countries.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/errors.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/findusers.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/formdhtmltextarea.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/global.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/locale.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/logger.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/ XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/activated.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/adminactivate.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/comment_notify.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/commentsubmit_notify.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/default_notify.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/lostpass1.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/lostpass2.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/register.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/tellfriend.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/mail_template/welcome.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/misc.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/notification.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/pmsg.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/search.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/style.css XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/timezone.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/uploader.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/user.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/czech/xoopsmailerlocal.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/auth.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/backend.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/banners.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/calendar.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/captcha.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/comment.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/countries.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/errors.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/findusers.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/formdhtmltextarea.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/global.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/locale.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/logger.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/ XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/activated.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/adminactivate.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/comment_notify.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/commentsubmit_notify.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/default_notify.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/lostpass1.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/lostpass2.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/register.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/tellfriend.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/mail_template/welcome.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/misc.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/notification.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/pmsg.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/search.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/style.css XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/timezone.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/uploader.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/user.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/english/xoopsmailerlocal.php XoopsLanguages/czech/core/2.5.7.1/htdocs/language/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/help/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/help/help.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/help/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/pm/language/czech/modinfo.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/help/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/help/help.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/help/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/mail_template/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/mail_template/emailchanged.tpl XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/mail_template/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/czech/modinfo.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/profile/language/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/language/czech/help/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/language/czech/help/help.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/language/czech/help/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/protector/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/avatars.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/banners.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/blocksadmin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/comments.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/findusers.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/groups.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/images.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/mailusers.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/maintenance.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/modulesadmin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/preferences.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/smilies.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/tplsets.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/userrank.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/users.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin/version.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/blocks.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/cpanel.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/avatars.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/banners.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/blocksadmin.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/comments.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/groups.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/help_center.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/images.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/mailusers.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/maintenance.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/module_index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/modulesadmin.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/preferences.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/smilies.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/tplsets.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/userrank.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/help/users.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/Thumbs.db XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/lightbox-blank.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/lightbox-btn-close.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/lightbox-btn-next.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/lightbox-btn-prev.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/images/lightbox-ico-loading.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/czech/modinfo.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/avatars.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/banners.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/blocksadmin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/comments.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/groups.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/images.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/mailusers.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/maintenance.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/modulesadmin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/preferences.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/smilies.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/tplsets.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/userrank.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin/users.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/blocks.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/cpanel.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/avatars.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/banners.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/blocksadmin.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/comments.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/groups.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/help_center.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/images.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/mailusers.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/maintenance.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/module_index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/modulesadmin.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/preferences.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/smilies.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/tplsets.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/userrank.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/help/users.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/lightbox-blank.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/lightbox-btn-close.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/lightbox-btn-next.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/lightbox-btn-prev.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/images/lightbox-ico-loading.gif XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/english/modinfo.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/language/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/czech/localsupport.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/english/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/english/localsupport.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/default/language/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/czech/localsupport.php XoopsLanguages/czech/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/english/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/english/script.js XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/suico/language/english/style.css XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/english/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/pt-br_utf8/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/xbootstrap/language/pt-br_utf8/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/english/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/english/script.js XoopsLanguages/czech/core/2.5.7.1/htdocs/themes/zetagenesis/language/english/style.css XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/ XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/ XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/ XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/ XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/czech/ XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/czech/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/czech/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/czech/modinfo.php XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/english/ XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/english/admin.php XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/english/main.php XoopsLanguages/czech/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/english/modinfo.php XoopsLanguages/czech/core/2.5.7.1/install/ XoopsLanguages/czech/core/2.5.7.1/install/language/ XoopsLanguages/czech/core/2.5.7.1/install/language/czech/ XoopsLanguages/czech/core/2.5.7.1/install/language/czech/finish.php XoopsLanguages/czech/core/2.5.7.1/install/language/czech/index.html XoopsLanguages/czech/core/2.5.7.1/install/language/czech/install.php XoopsLanguages/czech/core/2.5.7.1/install/language/czech/install2.php XoopsLanguages/czech/core/2.5.7.1/install/language/czech/mysql.lang.data.sql XoopsLanguages/czech/core/2.5.7.1/install/language/czech/style.css XoopsLanguages/czech/core/2.5.7.1/install/language/czech/support.php XoopsLanguages/czech/core/2.5.7.1/install/language/czech/support.png XoopsLanguages/czech/core/2.5.7.1/install/language/czech/welcome.php XoopsLanguages/czech/core/2.5.7.1/install/language/english/ XoopsLanguages/czech/core/2.5.7.1/install/language/english/finish.php XoopsLanguages/czech/core/2.5.7.1/install/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/install/language/english/install.php XoopsLanguages/czech/core/2.5.7.1/install/language/english/install2.php XoopsLanguages/czech/core/2.5.7.1/install/language/english/mysql.lang.data.sql XoopsLanguages/czech/core/2.5.7.1/install/language/english/style.css XoopsLanguages/czech/core/2.5.7.1/install/language/english/support.php XoopsLanguages/czech/core/2.5.7.1/install/language/english/support.png XoopsLanguages/czech/core/2.5.7.1/install/language/english/welcome.php XoopsLanguages/czech/core/2.5.7.1/upgrade/ XoopsLanguages/czech/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/ XoopsLanguages/czech/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/language/ XoopsLanguages/czech/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/language/czech.php XoopsLanguages/czech/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/language/english.php XoopsLanguages/czech/core/2.5.7.1/upgrade/language/ XoopsLanguages/czech/core/2.5.7.1/upgrade/language/czech/ XoopsLanguages/czech/core/2.5.7.1/upgrade/language/czech/upgrade.php XoopsLanguages/czech/core/2.5.7.1/upgrade/language/english/ XoopsLanguages/czech/core/2.5.7.1/upgrade/language/english/index.html XoopsLanguages/czech/core/2.5.7.1/upgrade/language/english/style.css XoopsLanguages/czech/core/2.5.7.1/upgrade/language/english/upgrade.php XoopsLanguages/czech/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/ XoopsLanguages/czech/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/language/ XoopsLanguages/czech/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/language/czech.php XoopsLanguages/czech/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/language/english.php Added: XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/filemanager.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/filemanager.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/filemanager.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,63 @@ +<?php +/** + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * _LANGCODE cs + * _CHARSET UTF-8 + * @version $Id: filemanager.php 8066 2011-11-06 05:09:33Z beckmi $ + */ + + //Nav +define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','Správce souborů'); +define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','Správce souborů'); + +//Tips +define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS',' +<ul> +<li>Slouží ke změně opravánění a obsahu souborů nebo ke smazání nepotřebných souborů.</li> +</ul> +'); + +// Main +define('_AM_SYSTEM_FILEMANAGER_DIRECTORY','Adresář'); +define('_AM_SYSTEM_FILEMANAGER_FILES','Soubory'); +define('_AM_SYSTEM_FILEMANAGER_GENERATE','Force generation'); +define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME','Vyberte vzhled'); +define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED','Force generated'); +define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED','Files generated'); +define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED','No files created'); +define('_AM_SYSTEM_FILEMANAGER_HOME','Domů'); +define('_AM_SYSTEM_FILEMANAGER_SAVE','Uložit'); +define('_AM_SYSTEM_FILEMANAGER_CANCEL','Zrušit'); +define('_AM_SYSTEM_FILEMANAGER_RESTORE','Opravit'); +define('_AM_SYSTEM_FILEMANAGER_REFRESH','Obnovit seznam'); +define('_AM_SYSTEM_FILEMANAGER_UPLOAD','Nahrát soubor'); +define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE','Zvolte soubor, který chcete nahrát na server.'); +define('_AM_SYSTEM_FILEMANAGER_ADDDIR','Vytvořit adresář'); +define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME','Zvolte název nového adresáře.'); +define('_AM_SYSTEM_FILEMANAGER_ADDFILE','Vytvořit nový soubor'); +define('_AM_SYSTEM_FILEMANAGER_DELDIR','Smazat adresář'); + +define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS','CHYBA! Soubor neexistuje.'); +define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE','CHYBA! Soubor nelze smazat.'); +define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME','CHYBA! Soubor nelze přejmenovat.'); +define('_AM_SYSTEM_FILEMANAGER_BACK','Zpět'); +define('_AM_SYSTEM_FILEMANAGER_DELETE','Smazat'); +define('_AM_SYSTEM_FILEMANAGER_ERROR','Chyba'); +define('_AM_SYSTEM_FILEMANAGER_EDIT','Upravit:'); +define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE','Soubor je prázdný'); +define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK','CHYBA! Smažte tento adresář.'); +define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK','Adresář byl v pořádku vymazán.'); + +// Message +define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE','Soubor byl v pořádku nahrán na sever.'); +define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE','Soubor byl v pořádku rozbalen.'); +define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR','Soubor se nepodařilo rozbalit.'); +define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE','Soubor byl v pořádku vymazán.'); +define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS','Adresář byl v pořádku vytvořen.'); +define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR','Adresář se nepodařilo vytvořit.'); +define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL','Myslíte to vážně? Opravdu chcete smazat tento adresář?'); +define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS','Soubor byl v pořádku vytvořen.'); +define('_AM_SYSTEM_FILEMANAGER_SUREDEL', 'Myslíte to vážně? Opravdu chcete smazat soubor %s?'); +define('_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL', 'Myslíte to vážně? Opravdu chcete smazat adresář %s?<br />Varování: Současně smažete i všechny podadresáře a soubory v nich.'); +?> Added: XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/index.html =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/index.html (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/admin/index.html 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/index.html =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/index.html (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/czech/index.html 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/filemanager.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/filemanager.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/filemanager.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,63 @@ +<?php +/** + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * _LANGCODE en + * _CHARSET UTF-8 + * @version $Id: filemanager.php 8066 2011-11-06 05:09:33Z beckmi $ + */ + + //Nav +define('_AM_SYSTEM_FILEMANAGER_NAV_MANAGER','File Manager'); +define('_AM_SYSTEM_FILEMANAGER_NAV_MAIN','File Manager'); + +//Tips +define('_AM_SYSTEM_FILEMANAGER_NAV_TIPS',' +<ul> +<li>Change file permission, content or just delete an unused file from your XOOPS site.</li> +</ul> +'); + +// Main +define('_AM_SYSTEM_FILEMANAGER_DIRECTORY','Directory'); +define('_AM_SYSTEM_FILEMANAGER_FILES','Files'); +define('_AM_SYSTEM_FILEMANAGER_GENERATE','Force generation'); +define('_AM_SYSTEM_FILEMANAGER_SELECT_THEME','Select theme'); +define('_AM_SYSTEM_FILEMANAGER_FORCE_GENERATED','Force generated'); +define('_AM_SYSTEM_FILEMANAGER_NAV_FILE_GENERATED','Files generated'); +define('_AM_SYSTEM_FILEMANAGER_NOT_CREATED','No files created'); +define('_AM_SYSTEM_FILEMANAGER_HOME','Home'); +define('_AM_SYSTEM_FILEMANAGER_SAVE','Save'); +define('_AM_SYSTEM_FILEMANAGER_CANCEL','Cancel'); +define('_AM_SYSTEM_FILEMANAGER_RESTORE','Restore'); +define('_AM_SYSTEM_FILEMANAGER_REFRESH','Refresh'); +define('_AM_SYSTEM_FILEMANAGER_UPLOAD','Upload file'); +define('_AM_SYSTEM_FILEMANAGER_UPLOAD_CHOOSE','Select file to upload'); +define('_AM_SYSTEM_FILEMANAGER_ADDDIR','Add Directory'); +define('_AM_SYSTEM_FILEMANAGER_ADDDIR_NAME','Choose name of directory'); +define('_AM_SYSTEM_FILEMANAGER_ADDFILE','Add New File'); +define('_AM_SYSTEM_FILEMANAGER_DELDIR','Delete Directory'); + +define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_EXISTS','Error: File not exist'); +define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_DELETE','Error: File not delete'); +define('_AM_SYSTEM_FILEMANAGER_RESTORE_ERROR_FILE_RENAME','Error: File not rename'); +define('_AM_SYSTEM_FILEMANAGER_BACK','Back'); +define('_AM_SYSTEM_FILEMANAGER_DELETE','Delete'); +define('_AM_SYSTEM_FILEMANAGER_ERROR','Error'); +define('_AM_SYSTEM_FILEMANAGER_EDIT','Edit of:'); +define('_AM_SYSTEM_FILEMANAGER_EMPTY_FILE','File empty'); +define('_AM_SYSTEM_FILEMANAGER_DELDIR_NOTOK','Error: delete this directory'); +define('_AM_SYSTEM_FILEMANAGER_DELDIR_OK','Directory successfully deleted'); + +// Message +define('_AM_SYSTEM_FILEMANAGER_UPLOAD_FILE','Files successfully uploaded'); +define('_AM_SYSTEM_FILEMANAGER_EXTRACT_FILE','Files successfully extracted'); +define('_AM_SYSTEM_FILEMANAGER_EXTRACT_ERROR','Files could not be extracted'); +define('_AM_SYSTEM_FILEMANAGER_DELETE_FILE','Files successfully deleted'); +define('_AM_SYSTEM_FILEMANAGER_DIR_SUCCESS','Directory successfully created'); +define('_AM_SYSTEM_FILEMANAGER_DIR_ERROR','Directory could not be created'); +define('_AM_SYSTEM_FILEMANAGER_DIR_RYSDEL','Are you sure to delete this folder?'); +define('_AM_SYSTEM_FILEMANAGER_FILE_SUCCESS','File successfully created'); +define('_AM_SYSTEM_FILEMANAGER_SUREDEL', 'Are you sure to delete this file %s?'); +define('_AM_SYSTEM_FILEMANAGER_DIR_SUREDEL', 'Are you sure you want to delete this directory %s?<br />Warning: all subdirectories and files file will be deleted'); +?> Added: XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/index.html =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/index.html (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/admin/index.html 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/index.html =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/index.html (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/extras/modules/system/language/english/index.html 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/index.html =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/index.html (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/index.html 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/main.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/main.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/czech/main.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,43 @@ +<?php +/** + * Frameworks Module Admin + * + * 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. + * + * @copyright Grégory Mage (Aka Mage) + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Grégory Mage (Aka Mage) + */ +// Info +define('_AM_MODULEADMIN_CONFIG','Kontrola konfigurace'); +define('_AM_MODULEADMIN_CONFIG_CHMOD',"Adresář '%s' potřebuje mít práva '%s' (nyní jsou nastavená na %s)."); +define('_AM_MODULEADMIN_CONFIG_FOLDERKO',"Adresář '%s' neexistuje"); +define('_AM_MODULEADMIN_CONFIG_FOLDEROK',"Adresář '%s' existuje"); +define('_AM_MODULEADMIN_CONFIG_PHP','Minimální požadovaná verze PHP: %s (používáte verzi %s)'); +define('_AM_MODULEADMIN_CONFIG_XOOPS','Minimální požadovaná verze XOOPSu: %s (používáte verzi %s)'); +define('_AM_MODULEADMIN_CONFIG_DB','Minimální požadovaná verze: %s (používáte verzi %s)'); +define('_AM_MODULEADMIN_CONFIG_ADMIN','Minimální požadovaná verze ModuleAdmin: %s (používáte verzi %s)'); +// About +define('_AM_MODULEADMIN_ABOUT_CHANGELOG','Přehled změn'); +define('_AM_MODULEADMIN_ABOUT_DESCRIPTION','Určení modulu'); +define('_AM_MODULEADMIN_ABOUT_MODULEINFO','Informace o modulu'); +define('_AM_MODULEADMIN_ABOUT_MODULESTATUS','Statut verze:'); +define('_AM_MODULEADMIN_ABOUT_UPDATEDATE','Poslední aktualizace:'); +define('_AM_MODULEADMIN_ABOUT_WEBSITE',"Www stránky"); +define("_AM_MODULEADMIN_ABOUT_RELEASEDATE","Verze ze dne: "); // Released +define("_AM_MODULEADMIN_ABOUT_AUTHOR","Autor: "); +define("_AM_MODULEADMIN_ABOUT_CREDITS","Poděkování: "); +define("_AM_MODULEADMIN_ABOUT_LICENSE","Licence: "); +define("_AM_MODULEADMIN_ABOUT_AUTHOR_NAME","Jméno autora: "); +define("_AM_MODULEADMIN_ABOUT_AUTHOR_INFO","O autorovy"); +define("_AM_MODULEADMIN_HOME","Domů"); +define("_AM_MODULEADMIN_DASHBOARD","Přehled"); // Dashboard +define("_AM_MODULEADMIN_ABOUT","O modulu"); +define("_AM_MODULEADMIN_PERMISSIONS","Oprávnění"); +//ModuleAdmin +define("_AM_MODULEADMIN_ADMIN_FOOTER","<div class='center smallsmall italic pad5'>Tento modul je udržován <a class='tooltip' rel='external' href='http://xoops.org/' title='Přejít na oficiální stránky XOOPSu'>mezinárodní komunitou XOOPSu</a>.</div>"); Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/index.html =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/index.html (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/index.html 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cs.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cs.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cs.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,23 @@ +<?php +/** + * PHPMailer language file. + * Czech Version + */ + +$PHPMAILER_LANG['provide_address'] = 'Musíte zadat alespoň jednu adresu příjemce.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.'; +$PHPMAILER_LANG['execute'] = 'Nelze provést:: '; +$PHPMAILER_LANG['instantiate'] = 'Nelze konkretizovat poštovní funkci.'; // Could not instantiate mail function +$PHPMAILER_LANG['authenticate'] = 'Chyba SMTP: Nelze se autorizovat (chyba hesla nebo uživatelského jména).'; +$PHPMAILER_LANG['from_failed'] = 'Následující adresy selhaly:: '; +$PHPMAILER_LANG['recipients_failed'] = 'Chyba SMTP: Následující adresy selhaly: '; +$PHPMAILER_LANG['data_not_accepted'] = 'Chyba SMTP: Data nebyla akceptována.'; +$PHPMAILER_LANG['connect_host'] = 'Chyba SMTP: Nelze se připojit k SMTP serveru.'; +$PHPMAILER_LANG['file_access'] = 'Nelze získat přístup k souboru: '; +$PHPMAILER_LANG['file_open'] = 'Chyba souboru: Nelze otevřít soubor: '; +$PHPMAILER_LANG['encoding'] = 'Neznámé kódování: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'Chyba SMTP serveru: '; +$PHPMAILER_LANG['empty_message'] = 'Tělo zprávy je prázdné'; +$PHPMAILER_LANG['invalid_address'] = 'Chybná adresa'; +$PHPMAILER_LANG['variable_set'] = 'Nelze nastavit, nebo vynulovat proměnnou: '; Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cz.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cz.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-cz.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,24 @@ +<?php +/** + * PHPMailer language file. + * Czech Version + */ + +$PHPMAILER_LANG = array(); + +$PHPMAILER_LANG["provide_address"] = 'Musíte zadat alespoň jednu ' . + 'emailovou adresu příjemce.'; +$PHPMAILER_LANG["mailer_not_supported"] = ' emailový klient není podporován.'; +$PHPMAILER_LANG["execute"] = 'Nelze provést: '; +$PHPMAILER_LANG["instantiate"] = 'Nelze vytvořit instanci emailové funkce.'; +$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Chyba autentikace.'; +$PHPMAILER_LANG["from_failed"] = 'Následující adresa OD je nesprávná: '; +$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: Adresy příjemců ' . + 'nejsou správné ' . +$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data nebyla přijata'; +$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Nelze navázat spojení se ' . + ' SMTP serverem.'; +$PHPMAILER_LANG["file_access"] = 'Soubor nenalezen: '; +$PHPMAILER_LANG["file_open"] = 'File Error: Nelze otevřít soubor pro čtení: '; +$PHPMAILER_LANG["encoding"] = 'Neznámé kódování: '; +?> \ No newline at end of file Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,23 @@ +<?php +/** + * PHPMailer language file. + * English Version + */ + +$PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer is not supported.'; +$PHPMAILER_LANG['execute'] = 'Could not execute: '; +$PHPMAILER_LANG['instantiate'] = 'Could not instantiate mail function.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Could not authenticate.'; +$PHPMAILER_LANG['from_failed'] = 'The following From address failed: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: The following recipients failed: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data not accepted.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Could not connect to SMTP host.'; +$PHPMAILER_LANG['file_access'] = 'Could not access file: '; +$PHPMAILER_LANG['file_open'] = 'File Error: Could not open file: '; +$PHPMAILER_LANG['encoding'] = 'Unknown encoding: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; +$PHPMAILER_LANG['empty_message'] = 'Message body empty'; +$PHPMAILER_LANG['invalid_address'] = 'Invalid address'; +$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/czech.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/czech.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/czech.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,15 @@ +<?php +/** + * XOOPS editor + * + * @copyright The XOOPS project http://www.xoops.org/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Taiwen Jiang (phppp or D.J.) <ph...@ho...> + * @since 2.3.0 + * @version $Id: czech.php + * @package xoopseditor + */ +/** + * Assocated with editor_registry.php + */ +define('_XOOPS_EDITOR_DHTMLTEXTAREA','Formulář DHTML s XOOPS kódy'); Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/czech.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/czech.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/czech.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,15 @@ +<?php +/** + * Editor framework for XOOPS + * + * @copyright The XOOPS project http://www.xoops.org/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Taiwen Jiang (phppp or D.J.) <ph...@ho...> + * @since 1.00 + * @version $Id: english.php 12033 2013-09-14 03:16:44Z beckmi $ + * @package xoopseditor + */ +/* + * Assocated with editor_registry.php + */ +define('_XOOPS_EDITOR_TEXTAREA',"Čistý text"); Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/czech.php =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/czech.php (rev 0) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/czech.php 2015-05-16 05:23:30 UTC (rev 13062) @@ -0,0 +1,22 @@ +<?php +/** + * TinyMCE adapter for XOOPS + * + * @copyright The XOOPS project http://www.xoops.org/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package core + * @subpackage xoopseditor + * @since 2.3.0 + * @author Taiwen Jiang <ph...@us...> + * @version $Id: english.php 12154 2013-10-06 23:36:44Z rgriffith $ + */ +/* + * Assocated with editor_registry.php + */ +// Name of the editor +define('_XOOPS_EDITOR_TINYMCE',"TinyMCE"); +// The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French +// For details, check http://tinymce.moxiecode.com/download_i18n.php +define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"cs"); +// FONT LIST, FORMAT: "Name=value1,value2;Name=value" +define('_XOOPS_EDITOR_TINYMCE_FONTS',"Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings"); Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/aim.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/aim.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/aim.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/aim.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/aim.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/delete.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/delete.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/delete.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/delete.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/delete.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/edit.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/edit.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/edit.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/edit.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/edit.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/email.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/email.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/email.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/email.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/email.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/icq_add.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/icq_add.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/icq_add.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/icq_add.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/icq_add.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ip.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ip.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ip.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ip.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/ip.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/msnm.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/msnm.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/msnm.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/msnm.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/msnm.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/pm.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/pm.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/pm.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/pm.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/pm.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/post.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/post.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/post.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/post.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/post.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/profile.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/profile.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/profile.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/profile.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/profile.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/reply.gif =================================================================== (Binary files differ) Index: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/reply.gif =================================================================== --- XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/reply.gif 2015-05-15 12:00:25 UTC (rev 13061) +++ XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/reply.gif 2015-05-16 05:23:30 UTC (rev 13062) Property changes on: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icons/reply.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsLanguages/czech/core/2.5.7.1/htdocs/images/icon... [truncated message content] |
From: <txm...@us...> - 2015-05-15 12:00:29
|
Revision: 13061 http://sourceforge.net/p/xoops/svn/13061 Author: txmodxoops Date: 2015-05-15 12:00:25 +0000 (Fri, 15 May 2015) Log Message: ----------- Jquery ui tab fixed Added and updated Modified Paths: -------------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/styles.css XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/imports.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/imports.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/docs/changelog.txt XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/common.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/install.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_building.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_imports.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php Added Paths: ----------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/arrow.gif XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/drag.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/left_right.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/spinner.gif XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/submenu.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/tables.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/toggle.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/default.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/functions.js XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/sortable.js XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/files/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields_item.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_header.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locales.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables_item.tpl Removed Paths: ------------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/files/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -8,7 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - +use Xoops\Core\Request; /** * tdmcreate module * @@ -20,18 +20,23 @@ * @version $Id: building.php 10665 2012-12-27 10:14:15Z timgno $ */ include __DIR__ . '/header.php'; +// Get $_POST, $_GET, $_REQUEST +$op = Request::getCmd('op', 'default'); // header $xoops->header('admin:tdmcreate/tdmcreate_building.tpl'); - +// $adminMenu->renderNavigation('building.php'); +// switch ($op) { case 'default': default: + $adminMenu->addTips(TDMCreateLocale::BUILDING_TIPS); + $adminMenu->renderTips(); $form = new XoopsSimpleForm(TDMCreateLocale::BUILDING_TITLE, 'building', 'building.php', 'post', true); $mods_select = new XoopsFormSelect(TDMCreateLocale::BUILDING_MODULES, 'mod_name', 'mod_name'); - $mods_select->addOption(0, TDMCreateLocale::BUILDING_SELDEFMOD); + $mods_select->addOption(0, TDMCreateLocale::BUILDING_SELECT_DEFAULT); $mods_select->addOptionArray($modulesHandler->getList()); $form->addElement($mods_select); Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -8,6 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ +use Xoops\Core\Request; /** * tdmcreate module * @@ -19,88 +20,72 @@ * @version $Id: fields.php 10665 2012-12-27 10:14:15Z timgno $ */ include __DIR__ . '/header.php'; -/* +// Requests $_POST, $_GET, $_REQUEST +$op = Request::getCmd('op', 'list'); +$start = Request::getInt('start', 0); +// Limit of pages +$limit = $helper->getConfig('adminpager'); +// Get Requests $fieldId = Request::getInt('field_id'); $fieldMid = Request::getInt('field_mid'); $fieldTid = Request::getInt('field_tid'); -$fieldNumb = Request::getInt('field_numb'); -$fieldName = Request::getString('field_name', '');*/ - -// Get handler +$fieldName = Request::getString('field_name', ''); +// Get header template $xoops->header('admin:tdmcreate/tdmcreate_fields.tpl'); - +// $adminMenu->renderNavigation('fields.php'); +// switch ($op) { case 'list': - default: - $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); - $adminMenu->renderButton(); - // Get modules list - $criteria = new CriteriaCompo(new Criteria('table_mid', $fieldMid)); - $criteria->add(new Criteria('table_id', $fieldTid)); - $criteria->setSort('table_name'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numRowsTables = $tablesHandler->getCount($criteria); - $tablesArray = $tablesHandler->getAll($criteria); - $xoops->tpl()->assign('tables_count', $numRowsTables); - unset($criteria); + default: + $adminMenu->addTips(TDMCreateLocale::FIELD_TIPS); + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_TABLE, 'tables.php?op=new', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_TABLES, 'tables.php', 'application-view-detail'); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_FIELDS, 'fields.php', 'application-view-detail'); + $adminMenu->renderTips(); + $adminMenu->renderButton(); + $xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/styles.css'); + $xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js'); + $xoops->theme()->addScript('modules/tdmcreate/assets/js/sortable.js'); + $xoops->tpl()->assign('modPathIcon16', TDMC_ROOT_PATH . '/assets/icones/16'); + $numbRowsTables = $tablesHandler->getCountTables(); + if ($numbRowsTables == 0) { + $xoops->redirect('tables.php?op=new', 2, TDMCreateLocale::E_NO_TABLES ); + } + // Get modules list + $tablesArray = $tablesHandler->getAllTablesByModuleId($tablesHandler->getVar('table_mid'), $start, $limit); + $xoops->tpl()->assign('tables_count', $numbRowsTables); // Redirect if there aren't modules - if ( $numRowsTables == 0 ) { + if ( $numbRowsTables == 0 ) { $xoops->redirect('tables.php?op=new', 2, TDMCreateLocale::E_NO_TABLES ); } // Assign Template variables - $xoops->tpl()->assign('fields_list', true); - $xoops->tpl()->assign('fields_count', $numRowsFields); - if ($numRowsTables > 0) { - foreach (array_keys($tablesArray) as $i) { - $tables['id'] = $tablesArray[$i]->getVar('table_id'); - $tables['name'] = $tablesArray[$i]->getVar('table_name'); - $module_name = $modules_Handler->get($tablesArray[$i]->getVar('table_mid')); - $tables['mid'] = $module_name->getVar('mod_name'); - $tables['image'] = $tablesArray[$i]->getVar('table_image'); - $tables['nbfields'] = $tablesArray[$i]->getVar('table_nbfields'); - $tables['blocks'] = $tablesArray[$i]->getVar('table_blocks'); - $tables['admin'] = $tablesArray[$i]->getVar('table_admin'); - $tables['user'] = $tablesArray[$i]->getVar('table_user'); - $tables['submenu'] = $tablesArray[$i]->getVar('table_submenu'); - $tables['search'] = $tablesArray[$i]->getVar('table_search'); - $tables['comments'] = $tablesArray[$i]->getVar('table_comments'); - $tables['notifications'] = $tablesArray[$i]->getVar('table_notifications'); - $xoops->tpl()->append_by_ref('tables', $tables); - unset($tables); - } - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('field_tid', $fieldTid)); - $criteria->setSort('field_id'); - $criteria->setOrder('ASC'); - $numRowsFields = $fieldsHandler->getCount($criteria); - $fieldsArray = $fieldsHandler->getAll($criteria); - unset($criteria); - if ($numRowsFields > 0) { - foreach (array_keys($fieldsArray) as $i) { - $field['id'] = $fieldsArray[$i]->getVar('field_id'); - $table_name = $tablesHandler->get($fieldsArray[$i]->getVar('field_tid')); - $field['tid'] = $table_name->getVar('table_name'); - $field['name'] = $fieldsArray[$i]->getVar('field_name'); - $field['type'] = $fieldsArray[$i]->getVar('field_type'); - $field['value'] = $fieldsArray[$i]->getVar('field_value'); - $field['blocks'] = $fieldsArray[$i]->getVar('field_blocks'); - $field['attribute'] = $fieldsArray[$i]->getVar('field_attribute'); - $field['default'] = $fieldsArray[$i]->getVar('field_default'); - $field['key'] = $fieldsArray[$i]->getVar('field_key'); - $field['blocks'] = $fieldsArray[$i]->getVar('field_blocks'); - $field['search'] = $fieldsArray[$i]->getVar('field_search'); - $field['required'] = $fieldsArray[$i]->getVar('field_required'); - $xoops->tpl()->append_by_ref('fields', $field); - unset($field); - } + if ($numbRowsTables > 0) { + foreach (array_keys($tablesArray) as $t) { + $table = $tablesArray[$t]->getValues(); + $numRowsFields = $fieldsHandler->getCountFields($fieldMid, $t); + $fieldsArray = $fieldsHandler->getAllFieldsByTableId($fieldMid, $t); + $xoops->tpl()->assign('fields_count', $numRowsFields); + $fields = array(); + if ($numRowsFields > 0) { + $lid = 1; + foreach (array_keys($fieldsArray) as $f) { + $field = $fieldsArray[$f]->getValues(); + $alid = array('lid' => $lid); + $fields[] = array_merge($field, $alid); + unset($field); + ++$lid; + } + unset($lid); + } + $table['fields'] = $fields; + $xoops->tpl()->appendByRef('tables', $table); + unset($table); } // Display Page Navigation - if ($numRowsTables > $limit) { - $nav = new XoopsPageNav($numRowsTables, $limit, $start, 'start'); + if ($numbRowsTables > $limit) { + $nav = new XoopsPageNav($numbRowsTables, $limit, $start, 'start'); $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); } } else { @@ -109,68 +94,102 @@ break; case 'new': - $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail'); - $adminMenu->renderButton(); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_FIELDS, 'fields.php', 'application-view-detail'); + $adminMenu->renderButton(); - $obj = $fieldsHandler->create(); - $form = $xoops->getModuleForm($obj, 'fields'); + $fieldsObj = $fieldsHandler->create(); + $form = $xoops->getModuleForm($fieldsObj, 'fields'); $xoops->tpl()->assign('form', $form->render()); break; case 'save': if (!$xoops->security()->check()) { $xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors())); - } - if ($fieldId) { - $obj = $fieldsHandler->get($fieldId); - } else { - $obj = $fieldsHandler->create(); - } + } + $fieldOrder = 0; //Form fields - $obj->setVars(array('field_mid' => $fieldMid, 'field_tid' => $fieldTid, 'field_name' => $fieldName, - 'field_numb' => $fieldNumb, 'field_type' => $_POST['field_type'], - 'field_value' => $_POST['field_value'], 'field_attribute' => $_POST['field_attribute'], - 'field_null' => $_POST['field_null'], 'field_default' => $_POST['field_default'], - 'field_key' => $_POST['field_key'], 'field_elements' => $_POST['field_elements'], - 'field_auto_increment' => (($_REQUEST['field_auto_increment'] == 1) ? '1' : '0'), - 'field_admin' => (($_REQUEST['field_admin'] == 1) ? '1' : '0'), - 'field_user' => (($_REQUEST['field_user'] == 1) ? '1' : '0'), - 'field_blocks' => (($_REQUEST['field_blocks'] == 1) ? '1' : '0'), - 'field_mainfield' => (($_REQUEST['field_mainfield'] == 1) ? '1' : '0'), - 'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'), - 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0'))); - // Save data - if ($fieldsHandler->insert($obj)) { - $xoops->redirect('fields.php', 2, TDMCreateLocale::FORMOK); - } - - $xoops->error($obj->getHtmlErrors()); + foreach($_POST['field_id'] as $key => $value) + { + if(isset($value)){ + $fieldsObj =& $fields->get($value); + } else { + $fieldsObj =& $fields->create(); + } + $order = $fieldsObj->isNew() ? $fieldOrder++ : Request::getInt('field_order'); + // Set Data + $fieldsObj->setVar( 'field_mid', $fieldMid ); + $fieldsObj->setVar( 'field_tid', $fieldTid ); + $fieldsObj->setVar( 'field_order', $order ); + $fieldsObj->setVar( 'field_name', $_POST['field_name'][$key]); + $fieldsObj->setVar( 'field_type', $_POST['field_type'][$key]); + $fieldsObj->setVar( 'field_value', $_POST['field_value'][$key]); + $fieldsObj->setVar( 'field_attribute', $_POST['field_attribute'][$key]); + $fieldsObj->setVar( 'field_null', $_POST['field_null'][$key]); + $fieldsObj->setVar( 'field_default', $_POST['field_default'][$key]); + $fieldsObj->setVar( 'field_key', $_POST['field_key'][$key]); + $fieldsObj->setVar( 'field_element', $_POST['field_element'][$key]); + $fieldsObj->setVar( 'field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_main', ($key == $_REQUEST['field_main'] ? 1 : 0)); + $fieldsObj->setVar( 'field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0); + // Insert Data + $fieldsHandler->insert($fieldsObj); + } + unset($fieldOrder); + // Get table name from field table id + $tables =& $tablesHandler->get($fieldTid); + $tableName = $tables->getVar('table_name'); + // Set field elements + if ($fieldsObj->isNew()) { + // Fields Elements Handler + $fieldelementsHandler = $helper->getFieldElementsHandler(); + $fieldelementObj =& $fieldelementsHandler->create(); + $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid ); + $fieldelementObj->setVar( 'fieldelement_tid', $fieldTid ); + $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($tableName) ); + $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($tableName) ); + // Insert new field element id for table name + if (!$fieldelementsHandler->insert($fieldelementObj) ) { + $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element'); + } + $xoops->redirect('fields.php', 2, sprintf(XoopsLocale::S_DATABASE_SAVED, $tableName)); + } else { + // Needed code from table name by field_tid + $xoops->redirect('fields.php', 2, sprintf(XoopsLocale::S_DATABASE_UPDATED, $tableName)); + } + $xoops->error($fieldsObj->getHtmlErrors()); break; case 'edit': - $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); - $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail'); + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_TABLE, 'tables.php?op=new', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_TABLES, 'tables.php', 'application-view-detail'); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_FIELDS, 'fields.php', 'application-view-detail'); $adminMenu->renderButton(); - $obj = $fieldsHandler->get($fieldTid); - $form = $xoops->getModuleForm($obj, 'fields'); + $fieldsObj = $fieldsHandler->get($fieldTid); + $form = $xoops->getModuleForm($fieldsObj, 'fields'); $xoops->tpl()->assign('form', $form->render()); break; case 'delete': if ($fieldId > 0) { - $obj = $fieldsHandler->get($fieldId); + $fieldsObj = $fieldsHandler->get($fieldId); if (isset($_POST['ok']) && $_POST['ok'] == 1) { if (!$xoops->security()->check()) { $xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors())); } - if ($fieldsHandler->delete($obj)) { + if ($fieldsHandler->delete($fieldsObj)) { $xoops->redirect('fields.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::TABLE)); } else { - $xoops->error($obj->getHtmlErrors()); + $xoops->error($fieldsObj->getHtmlErrors()); } } else { - $xoops->confirm(array('ok' => 1, 'id' => $fieldId, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('field_name')) . '<br />'); + $xoops->confirm(array('ok' => 1, 'id' => $fieldId, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $fieldsObj->getVar('field_name')) . '<br />'); } } else { $xoops->redirect('fields.php', 1, TDMCreateLocale::E_DATABASE_ERROR); Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -8,7 +8,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -use Xoops\Core\Request; /** * tdmcreate module * @@ -31,15 +30,10 @@ XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/functions.php')); // Get handler $modulesHandler = $helper->getModulesHandler(); -$tablesHandler = $helper->getTablesHandler(); -$fieldsHandler = $helper->getFieldsHandler(); -$localeHandler = $helper->getLocalesHandler(); -$importHandler = $helper->getImportsHandler(); -// Get $_POST, $_GET, $_REQUEST -$op = Request::getCmd('op'); -$start = Request::getInt('start', 0); -// Parameters -$limit = $helper->getConfig('adminpager'); +$tablesHandler = $helper->getTablesHandler(); +$fieldsHandler = $helper->getFieldsHandler(); +$localesHandler = $helper->getLocalesHandler(); +$importsHandler = $helper->getImportsHandler(); // Add Script $xoops->theme()->addScript('media/xoops/xoops.js'); $xoops->theme()->addScript('modules/system/js/admin.js'); Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -8,6 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ +use Xoops\Core\Request; /** * tdmcreate module * @@ -19,46 +20,44 @@ * @version $Id$ */ include __DIR__ . '/header.php'; +// Get $_POST, $_GET, $_REQUEST +$op = Request::getCmd('op', 'list'); +$start = Request::getInt('start', 0); +// Parameters +$limit = $helper->getConfig('adminpager'); // heaser $xoops->header('admin:tdmcreate/tdmcreate_imports.tpl'); // -//$importId = Request::getInt('import_id', 0); +$importId = Request::getInt('import_id'); // $adminMenu->renderNavigation('imports.php'); // switch ($op) { - case 'list': - $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=new', 'add'); + case 'list': + $adminMenu->addTips(TDMCreateLocale::IMPORT_TIPS); + $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=new', 'add'); + $adminMenu->renderTips(); $adminMenu->renderButton(); // Get modules list - $criteria = new CriteriaCompo(); - $criteria->setSort('import_name'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numImports = $importHandler->getCount($criteria); - $importArr = $importHandler->getAll($criteria); + $numbRowsImports = $importsHandler->getCountImports(); + $importArray = $importsHandler->getAllImports($start, $limit); // Assign Template variables - $xoops->tpl()->assign('imports_count', $numImports); + $xoops->tpl()->assign('imports_count', $numbRowsImports); unset($criteria); - if ($numImports > 0) { - foreach (array_keys($importArr) as $i) { - $import['id'] = $importArr[$i]->getVar('import_id'); - $import['mid'] = $importArr[$i]->getVar('import_mid'); - $import['name'] = $importArr[$i]->getVar('import_name'); - $import['nbtables'] = $importArr[$i]->getVar('import_nbtables'); - $import['nbfields'] = $importArr[$i]->getVar('import_nbfields'); - $xoops->tpl()->append_by_ref('imports', $import); + if ($numbRowsImports > 0) { + foreach (array_keys($importArray) as $i) { + $import = $importsHandler[$i]->getValues(); + $xoops->tpl()->appendByRef('imports', $import); unset($import); } - // Display Page Navigation - if ($numrows > $limit) { - $nav = new XoopsPageNav($numrows, $limit, $start, 'start'); + // Display Imports Navigation + if ($numbRowsImports > $limit) { + $nav = new XoopsPageNav($numbRowsImports, $limit, $start, 'start'); $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); } } else { - $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOIMPORTS); + $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_IMPORTS); } break; @@ -66,8 +65,8 @@ $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail'); $adminMenu->renderButton(); - $obj = $importHandler->create(); - $form = $xoops->getModuleForm($obj, 'import'); + $importsObj = $importsHandler->create(); + $form = $xoops->getModuleForm($importsObj, 'imports'); $xoops->tpl()->assign('form', $form->render()); break; @@ -77,26 +76,26 @@ } if ($importId > 0) { - $obj = $importHandler->get($importId); + $importsObj = $importsHandler->get($importId); //Form imported edited save - $obj->setVar('import_mid', $_POST['import_mid']); - $obj->setVar('import_name', $_POST['import_name']); - $obj->setVar('import_nbtables', $_POST['import_nbtables']); - $obj->setVar('import_tablename', $_POST['import_mid']); - $obj->setVar('import_nbfields', $_POST['import_nbfields']); - $obj->setVar('import_fieldelements', $_POST['import_fieldelements']); + $importsObj->setVar('import_mid', $_POST['import_mid']); + $importsObj->setVar('import_name', $_POST['import_name']); + $importsObj->setVar('import_nbtables', $_POST['import_nbtables']); + $importsObj->setVar('import_tablename', $_POST['import_mid']); + $importsObj->setVar('import_nbfields', $_POST['import_nbfields']); + $importsObj->setVar('import_fieldelements', $_POST['import_fieldelements']); } else { - $obj = $importHandler->create(); + $importsObj = $importsHandler->create(); //Form imported save - $obj->setVar('import_name', $_POST['import_name']); - $obj->setVar('import_mid', $_POST['import_mid']); + $importsObj->setVar('import_name', $_POST['import_name']); + $importsObj->setVar('import_mid', $_POST['import_mid']); $files = $_FILES['importfile']; // If incoming data have been entered correctly if($_POST['upload'] == XoopsLocale::A_SUBMIT && isset($files['tmp_name']) && (substr($files['name'], -4) == '.sql')) { // File recovery - $dir = TDMC_UPLOAD_PATH_FILES; - $file = $_FILES['importfile']; + $dir = TDMC_UPLOAD_PATH_FILES; + $file = $_FILES['importfile']; $tmpName = $file['tmp_name']; // Copy files to the server if (is_uploaded_file($tmpName)) { @@ -145,15 +144,15 @@ $t = 0; foreach(array_keys($resultTable) as $table) { - $obj->setVar('import_tablename', $resultTable[$table]); //$_POST['import_tablename'] - $obj->setVar('import_nbtables', $t); $t++; //$_POST['import_nbtables'] + $importsObj->setVar('import_tablename', $resultTable[$table]); //$_POST['import_tablename'] + $importsObj->setVar('import_nbtables', $t); $t++; //$_POST['import_nbtables'] if(strlen($resultTable[0]) > 0) { $f = 0; foreach(array_keys($resultFields) as $field) { - $obj->setVar('import_nbfields', $f); $f++; // $_POST['import_nbfields'] - $obj->setVar('import_fieldelements', $_POST['import_fieldelements']); + $importsObj->setVar('import_nbfields', $f); $f++; // $_POST['import_nbfields'] + $importsObj->setVar('import_fieldelements', $_POST['import_fieldelements']); } unset($f); } @@ -170,12 +169,12 @@ } } - if ($importHandler->insert($obj)) { + if ($importsHandler->insert($importsObj)) { $xoops->redirect('imports.php', 3, TDMCreateLocale::FORM_OK); } - $xoops->error($obj->getHtmlErrors()); - $form = $xoops->getModuleForm($obj, 'import'); + $xoops->error($importsObj->getHtmlErrors()); + $form = $xoops->getModuleForm($importsObj, 'import'); $xoops->tpl()->assign('form', $form->render()); break; @@ -184,25 +183,25 @@ $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail'); $adminMenu->renderButton(); - $obj = $importHandler->get($importId); - $form = $xoops->getModuleForm($obj, 'import'); + $importsObj = $importsHandler->get($importId); + $form = $xoops->getModuleForm($importsObj, 'import'); $xoops->tpl()->assign('form', $form->render()); break; case 'delete': if ($importId > 0) { - $obj = $importHandler->get($importId); + $importsObj = $importsHandler->get($importId); if (isset($_POST['ok']) && $_POST['ok'] == 1) { if (!$xoops->security()->check()) { $xoops->redirect('imports.php', 3, implode(',', $xoops->security()->getErrors())); } - if ($importHandler->delete($obj)) { + if ($importsHandler->delete($importsObj)) { $xoops->redirect('imports.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); } else { - $xoops->error($obj->getHtmlErrors()); + $xoops->error($importsObj->getHtmlErrors()); } } else { - $xoops->confirm(array('ok' => 1, 'id' => $importId, 'op' => 'delete'), 'imports.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('import_name')) . '<br />'); + $xoops->confirm(array('ok' => 1, 'id' => $importId, 'op' => 'delete'), 'imports.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $importsObj->getVar('import_name')) . '<br />'); } } else { $xoops->redirect('imports.php', 1, TDMCreateLocale::E_DATABASE_ERROR); Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -41,12 +41,12 @@ // tdmcreate modules $criteria = new CriteriaCompo(); $criteria->add(new Criteria('loc_mid', 0, '!=')); -$locale = $localeHandler->getCount($criteria); +$locale = $localesHandler->getCount($criteria); unset($criteria); // tdmcreate import $criteria = new CriteriaCompo(); $criteria->add(new Criteria('import_id', 0, '!=')); -$import = $importHandler->getCount($criteria); +$import = $importsHandler->getCount($criteria); unset($criteria); $r = "red"; $g = "green"; $modulesColor = $modules == 0 ? $r : $g; @@ -66,17 +66,21 @@ // folder path $folderPath = array( - XOOPS_UPLOAD_PATH . '/tdmcreate/', - XOOPS_UPLOAD_PATH . '/tdmcreate/files', - XOOPS_UPLOAD_PATH . '/tdmcreate/repository', - XOOPS_UPLOAD_PATH . '/tdmcreate/images', - XOOPS_UPLOAD_PATH . '/tdmcreate/images/modules', - XOOPS_UPLOAD_PATH . '/tdmcreate/images/tables' -); + TDMC_UPLOAD_PATH, + TDMC_UPLOAD_FILES_PATH, + TDMC_UPLOAD_REPOSITORY_PATH, + TDMC_UPLOAD_REPOSITORY_EXTENSIONS_PATH, + TDMC_UPLOAD_REPOSITORY_MODULES_PATH, + TDMC_UPLOAD_IMAGES_PATH, + TDMC_UPLOAD_IMAGES_EXTENSIONS_PATH, + TDMC_UPLOAD_IMAGES_MODULES_PATH, + TDMC_UPLOAD_IMAGES_TABLES_PATH + ); foreach ($folderPath as $folder) { $adminMenu->addConfigBoxLine($folder, 'folder'); $adminMenu->addConfigBoxLine(array($folder, '777'), 'chmod'); } +$adminMenu->addConfigBoxLine('thumbnail', 'service'); // extension $extensions = array('xtranslator' => 'extension'); Deleted: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -1,128 +0,0 @@ -<?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.6.0 - * @author XOOPS Development Team - * @version $Id$ - */ -include __DIR__ . '/header.php'; -// heaser -$xoops->header('admin:tdmcreate/tdmcreate_locale.tpl'); -// -//$localeId = Request::getInt('import_id', 0); -// -$adminMenu->renderNavigation('locale.php'); -// -switch ($op) -{ - case 'list': - $adminMenu->addItemButton(TDMCreateLocale::ADD_LOCALE, 'locale.php?op=new', 'add'); - $adminMenu->renderButton(); - // Get modules list - $criteria = new CriteriaCompo(); - $criteria->setSort('loc_id'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numLocale = $localeHandler->getCount($criteria); - $localeArr = $localeHandler->getAll($criteria); - // Assign Template variables - $xoops->tpl()->assign('locale_count', $numLocale); - unset($criteria); - if ($numLocale > 0) { - foreach (array_keys($localeArr) as $i) { - $locale['id'] = $localeArr[$i]->getVar('loc_id'); - $locale['mid'] = $localeArr[$i]->getVar('loc_mid'); - $locale['name'] = $localeArr[$i]->getVar('loc_file'); - $locale['define'] = $localeArr[$i]->getVar('loc_define'); - $locale['description'] = $localeArr[$i]->getVar('loc_description'); - $xoops->tpl()->append_by_ref('locale', $locale); - unset($locale); - } - // Display Page Navigation - if ($numrows > $limit) { - $nav = new XoopsPageNav($numrows, $limit, $start, 'start'); - $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); - } - } else { - $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOLOCALE); - } - break; - - case 'new': - $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locale.php', 'application-view-detail'); - $adminMenu->renderButton(); - - $obj = $localeHandler->create(); - $form = $xoops->getModuleForm($obj, 'locale'); - $xoops->tpl()->assign('form', $form->render()); - break; - - case 'save': - if (!$xoops->security()->check()) { - $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); - } - - if ($localeId > 0) { - $obj = $localeHandler->get($localeId); - //Form imported edited save - $obj->setVar('loc_mid', Request::getInt('loc_mid')); - $obj->setVar('loc_file', Request::getString('loc_file')); - $obj->setVar('loc_define', Request::getString('loc_define')); - $obj->setVar('loc_description', Request::getString('loc_description')); - $xoops->redirect('locale.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED); - } - if ($localeHandler->insert($obj)) { - $xoops->redirect('locale.php', 3, TDMCreateLocale::FORM_OK); - } - - $xoops->error($obj->getHtmlErrors()); - $form = $xoops->getModuleForm($obj, 'locale'); - $xoops->tpl()->assign('form', $form->render()); - break; - - case 'edit': - $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'locale.php?op=import', 'add'); - $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locale.php', 'application-view-detail'); - $adminMenu->renderButton(); - - $obj = $localeHandler->get($localeId); - $form = $xoops->getModuleForm($obj, 'locale'); - $xoops->tpl()->assign('form', $form->render()); - break; - - case 'delete': - if ($localeId > 0) { - $obj = $localeHandler->get($localeId); - if (isset($_POST['ok']) && $_POST['ok'] == 1) { - if (!$xoops->security()->check()) { - $xoops->redirect('locale.php', 3, implode(',', $xoops->security()->getErrors())); - } - if ($localeHandler->delete($obj)) { - $xoops->redirect('locale.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); - } else { - $xoops->error($obj->getHtmlErrors()); - } - } else { - $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locale.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('loc_file')) . '<br />'); - } - } else { - $xoops->redirect('locale.php', 1, TDMCreateLocale::E_DATABASE_ERROR); - } - break; -} - -include __DIR__ . '/footer.php'; \ No newline at end of file Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -0,0 +1,127 @@ +<?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. +*/ +use Xoops\Core\Request; +/** + * 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.6.0 + * @author XOOPS Development Team + * @version $Id$ + */ +include __DIR__ . '/header.php'; +// Get $_POST, $_GET, $_REQUEST +$op = Request::getCmd('op', 'list'); +$start = Request::getInt('start', 0); +// Parameters +$limit = $helper->getConfig('adminpager'); +// heaser +$xoops->header('admin:tdmcreate/tdmcreate_locales.tpl'); +// +$localeId = Request::getInt('loc_id', 0); +// +$adminMenu->renderNavigation('locale.php'); +// +switch ($op) +{ + case 'list': + $adminMenu->addTips(TDMCreateLocale::LOCALE_TIPS); + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_LOCALE, 'locales.php?op=new', 'add'); + $adminMenu->renderTips(); + $adminMenu->renderButton(); + // + $numbRowsLocales = $localesHandler->getCountLocales(); + $localesArray = $localesHandler->getAllLocales($start, $limit); + // Assign Template variables + $xoops->tpl()->assign('locale_count', $numbRowsLocales); + unset($criteria); + if ($numbRowsLocales > 0) { + foreach (array_keys($localesArray) as $i) { + $locale = $localesHandler->getVars(); + $xoops->tpl()->appendByRef('locales', $locale); + unset($locale); + } + // Display Page Navigation + if ($numbRowsLocales > $limit) { + $nav = new XoopsPageNav($numbRowsLocales, $limit, $start, 'start'); + $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); + } + } else { + $xoops->tpl()->assign('error_message', TDMCreateLocale::E_NO_LOCALES); + } + break; + + case 'new': + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_LOCALE, 'locales.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $localesObj = $localesHandler->create(); + $form = $xoops->getModuleForm($localesObj, 'locales'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'save': + if (!$xoops->security()->check()) { + $xoops->redirect('locales.php', 3, implode(',', $xoops->security()->getErrors())); + } + + if ($localeId > 0) { + $localesObj = $localesHandler->get($localeId); + //Form imported edited save + $localesObj->setVar('loc_mid', Request::getInt('loc_mid')); + $localesObj->setVar('loc_file', Request::getString('loc_file')); + $localesObj->setVar('loc_define', Request::getString('loc_define')); + $localesObj->setVar('loc_description', Request::getString('loc_description')); + $xoops->redirect('locales.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED); + } + if ($localesHandler->insert($localesObj)) { + $xoops->redirect('locales.php', 3, TDMCreateLocale::FORM_OK); + } + + $xoops->error($localesObj->getHtmlErrors()); + $form = $xoops->getModuleForm($localesObj, 'locales'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'edit': + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_LOCALE, 'locales.php?op=new', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_LOCALE, 'locales.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $localesObj = $localesHandler->get($localeId); + $form = $xoops->getModuleForm($localesObj, 'locales'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'delete': + if ($localeId > 0) { + $localesObj = $localesHandler->get($localeId); + if (isset($_POST['ok']) && $_POST['ok'] == 1) { + if (!$xoops->security()->check()) { + $xoops->redirect('locales.php', 3, implode(',', $xoops->security()->getErrors())); + } + if ($localesHandler->delete($localesObj)) { + $xoops->redirect('locales.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); + } else { + $xoops->error($localesObj->getHtmlErrors()); + } + } else { + $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locales.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $localesObj->getVar('loc_file')) . '<br />'); + } + } else { + $xoops->redirect('locales.php', 1, TDMCreateLocale::E_DATABASE_ERROR); + } + break; +} + +include __DIR__ . '/footer.php'; \ No newline at end of file Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -37,7 +37,7 @@ $adminmenu[$i]['icon'] = 'editfields.png'; $i++; $adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU5; -$adminmenu[$i]['link'] = 'admin/locale.php'; +$adminmenu[$i]['link'] = 'admin/locales.php'; $adminmenu[$i]['icon'] = 'languages.png'; $i++; $adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6; Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -8,6 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ +use Xoops\Core\Request; /** * tdmcreate module * @@ -19,8 +20,13 @@ * @version $Id: modules.php 10665 2012-12-27 10:14:15Z timgno $ */ include __DIR__ . '/header.php'; +// Get $_POST, $_GET, $_REQUEST +$op = Request::getCmd('op', 'list'); +$start = Request::getInt('start', 0); +// Parameters +$limit = $helper->getConfig('adminpager'); // Get Action type -//$modId = Request::getInt('mod_id'); +$modId = Request::getInt('mod_id'); // Get handler $xoops->header('admin:tdmcreate/tdmcreate_modules.tpl'); $adminMenu->renderNavigation('modules.php'); @@ -28,39 +34,31 @@ { case 'list': default: - $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add'); + $adminMenu->addTips(TDMCreateLocale::MODULE_TIPS); + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_MODULE, 'modules.php?op=new', 'add'); + $adminMenu->renderTips(); $adminMenu->renderButton(); + $xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/styles.css'); + $xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js'); // Get modules list - $criteria = new CriteriaCompo(); - $criteria->setSort('mod_name'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numRowsMods = $modulesHandler->getCount($criteria); - $modulesArray = $modulesHandler->getAll($criteria); + $numbRowsMods = $modulesHandler->getCountModules(); + $modulesArray = $modulesHandler->getAllModules($start, $limit); + // Redirect if there aren't modules + if ( $numbRowsMods == 0 ) { + $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOT_MODULES ); + } // Assign Template variables - $xoops->tpl()->assign('modules_count', $numRowsMods); - unset($criteria); - if ($numRowsMods > 0) { + $xoops->tpl()->assign('modules_count', $numbRowsMods); + $xoops->tpl()->assign('modPathIcon16', TDMC_URL . '/assets/icons/16'); + if ($numbRowsMods > 0) { foreach (array_keys($modulesArray) as $i) { - $mod['id'] = $modulesArray[$i]->getVar('mod_id'); - $mod['name'] = $modulesArray[$i]->getVar('mod_name'); - $mod['version'] = $modulesArray[$i]->getVar('mod_version'); - $mod['image'] = $modulesArray[$i]->getVar('mod_image'); - $mod['release'] = $modulesArray[$i]->getVar('mod_release'); - $mod['status'] = $modulesArray[$i]->getVar('mod_status'); - $mod['admin'] = $modulesArray[$i]->getVar('mod_admin'); - $mod['user'] = $modulesArray[$i]->getVar('mod_user'); - $mod['submenu'] = $modulesArray[$i]->getVar('mod_submenu'); - $mod['search'] = $modulesArray[$i]->getVar('mod_search'); - $mod['comments'] = $modulesArray[$i]->getVar('mod_comments'); - $mod['notifications'] = $modulesArray[$i]->getVar('mod_notifications'); - $xoops->tpl()->append_by_ref('modules', $mod); - unset($mod); + $module = $modulesArray[$i]->getValues(); + $xoops->tpl()->appendByRef('modules', $module); + unset($module); } // Display Page Navigation - if ($numRowsMods > $limit) { - $nav = new XoopsPageNav($numRowsMods, $limit, $start, 'start'); + if ($numbRowsMods > $limit) { + $nav = new XoopsPageNav($numbRowsMods, $limit, $start, 'start'); $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); } } else { @@ -80,33 +78,32 @@ case 'save': if (!$xoops->security()->check()) { $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); - } - $modId = Request::getInt('mod_id', 0); + } if ($modId > 0) { $modulesObj = $modulesHandler->get($modId); } else { $modulesObj = $modulesHandler->create(); } //Form module save - $modulesObj->setVars(array('mod_name' => Request::getString('mod_name', ''), - 'mod_isextension' => Request::getInt('mod_isextension', 0), - 'mod_version' => Request::getString('mod_version', ''), - 'mod_description' => Request::getString('mod_description', ''), - 'mod_author' => Request::getString('mod_author', ''), - 'mod_author_mail' => Request::getString('mod_author_mail', ''), - 'mod_author_website_url' => Request::getString('mod_author_website_url', ''), - 'mod_author_website_name' => Request::getString('mod_author_website_name', ''), - 'mod_credits' => Request::getString('mod_credits', ''), - 'mod_license' => Request::getString('mod_license', ''), - 'mod_release_info' => Request::getString('mod_release_info', ''), - 'mod_release_file' => Request::getString('mod_release_file', ''), - 'mod_manual' => Request::getString('mod_manual', ''), - 'mod_manual_file' => Request::getString('mod_manual_file', ''))); + $modulesObj->setVars(array( 'mod_name' => Request::getString('mod_name', ''), + 'mod_dirname' => Request::getString('mod_dirname', ''), + 'mod_version' => Request::getString('mod_version', ''), + 'mod_description' => Request::getString('mod_description', ''), + 'mod_author' => Request::getString('mod_author', ''), + 'mod_author_mail' => Request::getString('mod_author_mail', ''), + 'mod_author_website_url' => Request::getString('mod_author_website_url', ''), + 'mod_author_website_name' => Request::getString('mod_author_website_name', ''), + 'mod_credits' => Request::getString('mod_credits', ''), + 'mod_license' => Request::getString('mod_license', ''), + 'mod_release_info' => Request::getString('mod_release_info', ''), + 'mod_release_file' => Request::getString('mod_release_file', ''), + 'mod_manual' => Request::getString('mod_manual', ''), + 'mod_manual_file' => Request::getString('mod_manual_file', ''))); //Form module_image - $uploader = new XoopsMediaUploader( TDMC_MODULES_PATH_IMG, $helper->getConfig('mimetypes'), + $uploader = new XoopsMediaUploader( TDMC_UPLOAD_IMAGES_MODULES_PATH, $helper->getConfig('mimetypes'), $helper->getConfig('maxuploadsize'), null, null); if ($uploader->fetchMedia('xoops_upload_file')) { - $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['xoops_upload_file']['name']); + $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['modules_image']['name']); $imageName = 'logo.'.$extension; $uploader->setPrefix($imageName); $uploader->fetchMedia('xoops_upload_file'); @@ -130,16 +127,19 @@ 'mod_support_name' => Request::getString('mod_support_name', ''), 'mod_website_url' => Request::getString('mod_website_url', ''), 'mod_website_name' => Request::getString('mod_website_name', ''), - 'mod_release' => Request::getString('mod_release', ''), + 'mod_release' => strtotime(Request::getString('mod_release', '')), 'mod_status' => Request::getString('mod_status', ''), + 'mod_isextension' => Request::getInt('mod_isextension', 0), 'mod_admin' => Request::getInt('mod_admin', 0), 'mod_user' => Request::getInt('mod_user', 0), 'mod_submenu' => Request::getInt('mod_submenu', 0), 'mod_search' => Request::getInt('mod_search', 0), 'mod_comments' => Request::getInt('mod_comments', 0), - 'mod_notifications' => Request::getInt('mod_notifications', 0), + 'mod_notifications' => Request::getInt('mod_notifications', 0), + 'mod_permissions' => Request::getInt('mod_permissions', 0), 'mod_paypal' => Request::getString('mod_paypal', ''), - 'mod_subversion' => Request::getString('mod_subversion', ''))); + 'mod_subversion' => Request::getString('mod_subversion', ''), + 'mod_inroot_copy' => Request::getString('mod_inroot_copy', ''))); // Insert Data if ($modulesHandler->insert($modulesObj)) { $xoops->redirect('modules.php', 2, XoopsLocale::S_DATA_INSERTED); @@ -151,10 +151,9 @@ break; case 'edit': - $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add'); - $adminMenu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail'); + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_MODULE, 'modules.php?op=new', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::A_LIST_MODULES, 'modules.php', 'application-view-detail'); $adminMenu->renderButton(); - $modId = Request::getInt('mod_id', 0); if ($modId > 0) { $modulesObj = $modulesHandler->get($modId); $form = $helper->getForm($modulesObj, 'modules'); @@ -165,7 +164,6 @@ break; case 'delete': - $modId = Request::getInt('mod_id', 0); if ($modId > 0) { $modulesObj = $modulesHandler->get($modId); if (isset($_POST['ok']) && $_POST['ok'] == 1) { Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2015-05-11 13:03:29 UTC (rev 13060) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2015-05-15 12:00:25 UTC (rev 13061) @@ -8,6 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ +use Xoops\Core\Request; /** * tdmcreate module * @@ -19,8 +20,13 @@ * @version $Id: tables.php 10665 2012-12-27 10:14:15Z timgno $ */ include __DIR__ . '/header.php'; +// Get $_POST, $_GET, $_REQUEST +$op = Request::getCmd('op', 'list'); +$start = Request::getInt('start', 0); +// Parameters +$limit = $helper->getConfig('adminpager'); // Preferences Limit -//$tableId = Request::getInt('table_id', 0); +$tableId = Request::getInt('table_id', 0); // header $xoops->header('admin:tdmcreate/tdmcreate_tables.tpl'); // @@ -30,79 +36,52 @@ { case 'list': default: - $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); - $adminMenu->renderButton(); + $adminMenu->addTips(TDMCreateLocale::TABLE_TIPS); + $adminMenu->addItemButton(TDMCreateLocale::A_ADD_TABLE, 'tables.php?op=new', 'add'); + $adminMenu->renderTips(); + $adminMenu->renderButton(); + $xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/styles.css'); + $xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js'); + $xoops->theme()->addScript('modules/tdmcreate/assets/js/sortable.js'); // Get modules list - $criteria = new CriteriaCompo(); - $criteria->setSort('mod_name'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numRowsMods = $modulesHandler->getCount($criteria); - $moduleArray = $modulesHandler->getAll($criteria); - $xoops->tpl()->assign('modules_count', $numRowsMods); - $xoops->tpl()->assign('mimg_path', TDMC_MODULES_URL_IMG); - unset($criteria); + $numbRowsMods = $modulesHandler->getCountModules(); + $modulesArray = $modulesHandler->getAllModules($start, $limit); + $xoops->tpl()->assign('modules_count', $numbRowsMods); + $xoops->tpl()->assign('modules_images_url', TDMC_UPLOAD_IMAGES_MODULES_URL); + $xoops->tpl()->assign('modPathIcon16', TDMC_URL . '/assets/icons/16'); // Redirect if there aren't modules - /*if ( $numRowsMods == 0 ) { - $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES ); - }*/ + if ( $numbRowsMods == 0 ) { + $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOT_MODULES ); + } // Assign Template variables - $xoops->tpl()->assign('mods_count', $numRowsMods); - if ($numRowsMods > 0) { - foreach (array_keys($moduleArray) as $i) { - $mod['id'] = $moduleArray[$i]->getVar('mod_id'); - $mod['name'] = $moduleArray[$i]->getVar('mod_name'); - $mod['image'] = $moduleArray[$i]->getVar('mod_image'); - $mod['admin'] = $moduleArray[$i]->getVar('mod_admin'); - $mod['user'] = $moduleArray[$i]->getVar('mod_user'); - $mod['submenu'] = $moduleArray[$i]->getVar('mod_submenu'); - $mod['search'] = $moduleArray[$i]->getVar('mod_search'); - $mod['comments'] = $moduleArray[$i]->getVar('mod_comments'); - $mod['notifications'] = $moduleArray[$i]->getVar('mod_notifications'); - /*if (file_exists($timage = XOOPS_URL ."/uploads/tdmcreate/images/tables/".$table_image)) { - $table['image'] = $timage; - } elseif (file_exists($timage = XOOPS_URL ."/media/xoops/images/icons/32/".$table_image)) { - $table['image'] = $timage; - }*/ - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('table_mid', $i)); - $criteria->setSort('table_name'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numRowsTables = $tablesHandler->getCount($criteria); - $tablesArray = $tablesHandler->getAll($criteria); - $xoops->tpl()->assign('tables_count', $numRowsTables); - $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG); - unset($criteria); - $tables = array(); - if ($numRowsTables > 0) { - foreach (array_keys($tablesArray) as $i) + if ($numbRowsMods > 0) { + foreach (array_keys($modulesArray) as $m) { + $module = $modulesArray[$m]->getValues(); + $numbRowsTables = $tablesHandler->getCountTables(); + $tablesArray = $tablesHandler->getAllTablesByModuleId($m, $start, $limit); + $xoops->tpl()->assign('tables_count', $numbRowsTables); + $xoops->tpl()->assign('tables_images_url', TDMC_UPLOAD_IMAGES_TABLES_URL); + $tables = array(); + + if ($numbRowsTables > 0) { + $lid = 1; + foreach (array_keys($tablesArr... [truncated message content] |
From: <txm...@us...> - 2015-05-11 13:03:31
|
Revision: 13060 http://sourceforge.net/p/xoops/svn/13060 Author: txmodxoops Date: 2015-05-11 13:03:29 +0000 (Mon, 11 May 2015) Log Message: ----------- Fixings and updates Modified Paths: -------------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl Added Paths: ----------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/schema.yml Removed Paths: ------------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -0,0 +1,128 @@ +<?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.6.0 + * @author XOOPS Development Team + * @version $Id$ + */ +include __DIR__ . '/header.php'; +// heaser +$xoops->header('admin:tdmcreate/tdmcreate_locale.tpl'); +// +//$localeId = Request::getInt('import_id', 0); +// +$adminMenu->renderNavigation('locale.php'); +// +switch ($op) +{ + case 'list': + $adminMenu->addItemButton(TDMCreateLocale::ADD_LOCALE, 'locale.php?op=new', 'add'); + $adminMenu->renderButton(); + // Get modules list + $criteria = new CriteriaCompo(); + $criteria->setSort('loc_id'); + $criteria->setOrder('ASC'); + $criteria->setStart($start); + $criteria->setLimit($limit); + $numLocale = $localeHandler->getCount($criteria); + $localeArr = $localeHandler->getAll($criteria); + // Assign Template variables + $xoops->tpl()->assign('locale_count', $numLocale); + unset($criteria); + if ($numLocale > 0) { + foreach (array_keys($localeArr) as $i) { + $locale['id'] = $localeArr[$i]->getVar('loc_id'); + $locale['mid'] = $localeArr[$i]->getVar('loc_mid'); + $locale['name'] = $localeArr[$i]->getVar('loc_file'); + $locale['define'] = $localeArr[$i]->getVar('loc_define'); + $locale['description'] = $localeArr[$i]->getVar('loc_description'); + $xoops->tpl()->append_by_ref('locale', $locale); + unset($locale); + } + // Display Page Navigation + if ($numrows > $limit) { + $nav = new XoopsPageNav($numrows, $limit, $start, 'start'); + $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); + } + } else { + $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOLOCALE); + } + break; + + case 'new': + $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locale.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $obj = $localeHandler->create(); + $form = $xoops->getModuleForm($obj, 'locale'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'save': + if (!$xoops->security()->check()) { + $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); + } + + if ($localeId > 0) { + $obj = $localeHandler->get($localeId); + //Form imported edited save + $obj->setVar('loc_mid', Request::getInt('loc_mid')); + $obj->setVar('loc_file', Request::getString('loc_file')); + $obj->setVar('loc_define', Request::getString('loc_define')); + $obj->setVar('loc_description', Request::getString('loc_description')); + $xoops->redirect('locale.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED); + } + if ($localeHandler->insert($obj)) { + $xoops->redirect('locale.php', 3, TDMCreateLocale::FORM_OK); + } + + $xoops->error($obj->getHtmlErrors()); + $form = $xoops->getModuleForm($obj, 'locale'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'edit': + $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'locale.php?op=import', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locale.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $obj = $localeHandler->get($localeId); + $form = $xoops->getModuleForm($obj, 'locale'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'delete': + if ($localeId > 0) { + $obj = $localeHandler->get($localeId); + if (isset($_POST['ok']) && $_POST['ok'] == 1) { + if (!$xoops->security()->check()) { + $xoops->redirect('locale.php', 3, implode(',', $xoops->security()->getErrors())); + } + if ($localeHandler->delete($obj)) { + $xoops->redirect('locale.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); + } else { + $xoops->error($obj->getHtmlErrors()); + } + } else { + $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locale.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('loc_file')) . '<br />'); + } + } else { + $xoops->redirect('locale.php', 1, TDMCreateLocale::E_DATABASE_ERROR); + } + break; +} + +include __DIR__ . '/footer.php'; \ No newline at end of file Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locale.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Deleted: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -1,128 +0,0 @@ -<?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.6.0 - * @author XOOPS Development Team - * @version $Id$ - */ -include __DIR__ . '/header.php'; -// heaser -$xoops->header('admin:tdmcreate/tdmcreate_locale.tpl'); -// -//$localeId = Request::getInt('import_id', 0); -// -$adminMenu->renderNavigation('locales.php'); -// -switch ($op) -{ - case 'list': - $adminMenu->addItemButton(TDMCreateLocale::ADD_LOCALE, 'locales.php?op=new', 'add'); - $adminMenu->renderButton(); - // Get modules list - $criteria = new CriteriaCompo(); - $criteria->setSort('loc_id'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numLocale = $localeHandler->getCount($criteria); - $localeArr = $localeHandler->getAll($criteria); - // Assign Template variables - $xoops->tpl()->assign('locale_count', $numLocale); - unset($criteria); - if ($numLocale > 0) { - foreach (array_keys($localeArr) as $i) { - $locale['id'] = $localeArr[$i]->getVar('loc_id'); - $locale['mid'] = $localeArr[$i]->getVar('loc_mid'); - $locale['name'] = $localeArr[$i]->getVar('loc_file'); - $locale['define'] = $localeArr[$i]->getVar('loc_define'); - $locale['description'] = $localeArr[$i]->getVar('loc_description'); - $xoops->tpl()->append_by_ref('locales', $locale); - unset($locale); - } - // Display Page Navigation - if ($numrows > $limit) { - $nav = new XoopsPageNav($numrows, $limit, $start, 'start'); - $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); - } - } else { - $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOLOCALE); - } - break; - - case 'new': - $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locales.php', 'application-view-detail'); - $adminMenu->renderButton(); - - $obj = $localeHandler->create(); - $form = $xoops->getModuleForm($obj, 'locales'); - $xoops->tpl()->assign('form', $form->render()); - break; - - case 'save': - if (!$xoops->security()->check()) { - $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); - } - - if ($localeId > 0) { - $obj = $localeHandler->get($localeId); - //Form imported edited save - $obj->setVar('loc_mid', Request::getInt('loc_mid')); - $obj->setVar('loc_file', Request::getString('loc_file')); - $obj->setVar('loc_define', Request::getString('loc_define')); - $obj->setVar('loc_description', Request::getString('loc_description')); - $xoops->redirect('locales.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED); - } - if ($localeHandler->insert($obj)) { - $xoops->redirect('locales.php', 3, TDMCreateLocale::FORM_OK); - } - - $xoops->error($obj->getHtmlErrors()); - $form = $xoops->getModuleForm($obj, 'locales'); - $xoops->tpl()->assign('form', $form->render()); - break; - - case 'edit': - $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'locales.php?op=import', 'add'); - $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locales.php', 'application-view-detail'); - $adminMenu->renderButton(); - - $obj = $localeHandler->get($localeId); - $form = $xoops->getModuleForm($obj, 'locales'); - $xoops->tpl()->assign('form', $form->render()); - break; - - case 'delete': - if ($localeId > 0) { - $obj = $localeHandler->get($localeId); - if (isset($_POST['ok']) && $_POST['ok'] == 1) { - if (!$xoops->security()->check()) { - $xoops->redirect('locales.php', 3, implode(',', $xoops->security()->getErrors())); - } - if ($localeHandler->delete($obj)) { - $xoops->redirect('locales.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); - } else { - $xoops->error($obj->getHtmlErrors()); - } - } else { - $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locales.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('loc_file')) . '<br />'); - } - } else { - $xoops->redirect('locales.php', 1, TDMCreateLocale::E_DATABASE_ERROR); - } - break; -} - -include __DIR__ . '/footer.php'; \ No newline at end of file Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -37,7 +37,7 @@ $adminmenu[$i]['icon'] = 'editfields.png'; $i++; $adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU5; -$adminmenu[$i]['link'] = 'admin/locales.php'; +$adminmenu[$i]['link'] = 'admin/locale.php'; $adminmenu[$i]['icon'] = 'languages.png'; $i++; $adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6; Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -0,0 +1,41 @@ +<?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.6.0 + * @author Timgno <txm...@gm...> + * @version $Id$ + */ + +class TDMCreateLocaleForm extends Xoops\Form\ThemeForm +{ + /** + * @param TDMCreateLocale|XoopsObject $obj + */ + public function __construct(TDMCreateLocale &$obj) + { + $xoops = Xoops::getInstance(); + + $title = $obj->isNew() ? TDMCreateLocale::A_ADD_LOCALE : PageLocale::A_EDIT_LOCALE; + parent::__construct($title, 'form', 'locale.php', 'post', true); + + $this->addElement(new XoopsFormText(XoopsLocale::LOCALE_FILE_NAME, 'loc_file', 50, 255, $obj->getVar('loc_file')), true); + $this->addElement(new XoopsFormText(XoopsLocale::LOCALE_DEFINE, 'loc_define', 50, 255, $obj->getVar('loc_define')), true); + $this->addElement(new XoopsFormText(XoopsLocale::LOCALE_DESCRIPTION, 'loc_description', 50, 255, $obj->getVar('loc_description')), true); + + $this->addElement(new XoopsFormHidden('op', 'save' ) ); + $this->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit' ) ); + } +} \ No newline at end of file Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locale.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Deleted: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -1,41 +0,0 @@ -<?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.6.0 - * @author Timgno <txm...@gm...> - * @version $Id$ - */ - -class TDMCreateLocalesForm extends Xoops\Form\ThemeForm -{ - /** - * @param TDMCreateLocale|XoopsObject $obj - */ - public function __construct(TDMCreateLocales &$obj) - { - $xoops = Xoops::getInstance(); - - $title = $obj->isNew() ? TDMCreateLocale::A_ADD_LOCALE : PageLocale::A_EDIT_LOCALE; - parent::__construct($title, 'form', 'locales.php', 'post', true); - - $this->addElement(new XoopsFormText(XoopsLocale::LOCALE_FILE_NAME, 'loc_file', 50, 255, $obj->getVar('loc_file')), true); - $this->addElement(new XoopsFormText(XoopsLocale::LOCALE_DEFINE, 'loc_define', 50, 255, $obj->getVar('loc_define')), true); - $this->addElement(new XoopsFormText(XoopsLocale::LOCALE_DESCRIPTION, 'loc_description', 50, 255, $obj->getVar('loc_description')), true); - - $this->addElement(new XoopsFormHidden('op', 'save' ) ); - $this->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit' ) ); - } -} \ No newline at end of file Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -64,11 +64,11 @@ } /** - * @return TDMCreateTDMCreate_localesHandler + * @return TDMCreateTDMCreate_localeHandler */ - public function getLocalesHandler() + public function getLocaleHandler() { - return $this->getHandler('locales'); + return $this->getHandler('locale'); } /** Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -0,0 +1,51 @@ +<?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. +*/ +use Xoops\Core\Database\Connection; +/** + * 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.6.0 + * @author Timgno <txm...@gm...> + * @version $Id$ + */ +/** + * Class TDMCreateLocale + */ +class TDMCreateLocale extends XoopsObject +{ + /** + * Constructor + */ + public function __construct() + { + $this->initVar('loc_id',XOBJ_DTYPE_INT); + $this->initVar('loc_mid',XOBJ_DTYPE_INT); + $this->initVar('loc_file',XOBJ_DTYPE_TXTBOX); + $this->initVar('loc_define',XOBJ_DTYPE_TXTBOX); + $this->initVar('loc_description',XOBJ_DTYPE_TXTBOX); + } +} +/** + * Class TDMCreateLocaleHandler + */ +class TDMCreateLocaleHandler extends XoopsPersistableObjectHandler +{ + /** + * @param null|Connection $db + */ + public function __construct(Connection $db = null) + { + parent::__construct($db, 'tdmcreate_locale', 'tdmcreatelocale', 'loc_id', 'loc_mid'); + } +} Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locale.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Deleted: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php 2015-05-11 13:03:29 UTC (rev 13060) @@ -1,51 +0,0 @@ -<?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. -*/ -use Xoops\Core\Database\Connection; -/** - * 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.6.0 - * @author Timgno <txm...@gm...> - * @version $Id$ - */ -/** - * Class TDMCreateLocales - */ -class TDMCreateLocales extends XoopsObject -{ - /** - * Constructor - */ - public function __construct() - { - $this->initVar('loc_id',XOBJ_DTYPE_INT); - $this->initVar('loc_mid',XOBJ_DTYPE_INT); - $this->initVar('loc_file',XOBJ_DTYPE_TXTBOX); - $this->initVar('loc_define',XOBJ_DTYPE_TXTBOX); - $this->initVar('loc_description',XOBJ_DTYPE_TXTBOX); - } -} -/** - * Class TDMCreateLocalesHandler - */ -class TDMCreateLocalesHandler extends XoopsPersistableObjectHandler -{ - /** - * @param null|Connection $db - */ - public function __construct(Connection $db = null) - { - parent::__construct($db, 'tdmcreate_locales', 'tdmcreatelocales', 'loc_id', 'loc_mid'); - } -} Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql 2015-05-11 13:03:29 UTC (rev 13060) @@ -143,7 +143,7 @@ # Table structure for table `tdmcreate_languages` 5 # -CREATE TABLE `tdmcreate_locales` ( +CREATE TABLE `tdmcreate_locale` ( `loc_id` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT, `loc_mid` INT(5) UNSIGNED NOT NULL DEFAULT '0', `loc_file` VARCHAR(255) NOT NULL DEFAULT '', Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/schema.yml =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/schema.yml (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/schema.yml 2015-05-11 13:03:29 UTC (rev 13060) @@ -0,0 +1,456 @@ +tables: + profile_category: + options: { } + columns: + cat_id: + name: cat_id + type: smallint + default: null + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: true + columnDefinition: null + comment: '' + cat_title: + name: cat_title + type: string + default: '' + notnull: true + length: 255 + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + cat_description: + name: cat_description + type: text + default: null + notnull: false + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + cat_weight: + name: cat_weight + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + indexes: + PRIMARY: + name: PRIMARY + columns: [cat_id] + unique: true + primary: true + profile_field: + options: { } + columns: + field_id: + name: field_id + type: integer + default: null + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: true + columnDefinition: null + comment: '' + cat_id: + name: cat_id + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_type: + name: field_type + type: string + default: '' + notnull: true + length: 30 + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + field_valuetype: + name: field_valuetype + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_name: + name: field_name + type: string + default: '' + notnull: true + length: 255 + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + field_title: + name: field_title + type: string + default: '' + notnull: true + length: 255 + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + field_description: + name: field_description + type: text + default: null + notnull: false + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + field_required: + name: field_required + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_maxlength: + name: field_maxlength + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_weight: + name: field_weight + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_default: + name: field_default + type: text + default: null + notnull: false + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + field_notnull: + name: field_notnull + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_edit: + name: field_edit + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_show: + name: field_show + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_config: + name: field_config + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + field_options: + name: field_options + type: text + default: null + notnull: false + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + step_id: + name: step_id + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + indexes: + PRIMARY: + name: PRIMARY + columns: [field_id] + unique: true + primary: true + field_name: + name: field_name + columns: [field_name] + unique: true + primary: false + step: + name: step + columns: [step_id, field_weight] + unique: false + primary: false + profile_profile: + options: { } + columns: + profile_id: + name: profile_id + type: integer + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + indexes: + PRIMARY: + name: PRIMARY + columns: [profile_id] + unique: true + primary: true + profile_regstep: + options: { } + columns: + step_id: + name: step_id + type: smallint + default: null + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: true + columnDefinition: null + comment: '' + step_name: + name: step_name + type: string + default: '' + notnull: true + length: 255 + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + step_desc: + name: step_desc + type: text + default: null + notnull: false + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: false + autoincrement: false + columnDefinition: null + comment: '' + step_order: + name: step_order + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + step_save: + name: step_save + type: boolean + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + indexes: + PRIMARY: + name: PRIMARY + columns: [step_id] + unique: true + primary: true + sort: + name: sort + columns: [step_order, step_name] + unique: false + primary: false + profile_visibility: + options: { } + columns: + field_id: + name: field_id + type: integer + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + user_group: + name: user_group + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + profile_group: + name: profile_group + type: smallint + default: '0' + notnull: true + length: null + precision: 10 + scale: 0 + fixed: false + unsigned: true + autoincrement: false + columnDefinition: null + comment: '' + indexes: + PRIMARY: + name: PRIMARY + columns: [field_id, user_group, profile_group] + unique: true + primary: true + visible: + name: visible + columns: [user_group, profile_group] + unique: false + primary: false Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl 2015-05-08 09:59:39 UTC (rev 13059) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl 2015-05-11 13:03:29 UTC (rev 13060) @@ -14,17 +14,17 @@ </tr> </thead> <tbody> - <{foreach item=locale from=$locales}> + <{foreach item=loc from=$locale}> <tr class="<{cycle values='even,odd'}>"> - <td class='txtcenter'><{$locale.id}></td> - <td class='txtcenter'><{$locale.mid}></td> - <td class='txtcenter'><{$locale.file}></td> - <td class='txtcenter'><{$locale.define}></td> - <td class='txtcenter'><{$locale.description}></td> + <td class='txtcenter'><{$loc.id}></td> + <td class='txtcenter'><{$loc.mid}></td> + <td class='txtcenter'><{$loc.file}></td> + <td class='txtcenter'><{$loc.define}></td> + <td class='txtcenter'><{$loc.description}></td> <td class='xo-actions txtcenter width6'> - <a href='locale.php?op=edit&id=<{$locale.id}>' title='<{translate key="A_EDIT"}>'> + <a href='locale.php?op=edit&id=<{$loc.id}>' title='<{translate key="A_EDIT"}>'> <img src="<{xoAdminIcons 'edit.png'}>" alt='<{translate key="A_EDIT"}>' /></a> - <a href='locale.php?op=delete&id=<{$locale.id}>' title='<{translate key="A_DELETE"}>'> + <a href='locale.php?op=delete&id=<{$loc.id}>' title='<{translate key="A_DELETE"}>'> <img src="<{xoAdminIcons 'delete.png'}>" alt='<{translate key="A_DELETE"}>' /></a> </td> </tr> |
From: <txm...@us...> - 2015-05-08 09:59:41
|
Revision: 13059 http://sourceforge.net/p/xoops/svn/13059 Author: txmodxoops Date: 2015-05-08 09:59:39 +0000 (Fri, 08 May 2015) Log Message: ----------- Added format date strings Modified Paths: -------------- XoopsCore/branches/2.6.x/2.6.0_timgno/htdocs/locale/en_US/en_US.php Modified: XoopsCore/branches/2.6.x/2.6.0_timgno/htdocs/locale/en_US/en_US.php =================================================================== --- XoopsCore/branches/2.6.x/2.6.0_timgno/htdocs/locale/en_US/en_US.php 2015-05-06 14:56:29 UTC (rev 13058) +++ XoopsCore/branches/2.6.x/2.6.0_timgno/htdocs/locale/en_US/en_US.php 2015-05-08 09:59:39 UTC (rev 13059) @@ -802,6 +802,12 @@ const L_DAY_THURSDAY = "Thursday"; const L_DAY_TUESDAY = "Tuesday"; const L_DAY_WEDNESDAY = "Wednesday"; + const L_FORMAT_DATE_STRING = "Y/n/j G:i:s"; + const L_FORMAT_MEDIUM_DATE_STRING = "Y/n/j G:i"; + const L_FORMAT_SHORT_DATE_STRING = "m/d/Y"; + const L_FORMAT_DB_DATE_STRING = "Y-m-d"; + const L_FORMAT_DB_TIME_STRING = "H:i:s"; + const L_FORMAT_DB_TIMESTAMP_STRING = "Y-m-d H:i:s"; const L_MONTH_APRIL = "April"; const L_MONTH_AUGUST = "August"; const L_MONTH_DECEMBER = "December"; |
From: <txm...@us...> - 2015-05-06 14:56:33
|
Revision: 13058 http://sourceforge.net/p/xoops/svn/13058 Author: txmodxoops Date: 2015-05-06 14:56:29 +0000 (Wed, 06 May 2015) Log Message: ----------- Fixings and updates Modified Paths: -------------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldattributes.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldelements.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldkey.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldnull.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fieldtype.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/helper.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/structure.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/common.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/install.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/locale/en_US/en_US.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php Added Paths: ----------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/css/styles.css XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/fonts/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/fonts/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/blocks.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/editfields.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/fields.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/green.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/nb_fields.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/red.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/16/yellow.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/addmodule.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/addtable.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/builder.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/dashboard.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/editfields.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/edittable.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/extensions.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/32/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/logo_large.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/icons/logo_small.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/default_slogo.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/logo.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/images/naked.png XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/assets/js/index.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/building.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/building.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/imports.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/imports.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/locales.php XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_building.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_imports.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_locale.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.tpl XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.tpl Removed Paths: ------------- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/css/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/icons/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/images/ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_building.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_fields.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_import.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/about.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -19,10 +19,10 @@ * @author TDM Xoops (AKA Developers) * @version $Id: about.php 10665 2012-12-27 10:14:15Z timgno $ */ -include dirname(__FILE__) . '/header.php'; -// Header +include __DIR__ . '/header.php'; $xoops->header(); // About -$admin_menu->displayNavigation('about.php'); -$admin_menu->displayAbout('6KJ7RW5DR3VTJ', true); -$xoops->footer(); \ No newline at end of file +$adminMenu->displayNavigation('about.php'); +$adminMenu->displayAbout(true); + +include __DIR__ . '/footer.php'; \ No newline at end of file Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -19,18 +19,11 @@ * @author TDM Xoops (AKA Developers) * @version $Id: building.php 10665 2012-12-27 10:14:15Z timgno $ */ -include dirname(__FILE__) . '/header.php'; -// Get Action type -$op = $system->cleanVars($_REQUEST, 'op', 'default', 'string'); -// heaser -$xoops->header('tdmcreate_building.html'); -// Get handler -/* @var $modules_handler TDMCreateModulesHandler */ -$modules_Handler = $xoops->getModuleHandler('modules'); -/* @var $tables_handler TDMCreateExtensionsHandler */ -$tables_Handler = $xoops->getModuleHandler('tables'); +include __DIR__ . '/header.php'; +// header +$xoops->header('admin:tdmcreate/tdmcreate_building.tpl'); -$admin_menu->renderNavigation('building.php'); +$adminMenu->renderNavigation('building.php'); switch ($op) { case 'default': @@ -39,7 +32,7 @@ $mods_select = new XoopsFormSelect(TDMCreateLocale::BUILDING_MODULES, 'mod_name', 'mod_name'); $mods_select->addOption(0, TDMCreateLocale::BUILDING_SELDEFMOD); - $mods_select->addOptionArray($modules_Handler->getList()); + $mods_select->addOptionArray($modulesHandler->getList()); $form->addElement($mods_select); $form->addElement(new XoopsFormHidden('op', 'build')); @@ -51,8 +44,9 @@ $admin_menu->addItemButton(TDMCreateLocale::BUILDING_FORM, 'building.php', 'application-view-detail'); $admin_menu->renderButton(); - $mods =& $modules_Handler->get($_REQUEST['mod_name']); + $mods =& $modulesHandler->get($_REQUEST['mod_name']); $mods_name = $mods->getVar('mod_name'); break; } -$xoops->footer(); \ No newline at end of file + +include __DIR__ . '/footer.php'; Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -18,92 +18,89 @@ * @author TDM Xoops (AKA Developers) * @version $Id: fields.php 10665 2012-12-27 10:14:15Z timgno $ */ -include dirname(__FILE__) . '/header.php'; +include __DIR__ . '/header.php'; +/* +$fieldId = Request::getInt('field_id'); +$fieldMid = Request::getInt('field_mid'); +$fieldTid = Request::getInt('field_tid'); +$fieldNumb = Request::getInt('field_numb'); +$fieldName = Request::getString('field_name', '');*/ -$field_id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int'); -$field_mid = $system->cleanVars($_REQUEST, 'field_mid', 0, 'int'); -$field_tid = $system->cleanVars($_REQUEST, 'field_tid', 0, 'int'); -$field_numb = $system->cleanVars($_REQUEST, 'field_numb', 0, 'int'); -$field_name = $system->cleanVars($_REQUEST, 'field_name', 0, 'int'); - // Get handler -$xoops->header('tdmcreate_fields.html'); +$xoops->header('admin:tdmcreate/tdmcreate_fields.tpl'); -$admin_menu->renderNavigation('fields.php'); +$adminMenu->renderNavigation('fields.php'); switch ($op) { case 'list': default: - $admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); - $admin_menu->renderButton(); + $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); + $adminMenu->renderButton(); // Get modules list - $criteria = new CriteriaCompo(new Criteria('table_mid', $field_mid)); - $criteria->add(new Criteria('table_id', $field_tid)); + $criteria = new CriteriaCompo(new Criteria('table_mid', $fieldMid)); + $criteria->add(new Criteria('table_id', $fieldTid)); $criteria->setSort('table_name'); $criteria->setOrder('ASC'); $criteria->setStart($start); $criteria->setLimit($limit); - $numrows_tables = $tables_Handler->getCount($criteria); - $table_arr = $tables_Handler->getAll($criteria); - $xoops->tpl()->assign('tables_count', $numrows_tables); + $numRowsTables = $tablesHandler->getCount($criteria); + $tablesArray = $tablesHandler->getAll($criteria); + $xoops->tpl()->assign('tables_count', $numRowsTables); unset($criteria); // Redirect if there aren't modules - /* if ( $numrows_mods == 0 ) { - $xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES ); - }*/ - $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('field_tid', $field_tid)); - $criteria->setSort('field_name'); - $criteria->setOrder('ASC'); - $criteria->setStart($start); - $criteria->setLimit($limit); - $numrows_fields = $fields_Handler->getCount($criteria); - $field_arr = $fields_Handler->getAll($criteria); - unset($criteria); + if ( $numRowsTables == 0 ) { + $xoops->redirect('tables.php?op=new', 2, TDMCreateLocale::E_NO_TABLES ); + } // Assign Template variables $xoops->tpl()->assign('fields_list', true); - $xoops->tpl()->assign('fields_count', $numrows_fields); - if ($numrows_tables > 0) { - foreach (array_keys($table_arr) as $i) { - $tables['id'] = $table_arr[$i]->getVar('table_id'); - $tables['name'] = $table_arr[$i]->getVar('table_name'); - $module_name = $modules_Handler->get($table_arr[$i]->getVar('table_mid')); + $xoops->tpl()->assign('fields_count', $numRowsFields); + if ($numRowsTables > 0) { + foreach (array_keys($tablesArray) as $i) { + $tables['id'] = $tablesArray[$i]->getVar('table_id'); + $tables['name'] = $tablesArray[$i]->getVar('table_name'); + $module_name = $modules_Handler->get($tablesArray[$i]->getVar('table_mid')); $tables['mid'] = $module_name->getVar('mod_name'); - $tables['image'] = $table_arr[$i]->getVar('table_image'); - $tables['nbfields'] = $table_arr[$i]->getVar('table_nbfields'); - $tables['blocks'] = $table_arr[$i]->getVar('table_blocks'); - $tables['admin'] = $table_arr[$i]->getVar('table_admin'); - $tables['user'] = $table_arr[$i]->getVar('table_user'); - $tables['submenu'] = $table_arr[$i]->getVar('table_submenu'); - $tables['search'] = $table_arr[$i]->getVar('table_search'); - $tables['comments'] = $table_arr[$i]->getVar('table_comments'); - $tables['notifications'] = $table_arr[$i]->getVar('table_notifications'); + $tables['image'] = $tablesArray[$i]->getVar('table_image'); + $tables['nbfields'] = $tablesArray[$i]->getVar('table_nbfields'); + $tables['blocks'] = $tablesArray[$i]->getVar('table_blocks'); + $tables['admin'] = $tablesArray[$i]->getVar('table_admin'); + $tables['user'] = $tablesArray[$i]->getVar('table_user'); + $tables['submenu'] = $tablesArray[$i]->getVar('table_submenu'); + $tables['search'] = $tablesArray[$i]->getVar('table_search'); + $tables['comments'] = $tablesArray[$i]->getVar('table_comments'); + $tables['notifications'] = $tablesArray[$i]->getVar('table_notifications'); $xoops->tpl()->append_by_ref('tables', $tables); unset($tables); } - if ($numrows_fields > 0) { - foreach (array_keys($field_arr) as $i) { - $field['id'] = $field_arr[$i]->getVar('field_id'); - $table_name = $tables_Handler->get($field_arr[$i]->getVar('field_tid')); + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('field_tid', $fieldTid)); + $criteria->setSort('field_id'); + $criteria->setOrder('ASC'); + $numRowsFields = $fieldsHandler->getCount($criteria); + $fieldsArray = $fieldsHandler->getAll($criteria); + unset($criteria); + if ($numRowsFields > 0) { + foreach (array_keys($fieldsArray) as $i) { + $field['id'] = $fieldsArray[$i]->getVar('field_id'); + $table_name = $tablesHandler->get($fieldsArray[$i]->getVar('field_tid')); $field['tid'] = $table_name->getVar('table_name'); - $field['name'] = $field_arr[$i]->getVar('field_name'); - $field['type'] = $field_arr[$i]->getVar('field_type'); - $field['value'] = $field_arr[$i]->getVar('field_value'); - $field['blocks'] = $field_arr[$i]->getVar('field_blocks'); - $field['attribute'] = $field_arr[$i]->getVar('field_attribute'); - $field['default'] = $field_arr[$i]->getVar('field_default'); - $field['key'] = $field_arr[$i]->getVar('field_key'); - $field['auto_increment'] = $field_arr[$i]->getVar('field_auto_increment'); - $field['blocks'] = $field_arr[$i]->getVar('field_blocks'); - $field['search'] = $field_arr[$i]->getVar('field_search'); - $field['required'] = $field_arr[$i]->getVar('field_required'); + $field['name'] = $fieldsArray[$i]->getVar('field_name'); + $field['type'] = $fieldsArray[$i]->getVar('field_type'); + $field['value'] = $fieldsArray[$i]->getVar('field_value'); + $field['blocks'] = $fieldsArray[$i]->getVar('field_blocks'); + $field['attribute'] = $fieldsArray[$i]->getVar('field_attribute'); + $field['default'] = $fieldsArray[$i]->getVar('field_default'); + $field['key'] = $fieldsArray[$i]->getVar('field_key'); + $field['blocks'] = $fieldsArray[$i]->getVar('field_blocks'); + $field['search'] = $fieldsArray[$i]->getVar('field_search'); + $field['required'] = $fieldsArray[$i]->getVar('field_required'); $xoops->tpl()->append_by_ref('fields', $field); unset($field); } } // Display Page Navigation - if ($numrows_tables > $nb_pager) { - $nav = new XoopsPageNav($numrows_tables, $nb_pager, $start, 'start'); + if ($numRowsTables > $limit) { + $nav = new XoopsPageNav($numRowsTables, $limit, $start, 'start'); $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); } } else { @@ -112,10 +109,10 @@ break; case 'new': - $admin_menu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail'); - $admin_menu->renderButton(); + $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail'); + $adminMenu->renderButton(); - $obj = $fields_Handler->create(); + $obj = $fieldsHandler->create(); $form = $xoops->getModuleForm($obj, 'fields'); $xoops->tpl()->assign('form', $form->render()); break; @@ -124,14 +121,14 @@ if (!$xoops->security()->check()) { $xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors())); } - if ($field_id) { - $obj = $fields_Handler->get($field_id); + if ($fieldId) { + $obj = $fieldsHandler->get($fieldId); } else { - $obj = $fields_Handler->create(); + $obj = $fieldsHandler->create(); } //Form fields - $obj->setVars(array('field_mid' => $field_mid, 'field_tid' => $field_tid, 'field_name' => $field_name, - 'field_numb' => $field_numb, 'field_type' => $_POST['field_type'], + $obj->setVars(array('field_mid' => $fieldMid, 'field_tid' => $fieldTid, 'field_name' => $fieldName, + 'field_numb' => $fieldNumb, 'field_type' => $_POST['field_type'], 'field_value' => $_POST['field_value'], 'field_attribute' => $_POST['field_attribute'], 'field_null' => $_POST['field_null'], 'field_default' => $_POST['field_default'], 'field_key' => $_POST['field_key'], 'field_elements' => $_POST['field_elements'], @@ -143,7 +140,7 @@ 'field_search' => (($_REQUEST['field_search'] == 1) ? '1' : '0'), 'field_required' => (($_REQUEST['field_required'] == 1) ? '1' : '0'))); // Save data - if ($fields_Handler->insert($obj)) { + if ($fieldsHandler->insert($obj)) { $xoops->redirect('fields.php', 2, TDMCreateLocale::FORMOK); } @@ -151,29 +148,29 @@ break; case 'edit': - $admin_menu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); - $admin_menu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail'); - $admin_menu->renderButton(); + $adminMenu->addItemButton(TDMCreateLocale::ADD_TABLE, 'tables.php?op=new', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::FIELDS_LIST, 'fields.php', 'application-view-detail'); + $adminMenu->renderButton(); - $obj = $fields_Handler->get($field_tid); + $obj = $fieldsHandler->get($fieldTid); $form = $xoops->getModuleForm($obj, 'fields'); $xoops->tpl()->assign('form', $form->render()); break; case 'delete': - if ($field_id > 0) { - $obj = $fields_Handler->get($field_id); + if ($fieldId > 0) { + $obj = $fieldsHandler->get($fieldId); if (isset($_POST['ok']) && $_POST['ok'] == 1) { if (!$xoops->security()->check()) { $xoops->redirect('fields.php', 3, implode(',', $xoops->security()->getErrors())); } - if ($fields_Handler->delete($obj)) { + if ($fieldsHandler->delete($obj)) { $xoops->redirect('fields.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::TABLE)); } else { $xoops->error($obj->getHtmlErrors()); } } else { - $xoops->confirm(array('ok' => 1, 'id' => $field_id, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('field_name')) . '<br />'); + $xoops->confirm(array('ok' => 1, 'id' => $fieldId, 'op' => 'delete'), 'fields.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('field_name')) . '<br />'); } } else { $xoops->redirect('fields.php', 1, TDMCreateLocale::E_DATABASE_ERROR); Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -0,0 +1,23 @@ +<?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.6.0 + * @author TDM Xoops (AKA Developers) + * @version $Id$ + */ + +$xoops->footer(); \ No newline at end of file Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/footer.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -8,7 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - +use Xoops\Core\Request; /** * tdmcreate module * @@ -19,26 +19,33 @@ * @author TXMod Xoops (AKA Timgno) * @version $Id: header.php 10665 2012-12-27 10:14:15Z timgno $ */ -require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php'; -include_once dirname(dirname(__FILE__)) . '/include/common.php'; -include_once dirname(dirname(__FILE__)) . '/include/functions.php'; -include_once dirname(dirname(__FILE__)) . '/class/helper.php'; +require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; // Get main instance XoopsLoad::load('system', 'system'); $system = System::getInstance(); -// Get main locale instance -$xoops = Xoops::getInstance(); -$helper = TDMCreate::getInstance(); -$request = $xoops->request(); +// +$helper = Xoops\Module\Helper::getHelper('tdmcreate'); +$xoops = $helper->xoops(); +// Load local libraries +XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/common.php')); +XoopsLoad::loadFile($xoops->path(dirname(__DIR__) . '/include/functions.php')); // Get handler -$modules_Handler = $helper->getHandlerModules(); -$tables_Handler = $helper->getHandlerTables(); -$import_Handler = $helper->getHandlerImport(); -$fields_Handler = $helper->getHandlerFields(); +$modulesHandler = $helper->getModulesHandler(); +$tablesHandler = $helper->getTablesHandler(); +$fieldsHandler = $helper->getFieldsHandler(); +$localeHandler = $helper->getLocalesHandler(); +$importHandler = $helper->getImportsHandler(); // Get $_POST, $_GET, $_REQUEST -$op = $request->asStr('op', 'list'); -$start = $request->asInt('start', 0); +$op = Request::getCmd('op'); +$start = Request::getInt('start', 0); // Parameters $limit = $helper->getConfig('adminpager'); +// Add Script +$xoops->theme()->addScript('media/xoops/xoops.js'); +$xoops->theme()->addScript('modules/system/js/admin.js'); +$xoops->theme()->addScript('modules/tdmcreate/assets/js/functions.js'); +// Add Stylesheet +$xoops->theme()->addStylesheet('modules/system/css/admin.css'); +$xoops->theme()->addStylesheet('modules/tdmcreate/assets/css/admin.css'); // Get admin menu istance -$admin_menu = new XoopsModuleAdmin(); \ No newline at end of file +$adminMenu = new \Xoops\Module\Admin(); \ No newline at end of file Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -0,0 +1,213 @@ +<?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.6.0 + * @author XOOPS Development Team + * @version $Id$ + */ +include __DIR__ . '/header.php'; +// heaser +$xoops->header('admin:tdmcreate/tdmcreate_imports.tpl'); +// +//$importId = Request::getInt('import_id', 0); +// +$adminMenu->renderNavigation('imports.php'); +// +switch ($op) +{ + case 'list': + $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=new', 'add'); + $adminMenu->renderButton(); + // Get modules list + $criteria = new CriteriaCompo(); + $criteria->setSort('import_name'); + $criteria->setOrder('ASC'); + $criteria->setStart($start); + $criteria->setLimit($limit); + $numImports = $importHandler->getCount($criteria); + $importArr = $importHandler->getAll($criteria); + // Assign Template variables + $xoops->tpl()->assign('imports_count', $numImports); + unset($criteria); + if ($numImports > 0) { + foreach (array_keys($importArr) as $i) { + $import['id'] = $importArr[$i]->getVar('import_id'); + $import['mid'] = $importArr[$i]->getVar('import_mid'); + $import['name'] = $importArr[$i]->getVar('import_name'); + $import['nbtables'] = $importArr[$i]->getVar('import_nbtables'); + $import['nbfields'] = $importArr[$i]->getVar('import_nbfields'); + $xoops->tpl()->append_by_ref('imports', $import); + unset($import); + } + // Display Page Navigation + if ($numrows > $limit) { + $nav = new XoopsPageNav($numrows, $limit, $start, 'start'); + $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); + } + } else { + $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOIMPORTS); + } + break; + + case 'new': + $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $obj = $importHandler->create(); + $form = $xoops->getModuleForm($obj, 'import'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'save': + if (!$xoops->security()->check()) { + $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); + } + + if ($importId > 0) { + $obj = $importHandler->get($importId); + //Form imported edited save + $obj->setVar('import_mid', $_POST['import_mid']); + $obj->setVar('import_name', $_POST['import_name']); + $obj->setVar('import_nbtables', $_POST['import_nbtables']); + $obj->setVar('import_tablename', $_POST['import_mid']); + $obj->setVar('import_nbfields', $_POST['import_nbfields']); + $obj->setVar('import_fieldelements', $_POST['import_fieldelements']); + } else { + $obj = $importHandler->create(); + //Form imported save + $obj->setVar('import_name', $_POST['import_name']); + $obj->setVar('import_mid', $_POST['import_mid']); + $files = $_FILES['importfile']; + // If incoming data have been entered correctly + if($_POST['upload'] == XoopsLocale::A_SUBMIT && isset($files['tmp_name']) && (substr($files['name'], -4) == '.sql')) + { + // File recovery + $dir = TDMC_UPLOAD_PATH_FILES; + $file = $_FILES['importfile']; + $tmpName = $file['tmp_name']; + // Copy files to the server + if (is_uploaded_file($tmpName)) { + readfile($tmpName); + // The directory where you saved the file + if ($file['error'] == UPLOAD_ERR_OK) { + if (move_uploaded_file($tmpName, $dir.'/'.$file['name'])); + $xoops->redirect('imports.php', 3, sprintf(TDMCreateLocale::E_FILE_UPLOADING, $file['name'])); + } + } else { + $xoops->redirect('imports.php', 3, sprintf(TDMCreateLocale::E_FILE_NOT_UPLOADING, $tmpName)); + } + + // Copies data in the db + $filename = $dir.'/'.$file['name']; + // File size + $filesize = $files['size']; + // Check that the file was inserted and that there is + if ( ($handle = fopen($filename, 'r') ) !== false) { + // File reading until at the end + while ( !feof( $handle )) + { + $buffer = fgets($handle, filesize($filename)); + if(strlen($buffer) > 1) + { + // search all comments + $search = array ( '/\/\*.*(\n)*.*(\*\/)?/', '/\s*--.*\n/', '/\s*#.*\n/' ); + // and replace with null + $replace = array ( "\n" ); + $buffer = preg_replace($search, $replace, $buffer); + $buffer = str_replace('`', '', $buffer); + $buffer = str_replace(',', '', $buffer); + + preg_match_all('/((\s)*(CREATE TABLE)(\s)+(.*)(\s)+(\())/', $buffer, $tableMatch); // table name ... (match) + if(count($tableMatch[0]) > 0) { + array_push( $resultTable, $tableMatch[5][0] ); + } + } else { + $xoops->redirect('imports.php', 3, sprintf(TDMCreateLocale::E_SQL_FILE_DATA_NOT_MATCH, $buffer)); + } + } + + // Insert query + if(strlen($resultTable[0]) > 0) + { + $t = 0; + foreach(array_keys($resultTable) as $table) + { + $obj->setVar('import_tablename', $resultTable[$table]); //$_POST['import_tablename'] + $obj->setVar('import_nbtables', $t); $t++; //$_POST['import_nbtables'] + if(strlen($resultTable[0]) > 0) + { + $f = 0; + foreach(array_keys($resultFields) as $field) + { + $obj->setVar('import_nbfields', $f); $f++; // $_POST['import_nbfields'] + $obj->setVar('import_fieldelements', $_POST['import_fieldelements']); + } + unset($f); + } + } + unset($t); + } + } else { + $xoops->redirect('imports.php', 3, TDMCreateLocale::E_FILE_NOT_OPEN_READING); + } + $xoops->redirect('imports.php', 3, TDMCreateLocale::S_DATA_ENTERED); + fclose($handle); + } else { + $xoops->redirect('imports.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED); + } + } + + if ($importHandler->insert($obj)) { + $xoops->redirect('imports.php', 3, TDMCreateLocale::FORM_OK); + } + + $xoops->error($obj->getHtmlErrors()); + $form = $xoops->getModuleForm($obj, 'import'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'edit': + $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'imports.php?op=import', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'imports.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $obj = $importHandler->get($importId); + $form = $xoops->getModuleForm($obj, 'import'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'delete': + if ($importId > 0) { + $obj = $importHandler->get($importId); + if (isset($_POST['ok']) && $_POST['ok'] == 1) { + if (!$xoops->security()->check()) { + $xoops->redirect('imports.php', 3, implode(',', $xoops->security()->getErrors())); + } + if ($importHandler->delete($obj)) { + $xoops->redirect('imports.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); + } else { + $xoops->error($obj->getHtmlErrors()); + } + } else { + $xoops->confirm(array('ok' => 1, 'id' => $importId, 'op' => 'delete'), 'imports.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('import_name')) . '<br />'); + } + } else { + $xoops->redirect('imports.php', 1, TDMCreateLocale::E_DATABASE_ERROR); + } + break; +} + +include __DIR__ . '/footer.php'; \ No newline at end of file Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/imports.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -19,36 +19,53 @@ * @author TDM Xoops (AKA Developers) * @version $Id: index.php 10665 2012-12-27 10:14:15Z timgno $ */ -include dirname(__FILE__) . '/header.php'; -// Heaser +include __DIR__ . '/header.php'; +// header $xoops->header(); // tdmcreate modules $criteria = new CriteriaCompo(); $criteria->add(new Criteria('mod_id', 0, '!=')); -$tdmcreate_modules = $modules_Handler->getCount($criteria); +$modules = $modulesHandler->getCount($criteria); +unset($criteria); // tdmcreate tables $criteria = new CriteriaCompo(); $criteria->add(new Criteria('table_mid', 0, '!=')); -$tdmcreate_tables = $tables_Handler->getCount($criteria); +$tables = $tablesHandler->getCount($criteria); +unset($criteria); +// tdmcreate tables +$criteria = new CriteriaCompo(); +$criteria->add(new Criteria('field_mid', 0, '!=')); +$criteria->add(new Criteria('field_tid', 0, '!=')); +$fields = $fieldsHandler->getCount($criteria); +unset($criteria); +// tdmcreate modules +$criteria = new CriteriaCompo(); +$criteria->add(new Criteria('loc_mid', 0, '!=')); +$locale = $localeHandler->getCount($criteria); +unset($criteria); // tdmcreate import $criteria = new CriteriaCompo(); $criteria->add(new Criteria('import_id', 0, '!=')); -$tdmcreate_import = $import_Handler->getCount($criteria); - +$import = $importHandler->getCount($criteria); +unset($criteria); $r = "red"; $g = "green"; -$modules_color = $tdmcreate_modules == 0 ? $r : $g; -$tables_color = $tdmcreate_tables == 0 ? $r : $g; -$import_color = $tdmcreate_import == 0 ? $r : $g; +$modulesColor = $modules == 0 ? $r : $g; +$tablesColor = $tables == 0 ? $r : $g; +$fieldsColor = $fields == 0 ? $r : $g; +$localeColor = $locale == 0 ? $r : $g; +$importColor = $import == 0 ? $r : $g; -$admin_menu->displayNavigation('index.php'); +$adminMenu->displayNavigation('index.php'); -$admin_menu->addInfoBox(TDMCreateLocale::INDEX_STATISTICS); -$admin_menu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NMTOTAL, '<span class="'.$modules_color.'">' . $tdmcreate_modules . '</span>')); -$admin_menu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NTTOTAL, '<span class="'.$tables_color.'">' . $tdmcreate_tables . '</span>')); -$admin_menu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NITOTAL, '<span class="'.$import_color.'">' . $tdmcreate_import . '</span>')); +$adminMenu->addInfoBox(TDMCreateLocale::INDEX_STATISTICS); +$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NMTOTAL, '<span class="'.$modulesColor.'">' . $modules . '</span>')); +$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NTTOTAL, '<span class="'.$tablesColor.'">' . $tables . '</span>')); +$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NFTOTAL, '<span class="'.$fieldsColor.'">' . $fields . '</span>')); +$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NLTOTAL, '<span class="'.$localeColor.'">' . $locale . '</span>')); +$adminMenu->addInfoBoxLine(sprintf(TDMCreateLocale::F_INDEX_NITOTAL, '<span class="'.$importColor.'">' . $import . '</span>')); // folder path -$folder_path = array( +$folderPath = array( XOOPS_UPLOAD_PATH . '/tdmcreate/', XOOPS_UPLOAD_PATH . '/tdmcreate/files', XOOPS_UPLOAD_PATH . '/tdmcreate/repository', @@ -56,16 +73,17 @@ XOOPS_UPLOAD_PATH . '/tdmcreate/images/modules', XOOPS_UPLOAD_PATH . '/tdmcreate/images/tables' ); -foreach ($folder_path as $folder) { - $admin_menu->addConfigBoxLine($folder, 'folder'); - $admin_menu->addConfigBoxLine(array($folder, '777'), 'chmod'); +foreach ($folderPath as $folder) { + $adminMenu->addConfigBoxLine($folder, 'folder'); + $adminMenu->addConfigBoxLine(array($folder, '777'), 'chmod'); } // extension $extensions = array('xtranslator' => 'extension'); foreach ($extensions as $module => $type) { - $admin_menu->addConfigBoxLine(array($module, 'warning'), $type); + $adminMenu->addConfigBoxLine(array($module, 'warning'), $type); } -$admin_menu->displayIndex(); -$xoops->footer(); \ No newline at end of file +$adminMenu->displayIndex(); + +include __DIR__ . '/footer.php'; Added: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php (rev 0) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -0,0 +1,128 @@ +<?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.6.0 + * @author XOOPS Development Team + * @version $Id$ + */ +include __DIR__ . '/header.php'; +// heaser +$xoops->header('admin:tdmcreate/tdmcreate_locale.tpl'); +// +//$localeId = Request::getInt('import_id', 0); +// +$adminMenu->renderNavigation('locales.php'); +// +switch ($op) +{ + case 'list': + $adminMenu->addItemButton(TDMCreateLocale::ADD_LOCALE, 'locales.php?op=new', 'add'); + $adminMenu->renderButton(); + // Get modules list + $criteria = new CriteriaCompo(); + $criteria->setSort('loc_id'); + $criteria->setOrder('ASC'); + $criteria->setStart($start); + $criteria->setLimit($limit); + $numLocale = $localeHandler->getCount($criteria); + $localeArr = $localeHandler->getAll($criteria); + // Assign Template variables + $xoops->tpl()->assign('locale_count', $numLocale); + unset($criteria); + if ($numLocale > 0) { + foreach (array_keys($localeArr) as $i) { + $locale['id'] = $localeArr[$i]->getVar('loc_id'); + $locale['mid'] = $localeArr[$i]->getVar('loc_mid'); + $locale['name'] = $localeArr[$i]->getVar('loc_file'); + $locale['define'] = $localeArr[$i]->getVar('loc_define'); + $locale['description'] = $localeArr[$i]->getVar('loc_description'); + $xoops->tpl()->append_by_ref('locales', $locale); + unset($locale); + } + // Display Page Navigation + if ($numrows > $limit) { + $nav = new XoopsPageNav($numrows, $limit, $start, 'start'); + $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); + } + } else { + $xoops->tpl()->assign('error_message', TDMCreateLocale::IMPORT_ERROR_NOLOCALE); + } + break; + + case 'new': + $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locales.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $obj = $localeHandler->create(); + $form = $xoops->getModuleForm($obj, 'locales'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'save': + if (!$xoops->security()->check()) { + $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); + } + + if ($localeId > 0) { + $obj = $localeHandler->get($localeId); + //Form imported edited save + $obj->setVar('loc_mid', Request::getInt('loc_mid')); + $obj->setVar('loc_file', Request::getString('loc_file')); + $obj->setVar('loc_define', Request::getString('loc_define')); + $obj->setVar('loc_description', Request::getString('loc_description')); + $xoops->redirect('locales.php', 3, TDMCreateLocale::E_DATABASE_SQL_FILE_NOT_IMPORTED); + } + if ($localeHandler->insert($obj)) { + $xoops->redirect('locales.php', 3, TDMCreateLocale::FORM_OK); + } + + $xoops->error($obj->getHtmlErrors()); + $form = $xoops->getModuleForm($obj, 'locales'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'edit': + $adminMenu->addItemButton(TDMCreateLocale::IMPORT_OLD_MODULE, 'locales.php?op=import', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::IMPORTED_LIST, 'locales.php', 'application-view-detail'); + $adminMenu->renderButton(); + + $obj = $localeHandler->get($localeId); + $form = $xoops->getModuleForm($obj, 'locales'); + $xoops->tpl()->assign('form', $form->render()); + break; + + case 'delete': + if ($localeId > 0) { + $obj = $localeHandler->get($localeId); + if (isset($_POST['ok']) && $_POST['ok'] == 1) { + if (!$xoops->security()->check()) { + $xoops->redirect('locales.php', 3, implode(',', $xoops->security()->getErrors())); + } + if ($localeHandler->delete($obj)) { + $xoops->redirect('locales.php', 2, sprintf(TDMCreateLocale::S_DELETED, TDMCreateLocale::IMPORT)); + } else { + $xoops->error($obj->getHtmlErrors()); + } + } else { + $xoops->confirm(array('ok' => 1, 'id' => $localeId, 'op' => 'delete'), 'locales.php', sprintf(TDMCreateLocale::QF_ARE_YOU_SURE_TO_DELETE, $obj->getVar('loc_file')) . '<br />'); + } + } else { + $xoops->redirect('locales.php', 1, TDMCreateLocale::E_DATABASE_ERROR); + } + break; +} + +include __DIR__ . '/footer.php'; \ No newline at end of file Property changes on: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/locales.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev URL \ No newline at end of property Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/menu.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -37,10 +37,14 @@ $adminmenu[$i]['icon'] = 'editfields.png'; $i++; $adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU5; -$adminmenu[$i]['link'] = 'admin/import.php'; +$adminmenu[$i]['link'] = 'admin/locales.php'; +$adminmenu[$i]['icon'] = 'languages.png'; +$i++; +$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6; +$adminmenu[$i]['link'] = 'admin/imports.php'; $adminmenu[$i]['icon'] = 'import.png'; $i++; -$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU6; +$adminmenu[$i]['title'] = TDMCreateLocale::ADMIN_MENU7; $adminmenu[$i]['link'] = 'admin/building.php'; $adminmenu[$i]['icon'] = 'builder.png'; $i++; Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php =================================================================== --- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-04 18:50:06 UTC (rev 13057) +++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2015-05-06 14:56:29 UTC (rev 13058) @@ -18,49 +18,49 @@ * @author XOOPS Development Team * @version $Id: modules.php 10665 2012-12-27 10:14:15Z timgno $ */ -include dirname(__FILE__) . '/header.php'; +include __DIR__ . '/header.php'; // Get Action type -$mod_id = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int'); +//$modId = Request::getInt('mod_id'); // Get handler -$xoops->header('tdmcreate_modules.html'); -$admin_menu->renderNavigation('modules.php'); +$xoops->header('admin:tdmcreate/tdmcreate_modules.tpl'); +$adminMenu->renderNavigation('modules.php'); switch ($op) { case 'list': default: - $admin_menu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add'); - $admin_menu->renderButton(); + $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add'); + $adminMenu->renderButton(); // Get modules list $criteria = new CriteriaCompo(); $criteria->setSort('mod_name'); $criteria->setOrder('ASC'); $criteria->setStart($start); $criteria->setLimit($limit); - $numrows_mods = $modules_Handler->getCount($criteria); - $mod_arr = $modules_Handler->getAll($criteria); + $numRowsMods = $modulesHandler->getCount($criteria); + $modulesArray = $modulesHandler->getAll($criteria); // Assign Template variables - $xoops->tpl()->assign('modules_count', $numrows_mods); + $xoops->tpl()->assign('modules_count', $numRowsMods); unset($criteria); - if ($numrows_mods > 0) { - foreach (array_keys($mod_arr) as $i) { - $mod['id'] = $mod_arr[$i]->getVar('mod_id'); - $mod['name'] = $mod_arr[$i]->getVar('mod_name'); - $mod['version'] = $mod_arr[$i]->getVar('mod_version'); - $mod['image'] = $mod_arr[$i]->getVar('mod_image'); - $mod['release'] = $mod_arr[$i]->getVar('mod_release'); - $mod['status'] = $mod_arr[$i]->getVar('mod_status'); - $mod['admin'] = $mod_arr[$i]->getVar('mod_admin'); - $mod['user'] = $mod_arr[$i]->getVar('mod_user'); - $mod['submenu'] = $mod_arr[$i]->getVar('mod_submenu'); - $mod['search'] = $mod_arr[$i]->getVar('mod_search'); - $mod['comments'] = $mod_arr[$i]->getVar('mod_comments'); - $mod['notifications'] = $mod_arr[$i]->getVar('mod_notifications'); + if ($numRowsMods > 0) { + foreach (array_keys($modulesArray) as $i) { + $mod['id'] = $modulesArray[$i]->getVar('mod_id'); + $mod['name'] = $modulesArray[$i]->getVar('mod_name'); + $mod['version'] = $modulesArray[$i]->getVar('mod_version'); + $mod['image'] = $modulesArray[$i]->getVar('mod_image'); + $mod['release'] = $modulesArray[$i]->getVar('mod_release'); + $mod['status'] = $modulesArray[$i]->getVar('mod_status'); + $mod['admin'] = $modulesArray[$i]->getVar('mod_admin'); + $mod['user'] = $modulesArray[$i]->getVar('mod_user'); + $mod['submenu'] = $modulesArray[$i]->getVar('mod_submenu'); + $mod['search'] = $modulesArray[$i]->getVar('mod_search'); + $mod['comments'] = $modulesArray[$i]->getVar('mod_comments'); + $mod['notifications'] = $modulesArray[$i]->getVar('mod_notifications'); $xoops->tpl()->append_by_ref('modules', $mod); unset($mod); } // Display Page Navigation - if ($numrows_mods > $limit) { - $nav = new XoopsPageNav($numrows_mods, $limit, $start, 'start'); + if ($numRowsMods > $limit) { + $nav = new XoopsPageNav($numRowsMods, $limit, $start, 'start'); $xoops->tpl()->assign('pagenav', $nav->renderNav(4)); } } else { @@ -69,11 +69,11 @@ break; case 'new': - $admin_menu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail'); - $admin_menu->renderButton(); + $adminMenu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail'); + $adminMenu->renderButton(); - $obj = $modules_Handler->create(); - $form = $xoops->getModuleForm($obj, 'modules'); + $modulesObj = $modulesHandler->create(); + $form = $xoops->getModuleForm($modulesObj, 'modules'); $xoops->tpl()->assign('form', $form->render()); break; @@ -81,83 +81,83 @@ if (!$xoops->security()->check()) { $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); } - $mod_id = $request->asInt('mod_id', 0); - if ($mod_id > 0) { - $obj = $modules_Handler->get($mod_id); + $modId = Request::getInt('mod_id', 0); + if ($modId > 0) { + $modulesObj = $modulesHandler->get($modId); } else { - $obj = $modules_Handler->create(); + $modulesObj = $modulesHandler->create(); } //Form module save - $obj->setVars(array('mod_name' => $request->asStr('mod_name', ''), - 'mod_isextension' => $request->asInt('mod_isextension', 0), - 'mod_version' => $request->asStr('mod_version', ''), - 'mod_description' => $request->asStr('mod_description', ''), - 'mod_author' => $request->asStr('mod_author', ''), - 'mod_author_mail' => $request->asStr('mod_author_mail', ''), - 'mod_author_website_url' => $request->asStr('mod_author_website_url', ''), - 'mod_author_website_name' => $request->asStr('mod_author_website_name', ''), - 'mod_credits' => $request->asStr('mod_credits', ''), - 'mod_license' => $request->asStr('mod_license', ''), - 'mod_release_info' => $request->asStr('mod_release_info', ''), - 'mod_release_file' => $request->asStr('mod_release_file', ''), - 'mod_manual' => $request->asStr('mod_manual', ''), - 'mod_manual_file' => $request->asStr('mod_manual_file', ''))); + $modulesObj->setVars(array('mod_name' => Request::getString('mod_name', ''), + 'mod_isextension' => Request::getInt('mod_isextension', 0), + 'mod_version' => Request::getString('mod_version', ''), + 'mod_description' => Request::getString('mod_description', ''), + 'mod_author' => Request::getString('mod_author', ''), + 'mod_author_mail' => Request::getString('mod_author_mail', ''), + 'mod_author_website_url' => Request::getString('mod_author_website_url', ''), + 'mod_author_website_name' => Request::getString('mod_author_website_name', ''), + 'mod_credits' => Request::getString('mod_credits', ''), + 'mod_license' => Request::getString('mod_license', ''), + 'mod_release_info' => Request::getString('mod_release_info', ''), + 'mod_release_file' => Request::getString('mod_release_file', ''), + 'mod_manual' => Request::getString('mod_manual', ''), + 'mod_manual_file' => Request::getString('mod_manual_file', ''))); //Form module_image $uploader = new XoopsMediaUploader( TDMC_MODULES_PATH_IMG, $helper->getConfig('mimetypes'), $helper->getConfig('maxuploadsize'), null, null); if ($uploader->fetchMedia('xoops_upload_file')) { $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES['xoops_upload_file']['name']); - $img_name = 'logo.'.$extension; - $uploader->setPrefix($img_name); + $imageName = 'logo.'.$extension; + $uploader->setPrefix($imageName); $uploader->fetchMedia('xoops_upload_file'); if (!$uploader->upload()) { $xoops->redirect('javascript:history.go(-1)',3, $uploader->getErrors()); } else { - $obj->setVar('mod_image', $uploader->getSavedFileName()); + $modulesObj->setVar('mod_image', $uploader->getSavedFileName()); } } else { if ($_POST['modules_image'] == 'blank.gif') { - $obj->setVar('mod_image', $_POST['mod_image']); + $modulesObj->setVar('mod_image', $_POST['mod_image']); } else { - $obj->setVar('mod_image', $_POST['modules_image']); + $modulesObj->setVar('mod_image', $_POST['modules_image']); } } //Form module save - $obj->setVars(array('mod_demo_site_url' => $request->asStr('mod_demo_site_url', ''), - 'mod_demo_site_name' => $request->asStr('mod_demo_site_name', ''), - 'mod_support_url' => $request->asStr('mod_support_url', ''), - 'mod_support_name' => $request->asStr('mod_support_name', ''), - 'mod_website_url' => $request->asStr('mod_website_url', ''), - 'mod_website_name' => $request->asStr('mod_website_name', ''), - 'mod_release' => $request->asStr('mod_release', ''), - 'mod_status' => $request->asStr('mod_status', ''), - 'mod_admin' => $request->asInt('mod_admin', 0), - 'mod_user' => $request->asInt('mod_user', 0), - 'mod_submenu' => $request->asInt('mod_submenu', 0), - 'mod_search' => $request->asInt('mod_search', 0), - 'mod_comments' => $request->asInt('mod_comments', 0), - 'mod_notifications' => $request->asInt('mod_notifications', 0), - 'mod_paypal' => $request->asStr('mod_paypal', ''), - 'mod_subversion' => $request->asStr('mod_subversion', ''))); + $modulesObj->setVars(array('mod_demo_site_url' => Request::getString('mod_demo_site_url', ''), + 'mod_demo_site_name' => Request::getString('mod_demo_site_name', ''), + 'mod_support_url' => Request::getString('mod_support_url', ''), + 'mod_support_name' => Request::getString('mod_support_name', ''), + 'mod_website_url' => Request::getString('mod_website_url', ''), + 'mod_website_name' => Request::getString('mod_website_name', ''), + 'mod_release' => Request::getString('mod_release', ''), + 'mod_status' => Request::getString('mod_status', ''), + 'mod_admin' => Request::getInt('mod_admin', 0), + 'mod_user' => Request::getInt('mod_user', 0), + 'mod_submenu' => Request::getInt('mod_submenu', 0), + 'mod_search' => Request::getInt('mod_search', 0), + 'mod_comments' => Request::getInt('mod_comments', 0), + 'mod_notifications' => Request::getInt('mod_notifications', 0), + 'mod_paypal' => Request::getString('mod_paypal', ''), + 'mod_subversion' => Request::getString('mod_subversion', ''))); // Insert Data - if ($modules_Handler->insert($obj)) { + if ($modulesHandler->insert($modulesObj)) { $xoops->redirect('modules.php', 2, XoopsLocale::S_DATA_INSERTED); } // Form Data - $xoops->error($obj->getHtmlErrors()); - $form = $xoops->getModuleForm($obj, 'modules'); + $xoops->error($modulesObj->getHtmlErrors()); + $form = $xoops->getModuleForm($modulesObj, 'modules'); $xoops->tpl()->assign('form', $form->render()); break; case 'edit': - $admin_menu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add'); - $admin_menu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail'); - $admin_menu->renderButton(); - $mod_id = $request->asInt('mod_id', 0); - if ($mod_id > 0) { - $obj = $modules_Handler->get($mod_id); - $form = $helper->getForm($obj, 'modules'); + $adminMenu->addItemButton(TDMCreateLocale::ADD_MODULE, 'modules.php?op=new', 'add'); + $adminMenu->addItemButton(TDMCreateLocale::MODULES_LIST, 'modules.php', 'application-view-detail'); + $adminMenu->renderButton(); + $modId = Request::getInt('mod_id', 0); + if ($modId > 0) { + $modulesObj = $modulesHandler->get($modId); + $form = $helper->getForm($modulesObj, 'modules'); $xoops->tpl()->assign('form', $form->render()); } else { $xoops->redirect('modules.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED); @@ -165,20 +165,20 @@ break; case 'delete': - $mod_id = $request->asInt('mod_id', 0); - if ($mod_id > 0) { - $obj = $modules_Handler->get($mod_id); + $modId = Request::getInt('mod_id', 0); + if ($modId > 0) { + $modulesObj = $modulesHandler->get($modId); if (isset($_POST['ok']) && $_POST['ok'] == 1) { if (!$xoops->security()->check()) { $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors())); } - if ($modules_Handler->delete($obj)) { + if ($modulesHandler->delete($modulesObj)) { ... [truncated message content] |
From: <txm...@us...> - 2015-05-04 18:50:08
|
Revision: 13057 http://sourceforge.net/p/xoops/svn/13057 Author: txmodxoops Date: 2015-05-04 18:50:06 +0000 (Mon, 04 May 2015) Log Message: ----------- Deleted unnecessaries functions in classes Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSubmit.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/docs/changelog.txt Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php 2015-05-04 13:07:33 UTC (rev 13056) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/building.php 2015-05-04 18:50:06 UTC (rev 13057) @@ -43,7 +43,7 @@ } } // Structure - include_once TDMC_PATH . '/class/files/TDMCreateArchitecture.php'; + include_once TDMC_CLASSES_PATH . '/files/TDMCreateArchitecture.php'; $handler = TDMCreateArchitecture::getInstance(); // Creation of the structure of folders and files $base_architecture = $handler->createBaseFoldersFiles($moduleObj); 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-04 13:07:33 UTC (rev 13056) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-04 18:50:06 UTC (rev 13057) @@ -47,7 +47,6 @@ { $this->tdmcreate = TDMCreateHelper::getInstance(); $this->structure = TDMCreateStructure::getInstance(); - $this->structure->setPath(TDMC_PATH); $this->structure->setUploadPath(TDMC_UPLOAD_REPOSITORY_PATH); } @@ -66,37 +65,9 @@ } return $instance; - } + } /* - * @public function createPath - * @param string $path - */ - /** - * @param $path - */ - public function createPath($path) - { - if (isset($path)) { - $this->structure->setPath($path); - } - } - - /* - * @public function createUploadPath - * @param string $uploadPath - */ - /** - * @param $uploadPath - */ - public function createUploadPath($uploadPath) - { - if (isset($uploadPath)) { - $this->structure->setUploadPath($uploadPath); - } - } - - /* * @public function createBaseFoldersFiles * @param string $module */ @@ -210,15 +181,13 @@ // Creation of "templates/admin" folder and index.html file $this->structure->makeDirAndCopyFile('templates/admin', $indexFile, 'index.html'); } - if (is_object($table)) { - if (1 == $table->getVar('table_blocks')) { + if ($table->getVar('table_name') != null) { + if (1 == $module->getVar('mod_blocks')) { // Creation of "templates/blocks" folder and index.html file $this->structure->makeDirAndCopyFile('templates/blocks', $indexFile, 'index.html'); } - if ($table->getVar('table_name') != null) { - // Creation of "sql" folder and index.html file - $this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html'); - } + // Creation of "sql" folder and index.html file + $this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html'); if (1 == $table->getVar('table_notifications')) { // Creation of "language/english/mail_template" folder and index.html file $this->structure->makeDirAndCopyFile('language/english/mail_template', $indexFile, 'index.html'); @@ -227,7 +196,7 @@ $this->structure->makeDirAndCopyFile('language/' . $language . '/mail_template', $indexFile, 'index.html'); } } - } + } } /* @@ -368,7 +337,7 @@ $includeFunctions->write($module, 'functions.php'); $ret[] = $includeFunctions->render(); // Creation of blocks language file - if (is_object($table)) { + if ($table->getVar('table_name') != null) { // Include Install File $includeInstall = IncludeInstall::getInstance(); $includeInstall->write($module, $table, $tables, 'install.php'); @@ -445,8 +414,7 @@ $includeCommentFunctions = IncludeCommentFunctions::getInstance(); $includeCommentFunctions->write($module, $table, 'comment_functions.php'); $ret[] = $includeCommentFunctions->renderFile(); - } - + } } // Creation of admin files if (1 == $module->getVar('mod_admin')) { 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-04 13:07:33 UTC (rev 13056) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php 2015-05-04 18:50:06 UTC (rev 13057) @@ -139,33 +139,9 @@ if (isset($subdir) && is_string($subdir)) { $this->setSubDir($subdir); } - } + } /* - * @private function setPath - * @param string $folderName - */ - /** - * @param $folderName - */ - private function setPath($folderName) - { - $this->path = TDMC_PATH . DIRECTORY_SEPARATOR . $folderName; - } - - /* - * @private function getPath - * @param null - */ - /** - * @return string - */ - private function getPath() - { - return $this->path; - } - - /* * @private function setRepositoryPath * @param string $moduleDirname */ Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php 2015-05-04 13:07:33 UTC (rev 13056) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php 2015-05-04 18:50:06 UTC (rev 13057) @@ -77,33 +77,9 @@ } return $instance; - } - + } + /* - * @public function setPath - * @param string $path - */ - /** - * @param $path - */ - public function setPath($path) - { - $this->path = $path; - } - - /* - * @public function getPath - * @return string $path - */ - /** - * @return null - */ - public function getPath() - { - return $this->path; - } - - /* * @protected function setUploadPath * @param string $path */ Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSubmit.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSubmit.php 2015-05-04 13:07:33 UTC (rev 13056) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSubmit.php 2015-05-04 18:50:06 UTC (rev 13057) @@ -16,7 +16,7 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: user_submit.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: UserSubmit.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); @@ -84,11 +84,11 @@ { $ret = <<<EOT include __DIR__ . '/header.php'; -\$op = downloads_CleanVars(\$_REQUEST, 'op', 'form', 'string'); +\$op = {$moduleDirname}_CleanVars(\$_REQUEST, 'op', 'form', 'string'); // Template \$xoopsOption['template_main'] = '{$moduleDirname}_submit.tpl'; include_once XOOPS_ROOT_PATH.'/header.php'; -\$xoTheme->addStylesheet( XOOPS_URL . '/modules/' . \$xoopsModule->getVar('dirname', 'n') . '/css/style.css', null ); +\$xoTheme->addStylesheet( XOOPS_URL . '/modules/' . \$xoopsModule->getVar('dirname', 'n') . '/assets/css/style.css', null ); //On recupere la valeur de l'argument op dans l'URL$ // redirection if not permissions if (\$perm_submit == false) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/docs/changelog.txt =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/docs/changelog.txt 2015-05-04 13:07:33 UTC (rev 13056) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/docs/changelog.txt 2015-05-04 18:50:06 UTC (rev 13057) @@ -9,6 +9,8 @@ - Added more field database in tables form - Added more field database in fields form - Added checkAll checkbox in modules & tables form +- Added more files for user side +- Added autoload file for all classes ================================= 2014/01/02: Version 1.91 alpha 1 |
From: <txm...@us...> - 2015-05-04 13:07:36
|
Revision: 13056 http://sourceforge.net/p/xoops/svn/13056 Author: txmodxoops Date: 2015-05-04 13:07:33 +0000 (Mon, 04 May 2015) Log Message: ----------- Minor adjustments to classes Added to other files on the user side Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPrint.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/form/TDMCreateFormRadio.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPdf.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRate.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSingle.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 Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -19,9 +19,6 @@ * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -/*require_once 'html/TDMCreateFormLabel.php'; -require_once 'form/TDMCreateFormRadio.php'; -require_once 'form/TDMCreateThemeForm.php';*/ include __DIR__ . '/TDMCreateAutoload.php'; /* @@ -142,27 +139,27 @@ /* * @public function getFormNew * - * @param null $field_mid - * @param null $field_tid - * @param null $field_numb - * @param null $field_name + * @param null $fieldMid + * @param null $fieldTid + * @param null $fieldNumb + * @param null $fieldName * @param bool $action * @return mixed */ - public function getFormNew($field_mid = null, $field_tid = null, $field_numb = null, $field_name = null, $action = false) + public function getFormNew($fieldMid = null, $fieldTid = null, $fieldNumb = null, $fieldName = null, $action = false) { // Header function class $fieldsForm = TDMCreateFields::getInstance(); $form = $fieldsForm->getHeaderForm($action); // Get handler tables $table_obj = $this->tdmcreate->getHandler('tables'); // Changed by goffy - $table_autoincrement = $table_obj->get($field_tid)->getVar('table_autoincrement'); // Added by goffy + $tableAutoincrement = $table_obj->get($fieldTid)->getVar('table_autoincrement'); // Added by goffy // Loop for fields number $class = 'even'; - for ($i = 1; $i <= $field_numb; ++$i) { + for ($i = 1; $i <= $fieldNumb; ++$i) { $class = ($class == 'even') ? 'odd' : 'even'; // Replaced creation of new line by new function - goffy - $this->getFormNewLine($form, $class, $i, $field_mid, $field_tid, $field_name, $table_autoincrement); + $this->getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fieldName, $tableAutoincrement); } // Footer form @@ -175,129 +172,129 @@ * @param $form * @param $class * @param $i - * @param $field_mid - * @param $field_tid - * @param $f_name - * @param $table_autoincrement + * @param $fieldMid + * @param $fieldTid + * @param $fName + * @param $tableAutoincrement */ - private function getFormNewLine($form, $class, $i, $field_mid, $field_tid, $f_name, $table_autoincrement) + private function getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName, $tableAutoincrement) { $form->addElement(new XoopsFormHidden('field_id[' . $i . ']', 0)); - $form->addElement(new XoopsFormHidden('field_mid', $field_mid)); - $form->addElement(new XoopsFormHidden('field_tid', $field_tid)); + $form->addElement(new XoopsFormHidden('field_mid', $fieldMid)); + $form->addElement(new XoopsFormHidden('field_tid', $fieldTid)); $form->addElement(new TDMCreateFormLabel('<tr class="' . $class . '">')); // Index ID $form->addElement(new TDMCreateFormLabel('<td class="center">' . $i . '</td>')); // Field Name - $this_field_name = (!empty($f_name) ? ((1 == $i) ? $f_name . '_id' : $f_name . '_') : ''); - $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $this_field_name); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_name->render() . '</td>')); + $thisFieldName = (!empty($fName) ? ((1 == $i) ? $fName . '_id' : $fName . '_') : ''); + $fieldName = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $thisFieldName); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldName->render() . '</td>')); // Field Type - $value = (1 == $i) && (1 == $table_autoincrement) ? '2' : ''; - $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $i . ']', $value); - $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldtype_select->render() . '</td>')); + $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : ''; + $fieldTypeSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $i . ']', $value); + $fieldTypeSelect->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldTypeSelect->render() . '</td>')); // Field Value - $value = (1 == $i) && (1 == $table_autoincrement) ? '8' : ''; - $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $i . ']', 5, 20, $value); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_value->render() . '</td>')); + $value = (1 == $i) && (1 == $tableAutoincrement) ? '8' : ''; + $fieldValue = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $i . ']', 5, 20, $value); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldValue->render() . '</td>')); // Field Attributes - $value = (1 == $i) && (1 == $table_autoincrement) ? '3' : ''; - $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $i . ']', $value); - $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_attributes_select->render() . '</td>')); + $value = (1 == $i) && (1 == $tableAutoincrement) ? '3' : ''; + $fieldAttributesSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $i . ']', $value); + $fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>')); // Field Null - $value = (1 == $i) && (1 == $table_autoincrement) ? '2' : ''; - $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value); - $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_null_select->render() . '</td>')); + $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : ''; + $fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value); + $fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>')); // Field Default - $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_default->render() . '</td>')); + $fieldDefault = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldDefault->render() . '</td>')); // Field Key - $value = (1 == $i) && (1 == $table_autoincrement) ? '2' : ''; - $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $i . ']', $value); - $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_key_select->render() . '</td>')); + $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : ''; + $fieldKeySelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $i . ']', $value); + $fieldKeySelect->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldKeySelect->render() . '</td>')); // Field Void - if ((1 == $i) && (1 == $table_autoincrement)) { + if ((1 == $i) && (1 == $tableAutoincrement)) { $form->addElement(new TDMCreateFormLabel('<td> </td></tr>')); } else { // Box header row - $parameters_tray = new XoopsFormElementTray('', '<br />'); + $parametersTray = new XoopsFormElementTray('', '<br />'); // Field Elements - $criteria_element = new CriteriaCompo(); - $criteria_element->add(new Criteria('fieldelement_tid', 0)); - $criteria_table = new CriteriaCompo(); - $criteria_table->add(new Criteria('fieldelement_mid', $field_mid)); - $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']'); - $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element)); - $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table)); - unset($criteria_element, $criteria_table); - $parameters_tray->addElement($field_elements_select); + $criteriaElement = new CriteriaCompo(); + $criteriaElement->add(new Criteria('fieldelement_tid', 0)); + $criteriaTable = new CriteriaCompo(); + $criteriaTable->add(new Criteria('fieldelement_mid', $fieldMid)); + $fieldElementsSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']'); + $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaElement)); + $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaTable)); + unset($criteriaElement, $criteriaTable); + $parametersTray->addElement($fieldElementsSelect); $field_parent = 0; - $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']'); - $check_field_parent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT); - $parameters_tray->addElement($check_field_parent); - /*$field_parent = (1 == $table_autoincrement) ? 2 : 1; - $check_field_parent = new TDMCreateFormRadio('', 'field_parent', $field_parent); - $check_field_parent->addOption($i, _AM_TDMCREATE_FIELD_PARENT ); - $parameters_tray->addElement($check_field_parent);*/ + $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']'); + $checkFieldParent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT); + $parametersTray->addElement($checkFieldParent); + /*$field_parent = (1 == $tableAutoincrement) ? 2 : 1; + $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent); + $checkFieldParent->addOption($i, _AM_TDMCREATE_FIELD_PARENT ); + $parametersTray->addElement($checkFieldParent);*/ - $field_inlist = 0; - $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist[' . $i . ']', $field_inlist); - $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST); - $parameters_tray->addElement($check_field_inlist); + $field_inlist = 0; + $checkFieldInList = new XoopsFormCheckBox(' ', 'field_inlist[' . $i . ']', $field_inlist); + $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST); + $parametersTray->addElement($checkFieldInList); - $field_inform = 0; - $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform[' . $i . ']', $field_inform); - $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM); - $parameters_tray->addElement($check_field_inform); + $field_inform = 0; + $checkFieldInForm = new XoopsFormCheckBox(' ', 'field_inform[' . $i . ']', $field_inform); + $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM); + $parametersTray->addElement($checkFieldInForm); - $field_admin = 0; - $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin); - $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); - $parameters_tray->addElement($check_field_admin); + $field_admin = 0; + $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin); + $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); + $parametersTray->addElement($checkFieldAdmin); - $field_user = 0; - $check_field_user = new XoopsFormCheckBox(' ', 'field_user[' . $i . ']', $field_user); - $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER); - $parameters_tray->addElement($check_field_user); + $field_user = 0; + $checkFieldUser = new XoopsFormCheckBox(' ', 'field_user[' . $i . ']', $field_user); + $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER); + $parametersTray->addElement($checkFieldUser); - $field_block = 0; - $check_field_block = new XoopsFormCheckBox('', 'field_block[' . $i . ']', $field_block); - $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); - $parameters_tray->addElement($check_field_block); + $field_block = 0; + $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $i . ']', $field_block); + $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); + $parametersTray->addElement($checkFieldBlock); - $field_main = (1 == $table_autoincrement) ? 2 : 1; - $check_field_main = new TDMCreateFormRadio('', 'field_main', $field_main); - $check_field_main->addOption($i, _AM_TDMCREATE_FIELD_MAINFIELD); - $parameters_tray->addElement($check_field_main); + $fieldMain = (1 == $tableAutoincrement) ? 2 : 1; + $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); + $checkFieldMain->addOption($i, _AM_TDMCREATE_FIELD_MAINFIELD); + $parametersTray->addElement($checkFieldMain); $field_search = 0; $check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $i . ']', $field_search); $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH); - $parameters_tray->addElement($check_field_search); + $parametersTray->addElement($check_field_search); - $field_required = 0; - $check_field_required = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required); - $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); - $parameters_tray->addElement($check_field_required); - $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parameters_tray->render() . '</div></div></td></tr>')); + $field_required = 0; + $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required); + $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); + $parametersTray->addElement($checkFieldRequired); + $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>')); } } /* * @public function getFormEdit * - * @param null $field_mid - * @param null $field_tid + * @param null $fieldMid + * @param null $fieldTid * @param bool $action * @return mixed */ - public function getFormEdit($field_mid = null, $field_tid = null, $action = false) + public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false) { // Header function class $fieldsForm = TDMCreateFields::getInstance(); @@ -305,117 +302,117 @@ // $class = 'even'; // Get the number of fields - goffy - $tablesHandler =& $this->tdmcreate->getHandler('tables'); - $table_autoincrement = $tablesHandler->get($field_tid)->getVar('table_autoincrement'); - $field_numb = $tablesHandler->get($field_tid)->getVar('table_nbfields'); - $f_name = $tablesHandler->get($field_tid)->getVar('table_fieldname'); + $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'); // Get the list of fields $criteria = new CriteriaCompo(); - $criteria->add(new Criteria('field_mid', $field_mid)); - $criteria->add(new Criteria('field_tid', $field_tid)); + $criteria->add(new Criteria('field_mid', $fieldMid)); + $criteria->add(new Criteria('field_tid', $fieldTid)); $criteria->setSort('field_id'); //added by goffy $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria); unset($criteria); $id = 1; foreach ($fields as $field) { - $class = ($class == 'even') ? 'odd' : 'even'; - $field_id = (int) ($field->getVar('field_id')); - if ($id > $field_numb) { // delete additional fields, if number of fields is reduced - goffy - $fieldsObj =& $this->tdmcreate->getHandler('fields')->get($field_id); + $class = ($class == 'even') ? 'odd' : 'even'; + $fieldId = (int) ($field->getVar('field_id')); + if ($id > $fieldNumb) { // delete additional fields, if number of fields is reduced - goffy + $fieldsObj =& $this->tdmcreate->getHandler('fields')->get($fieldId); $this->tdmcreate->getHandler('fields')->delete($fieldsObj, true); } else { // show field with settings - $form->addElement(new XoopsFormHidden('field_id[' . $id . ']', $field_id)); - //$form->addElement(new XoopsFormHidden('field_mid', $field_mid)); - //$form->addElement(new XoopsFormHidden('field_tid', $field_tid)); + $form->addElement(new XoopsFormHidden('field_id[' . $id . ']', $fieldId)); + //$form->addElement(new XoopsFormHidden('field_mid', $fieldMid)); + //$form->addElement(new XoopsFormHidden('field_tid', $fieldTid)); $form->addElement(new TDMCreateFormLabel('<tr class="' . $class . '">')); // Index ID $form->addElement(new TDMCreateFormLabel('<td class="center">' . $id . '</td>')); // Field Name - $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name')); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_name->render() . '</td>')); + $fieldName = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name')); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldName->render() . '</td>')); // Field Type - $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type')); - $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldtype_select->render() . '</td>')); + $fieldTypeSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type')); + $fieldTypeSelect->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldTypeSelect->render() . '</td>')); // Field Value - $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $id . ']', 5, 20, $field->getVar('field_value')); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_value->render() . '</td>')); + $fieldValue = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $id . ']', 5, 20, $field->getVar('field_value')); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldValue->render() . '</td>')); // Field Attributes - $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute')); - $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_attributes_select->render() . '</td>')); + $fieldAttributesSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute')); + $fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>')); // Field Null - $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null')); - $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_null_select->render() . '</td>')); + $fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null')); + $fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>')); // Field Default - $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default')); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_default->render() . '</td>')); + $fieldDefault = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default')); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldDefault->render() . '</td>')); // Field Key - $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key')); - $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList()); - $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_key_select->render() . '</td>')); + $fieldKeySelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key')); + $fieldKeySelect->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList()); + $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldKeySelect->render() . '</td>')); // Field Void - if ((1 == $id) && (1 == $table_autoincrement)) { + if ((1 == $id) && (1 == $tableAutoincrement)) { $form->addElement(new TDMCreateFormLabel('<td> </td></tr>')); } else { // Box header row - $parameters_tray = new XoopsFormElementTray('', '<br />'); + $parametersTray = new XoopsFormElementTray('', '<br />'); // Field Elements - $criteria_element = new CriteriaCompo(); - $criteria_element->add(new Criteria('fieldelement_tid', 0)); - $criteria_table = new CriteriaCompo(); - $criteria_table->add(new Criteria('fieldelement_mid', $field_mid)); - $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element')); - $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element)); - $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table)); - unset($criteria_element, $criteria_table); - $parameters_tray->addElement($field_elements_select); + $criteriaElement = new CriteriaCompo(); + $criteriaElement->add(new Criteria('fieldelement_tid', 0)); + $criteriaTable = new CriteriaCompo(); + $criteriaTable->add(new Criteria('fieldelement_mid', $fieldMid)); + $fieldElementsSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element')); + $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaElement)); + $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaTable)); + unset($criteriaElement, $criteriaTable); + $parametersTray->addElement($fieldElementsSelect); - $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent')); - $check_field_parent->addOption(1, _AM_TDMCREATE_FIELD_PARENT); - $parameters_tray->addElement($check_field_parent); + $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent')); + $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT); + $parametersTray->addElement($checkFieldParent); /*$field_parent = ($field->getVar('field_parent') == 1) ? $id : 1; - $check_field_parent = new TDMCreateFormRadio('', 'field_parent', $field_parent); - $check_field_parent->addOption($id, _AM_TDMCREATE_FIELD_PARENT ); - $parameters_tray->addElement($check_field_parent);*/ + $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent); + $checkFieldParent->addOption($id, _AM_TDMCREATE_FIELD_PARENT ); + $parametersTray->addElement($checkFieldParent);*/ - $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist[' . $id . ']', $field->getVar('field_inlist')); - $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST); - $parameters_tray->addElement($check_field_inlist); + $checkFieldInList = new XoopsFormCheckBox(' ', 'field_inlist[' . $id . ']', $field->getVar('field_inlist')); + $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST); + $parametersTray->addElement($checkFieldInList); - $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform[' . $id . ']', $field->getVar('field_inform')); - $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM); - $parameters_tray->addElement($check_field_inform); + $checkFieldInForm = new XoopsFormCheckBox(' ', 'field_inform[' . $id . ']', $field->getVar('field_inform')); + $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM); + $parametersTray->addElement($checkFieldInForm); - $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin')); - $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); - $parameters_tray->addElement($check_field_admin); + $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin')); + $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); + $parametersTray->addElement($checkFieldAdmin); - $check_field_user = new XoopsFormCheckBox(' ', 'field_user[' . $id . ']', $field->getVar('field_user')); - $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER); - $parameters_tray->addElement($check_field_user); + $checkFieldUser = new XoopsFormCheckBox(' ', 'field_user[' . $id . ']', $field->getVar('field_user')); + $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER); + $parametersTray->addElement($checkFieldUser); - $check_field_block = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block')); - $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); - $parameters_tray->addElement($check_field_block); + $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block')); + $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); + $parametersTray->addElement($checkFieldBlock); - $field_main = (1 == $field->getVar('field_main')) ? $id : 1; - $check_field_main = new TDMCreateFormRadio('', 'field_main', $field_main); - $check_field_main->addOption($id, _AM_TDMCREATE_FIELD_MAINFIELD); - $parameters_tray->addElement($check_field_main); + $fieldMain = (1 == $field->getVar('field_main')) ? $id : 1; + $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); + $checkFieldMain->addOption($id, _AM_TDMCREATE_FIELD_MAINFIELD); + $parametersTray->addElement($checkFieldMain); $check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $id . ']', $field->getVar('field_search')); $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH); - $parameters_tray->addElement($check_field_search); + $parametersTray->addElement($check_field_search); - $check_field_required = new XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required')); - $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); - $parameters_tray->addElement($check_field_required); - $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parameters_tray->render() . '</div></div></td></tr>')); + $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required')); + $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); + $parametersTray->addElement($checkFieldRequired); + $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>')); } } ++$id; @@ -423,9 +420,9 @@ // If you change number fields in tables, // adding missing fields or delete unnecessary fields // By goffy - for ($i = $id; $i <= $field_numb; ++$i) { + for ($i = $id; $i <= $fieldNumb; ++$i) { $class = ($class == 'even') ? 'odd' : 'even'; - $this->getFormNewLine($form, $class, $i, $field_mid, $field_tid, $f_name, $table_autoincrement); + $this->getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName, $tableAutoincrement); } unset($id); @@ -446,10 +443,10 @@ // Send Form Data $form->addElement(new TDMCreateFormLabel('</tbody>')); $form->addElement(new TDMCreateFormLabel('<tfoot><tr>')); - $form_hidden = new XoopsFormHidden('op', 'save'); - $form_button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit'); - $form->addElement(new TDMCreateFormLabel('<td colspan="8">' . $form_hidden->render() . '</td>')); - $form->addElement(new TDMCreateFormLabel('<td>' . $form_button->render() . '</td>')); + $formHidden = new XoopsFormHidden('op', 'save'); + $formButton = new XoopsFormButton('', 'submit', _SUBMIT, 'submit'); + $form->addElement(new TDMCreateFormLabel('<td colspan="8">' . $formHidden->render() . '</td>')); + $form->addElement(new TDMCreateFormLabel('<td>' . $formButton->render() . '</td>')); $form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>')); return $form; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php 2015-05-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -16,17 +16,20 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: abstract.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: TDMCreateAbstract.php 12258 2014-01-02 09:33:29Z timgno $ */ - defined('XOOPS_ROOT_PATH') or die('Restricted access'); - /** * Abstract base class */ abstract class TDMCreateAbstract { - /** + /* + * @var mixed + */ + protected $tdmcreate; + + /** * "module" attribute fot files * * @var mixed 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-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -243,7 +243,6 @@ // Module $modId = $module->getVar('mod_id'); $moduleDirname = $module->getVar('mod_dirname'); - $uploadTablesIcons32 = $this->structure->getUploadPath() . '/images/tables'; $icon32 = 'assets/icons/32'; // Id of tables $criteriaTables = new CriteriaCompo(); @@ -252,7 +251,7 @@ unset($criteriaTables); $ret = array(); // - $table = null; + $table = array(); foreach (array_keys($tables) as $t) { $tableMid = $tables[$t]->getVar('table_mid'); $tableId = $tables[$t]->getVar('table_id'); @@ -268,7 +267,7 @@ // Get Table Object $table = $this->tdmcreate->getHandler('tables')->get($tableId); // Copy of tables images file - if (file_exists($uploadTableImage = $uploadTablesIcons32 . '/' . $tableImage)) { + if (file_exists($uploadTableImage = TDMC_UPLOAD_IMGTAB_PATH . '/' . $tableImage)) { $this->structure->copyFile($icon32, $uploadTableImage, $tableImage); } elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH . '/' . $tableImage)) { $this->structure->copyFile($icon32, $uploadTableImage, $tableImage); @@ -300,7 +299,7 @@ // Class Files $classFiles = ClassFiles::getInstance(); $classFiles->write($module, $table, $tables); - $ret[] = $classFiles->renderFile($tableName . '.php'); + $ret[] = $classFiles->renderFile($tableName . '.php'); } // Creation of user files if (1 == $tableUser) { @@ -381,16 +380,16 @@ $ret[] = $languageBlocks->render(); } // Creation of admin permission files - if (1 == $table->getVar('table_permissions')) { - // Admin Permissions File - $adminPermissions = AdminPermissions::getInstance(); - $adminPermissions->write($module, $tables, 'permissions.php'); - $ret[] = $adminPermissions->render(); - // Templates Admin Permissions File - $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance(); - $adminTemplatesPermissions->write($module, $moduleDirname . '_admin_permissions.tpl'); - $ret[] = $adminTemplatesPermissions->render(); - } + if (1 == $table->getVar('table_permissions')) { + // Admin Permissions File + $adminPermissions = AdminPermissions::getInstance(); + $adminPermissions->write($module, $tables, 'permissions.php'); + $ret[] = $adminPermissions->render(); + // Templates Admin Permissions File + $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance(); + $adminTemplatesPermissions->write($module, $moduleDirname . '_admin_permissions.tpl'); + $ret[] = $adminTemplatesPermissions->render(); + } // Creation of notifications files if (1 == $table->getVar('table_notifications')) { // Include Notifications File @@ -447,7 +446,8 @@ $includeCommentFunctions->write($module, $table, 'comment_functions.php'); $ret[] = $includeCommentFunctions->renderFile(); } - } + + } // Creation of admin files if (1 == $module->getVar('mod_admin')) { // Templates Index File @@ -464,7 +464,7 @@ $ret[] = $userTemplatesHeader->render(); } // Creation of user files - if (1 == $module->getVar('mod_user')) { + if ((1 == $module->getVar('mod_user')) && (1 == $table->getVar('table_user'))) { // User Footer File $userFooter = UserFooter::getInstance(); $userFooter->write($module, 'footer.php'); @@ -474,11 +474,23 @@ $userHeader->write($module, $table, $tables, 'header.php'); $ret[] = $userHeader->render(); // User Notification Update File - if ((1 == $module->getVar('mod_notifications'))) { + if ((1 == $module->getVar('mod_notifications')) && (1 == $table->getVar('table_notifications'))) { $userNotificationUpdate = UserNotificationUpdate::getInstance(); $userNotificationUpdate->write($module, 'notification_update.php'); $ret[] = $userNotificationUpdate->render(); } + // User Print File + if ((1 == $table->getVar('table_print'))) { + $userPrint = UserPrint::getInstance(); + $userPrint->write($module, $table, 'print.php'); + $ret[] = $userPrint->render(); + } + // User Rss File + if ((1 == $table->getVar('table_rss'))) { + $userRss = UserRss::getInstance(); + $userRss->write($module, $table, 'rss.php'); + $ret[] = $userRss->render(); + } // User Index File $userIndex = UserIndex::getInstance(); $userIndex->write($module, 'index.php'); 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-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -16,11 +16,10 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: file.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: TDMCreateFile.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -require_once 'TDMCreateTableFields.php'; xoops_load('XoopsFile'); /** @@ -116,24 +115,16 @@ return $instance; } - /* - * @public function create - * @param string $moduleDirname - * @param string $subdir - * @param string $fileName - * @param string $content - * @param mixed $created - * @param mixed $notCreated - * @param string $mode - */ /** - * @param $moduleDirname - * @param null $subdir - * @param $fileName - * @param string $content - * @param bool $created - * @param bool $notCreated - * @param string $mode + * @public function create + * + * @param $moduleDirname + * @param $subdir + * @param $fileName + * @param $content + * @param $created + * @param $notCreated + * @param $mode */ public function create($moduleDirname, $subdir = null, $fileName, $content = '', $created = false, $notCreated = false, $mode = 'w+') { @@ -141,7 +132,7 @@ $this->created = $created; $this->notCreated = $notCreated; $this->setMode($mode); - $this->setModulePath($moduleDirname); + $this->setRepositoryPath($moduleDirname); if (!empty($content) && is_string($content)) { $this->setContent($content); } @@ -175,25 +166,25 @@ } /* - * @private function setModulePath + * @private function setRepositoryPath * @param string $moduleDirname */ /** * @param $moduleDirname */ - private function setModulePath($moduleDirname) + private function setRepositoryPath($moduleDirname) { $this->uploadPath = TDMC_UPLOAD_REPOSITORY_PATH . DIRECTORY_SEPARATOR . $moduleDirname; } /* - * @private function getModulePath + * @private function getRepositoryPath * @param null */ /** * @return string */ - private function getModulePath() + private function getRepositoryPath() { return $this->uploadPath; } @@ -297,9 +288,9 @@ private function getUploadPath() { if ($this->getSubDir() != null) { - $ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir(); + $ret = $this->getRepositoryPath() . DIRECTORY_SEPARATOR . $this->getSubDir(); } else { - $ret = $this->getModulePath(); + $ret = $this->getRepositoryPath(); } return $ret; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php 2015-05-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -19,14 +19,12 @@ * @version $Id: TDMCreateStructure.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -xoops_load('XoopsFile'); - /** * Class TDMCreateStructure */ class TDMCreateStructure -{ - /* +{ + /* * @var mixed */ private $xoopsFile; @@ -60,7 +58,8 @@ */ public function __construct() { - $this->xoopsFile = XoopsFile::getInstance(); + //parent::__construct(); + $this->xoopsFile = XoopsFile::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-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -16,47 +16,34 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: tablefields.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: TDMCreateTableFields.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -require_once 'TDMCreateAbstract.php'; - /** * Class TDMCreateTableFields */ class TDMCreateTableFields extends TDMCreateAbstract { - /* - * @var string - */ - protected $tdmcreate; - - /* - * @public function constructor - * @param mixed $table - */ /** - * + * @public function constructor + * @param mixed $table */ public function __construct() { $this->tdmcreate = TDMCreateHelper::getInstance(); } - /* - * @public function getTableFields - * @param integer $table_id - */ /** - * @param $table_id - * @return mixed + * @public function getTableFields + * @param $tableId + * @return mixed */ - public function getTableFields($table_id) + public function getTableFields($tableId) { - $criteriaFields = new CriteriaCompo(); - $criteriaFields->add(new Criteria('field_tid', $table_id)); - $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFields); - unset($criteriaFields); + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('field_tid', $tableId)); + $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria); + unset($criteria); return $fields; } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php 2015-05-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -88,7 +88,7 @@ { $ucfModuleDirname = ucfirst($moduleDirname); $ret = <<<EOT -\nrequire_once dirname(dirname(dirname(__DIR__))). '/include/cp_header.php'; +\ninclude dirname(dirname(dirname(__DIR__))). '/include/cp_header.php'; \$thisPath = dirname(__DIR__); include_once \$thisPath.'/include/common.php'; \$sysPathIcon16 = '../' . \$GLOBALS['xoopsModule']->getInfo('sysicons16'); 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-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -16,7 +16,7 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: admin_permissions.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: AdminPermissions.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/user/UserBroken.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -0,0 +1,241 @@ +<?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: UserBroken.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Class UserBroken + */ +class UserBroken extends TDMCreateFile +{ + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return UserBroken + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param mixed $table + * @param string $filename + */ + /** + * @param $module + * @param $table + * @param $filename + */ + public function write($module, $table, $filename) + { + $this->setModule($module); + $this->setTable($table); + $this->setFileName($filename); + } + + /* + * @public function getUserBrokenHeader + * @param null + */ + /** + * @param $moduleDirname + * @return string + */ + public function getUserBrokenHeader($moduleDirname) + { + $ret = <<<EOT +include __DIR__ . '/header.php'; +\$op = {$moduleDirname}_CleanVars(\$_REQUEST, 'op', 'list', 'string'); +// Template +\$xoopsOption['template_main'] = '{$moduleDirname}_broken.tpl'; +include_once XOOPS_ROOT_PATH.'/header.php'; +\$xoTheme->addStylesheet( XOOPS_URL . '/modules/' . \$xoopsModule->getVar('dirname', 'n') . '/assets/css/style.css', null ); +//On recupere la valeur de l'argument op dans l'URL$ +// redirection if not permissions +if (\$perm_submit == false) { + redirect_header('index.php', 2, _NOPERM); + exit(); +} +// +switch (\$op) +{\n +EOT; + + return $ret; + } + + /* + * @public function getAdminPagesList + * @param string $tableName + * @param string $language + */ + /** + * @param $module + * @param $tableName + * @param $language + * @return string + */ + public function getUserBrokenForm($module, $tableName, $language) + { + $stuModuleName = strtoupper($module->getVar('mod_name')); + $ret = <<<EOT + case 'list': + default: + //navigation + \$navigation = _MD_{$stuModuleName}_SUBMIT_PROPOSER; + \$GLOBALS['xoopsTpl']->assign('navigation', \$navigation); + // reference + // title of page + \$title = _MD_{$stuModuleName}_SUBMIT_PROPOSER . ' - '; + \$title .= \$GLOBALS['xoopsModule']->name(); + \$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', \$title); + //description + \$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MD_{$stuModuleName}_SUBMIT_PROPOSER)); + // Description + \$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags({$language}SUBMIT)); + + // Create + \${$tableName}Obj =& \${$tableName}Handler->create(); + \$form = \${$tableName}Obj->getForm(); + \$xoopsTpl->assign('form', \$form->render());\n +EOT; + + return $ret; + } + + /* + * @public function getUserBrokenSave + * @param string $moduleDirname + * @param string $tableName + */ + /** + * @param $moduleDirname + * @param $table_id + * @param $tableName + * @return string + */ + public function getUserBrokenSave($moduleDirname, $table_id, $tableName) + { + $ret = <<<EOT + case 'save': + if ( !\$GLOBALS['xoopsSecurity']->check() ) { + redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors())); + } + if (isset(\$_REQUEST['{$fpif}'])) { + \${$tableName}Obj =& \${$tableName}Handler->get(\$_REQUEST['{$fpif}']); + } else { + \${$tableName}Obj =& \${$tableName}Handler->create(); + } +EOT; + $fields = $this->getTableFields($table_id); + foreach (array_keys($fields) as $f) { + $fieldName = $fields[$f]->getVar('field_name'); + $fieldElement = $fields[$f]->getVar('field_element'); + if ((5 == $fieldElement) || (6 == $fieldElement)) { + $ret .= $this->adminobjects->getCheckBoxOrRadioYN($tableName, $fieldName); + } elseif (13 == $fieldElement) { + $ret .= $this->adminobjects->getUploadImage($moduleDirname, $tableName, $fieldName); + } elseif (14 == $fieldElement) { + $ret .= $this->adminobjects->getUploadFile($moduleDirname, $tableName, $fieldName); + } elseif (15 == $fieldElement) { + $ret .= $this->adminobjects->getTextDateSelect($tableName, $fieldName); + } else { + $ret .= $this->adminobjects->getSimpleSetVar($tableName, $fieldName); + } + } + + $ret .= <<<EOT + if (\${$tableName}Handler->insert(\${$tableName}Obj)) { + redirect_header('index.php', 2, {$language}FORMOK); + } + + echo \${$tableName}Obj->getHtmlErrors(); + \$form =& \${$tableName}Obj->getForm(); + \$form->display(); + break;\n +EOT; + + return $ret; + } + + /* + * @public function getUserBrokenFooter + * @param null + */ + /** + * @return string + */ + public function getUserBrokenFooter() + { + $ret = <<<EOT +include __DIR__ . '/footer.php'; +EOT; + + return $ret; + } + + /* + * @public function render + * @param null + */ + /** + * @return bool|string + */ + public function render() + { + $module = $this->getModule(); + $table = $this->getTable(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $table_id = $table->getVar('table_id'); + $tableName = $table->getVar('table_name'); + $language = $this->getLanguage($moduleDirname, 'MA'); + $content = $this->getHeaderFilesComments($module, $filename); + $content .= $this->getUserBrokenHeader($moduleDirname); + $content .= $this->getUserBrokenForm($module, $tableName, $language); + $content .= $this->getUserBrokenSave($moduleDirname, $table_id, $tableName); + $content .= $this->getUserBrokenFooter(); + $this->tdmcfile->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php 2015-05-03 20:24:25 UTC (rev 13055) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -93,7 +93,7 @@ $ucfModuleDirname = ucfirst($moduleDirname); $content = $this->getHeaderFilesComments($module, $filename); $content .= <<<EOT -require_once dirname(dirname(__DIR__)) . '/mainfile.php'; +include dirname(dirname(__DIR__)) . '/mainfile.php'; \$dirname = \$GLOBALS['xoopsModule']->getVar('dirname'); \$pathname = XOOPS_ROOT_PATH. '/modules/'.\$dirname; include_once \$pathname . '/include/common.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php 2015-05-04 13:07:33 UTC (rev 13056) @@ -0,0 +1,109 @@ +<?php +/* +... [truncated message content] |
From: <txm...@us...> - 2015-05-03 20:24:27
|
Revision: 13055 http://sourceforge.net/p/xoops/svn/13055 Author: txmodxoops Date: 2015-05-03 20:24:25 +0000 (Sun, 03 May 2015) Log Message: ----------- Updated In list you see name of category or topic Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.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/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 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-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -321,7 +321,7 @@ if (1 == $module->getVar('mod_admin')) { // Admin Header File $adminHeader = AdminHeader::getInstance(); - $adminHeader->write($module, $table, 'header.php'); + $adminHeader->write($module, $table, $tables, 'header.php'); $ret[] = $adminHeader->render(); // Admin Index File $adminIndex = AdminIndex::getInstance(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php 2015-05-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -66,10 +66,11 @@ * @param $table * @param $filename */ - public function write($module, $table, $filename) + public function write($module, $table, $tables, $filename) { $this->setModule($module); $this->setTable($table); + $this->setTables($tables); $this->setFileName($filename); } @@ -83,7 +84,7 @@ * @param $table * @return string */ - private function getAdminHeader($moduleDirname, $table) + private function getAdminHeader($moduleDirname, $table, $tables) { $ucfModuleDirname = ucfirst($moduleDirname); $ret = <<<EOT @@ -104,6 +105,14 @@ EOT; } + if (is_array($tables)) { + foreach (array_keys($tables) as $i) { + $tableName = $tables[$i]->getVar('table_name'); + $ret .= <<<EOT +\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');\n +EOT; + } + } $ret .= <<<EOT // \$myts =& MyTextSanitizer::getInstance(); @@ -145,10 +154,11 @@ { $module = $this->getModule(); $table = $this->getTable(); + $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $content = $this->getHeaderFilesComments($module, $filename); - $content .= $this->getAdminHeader($moduleDirname, $table); + $content .= $this->getAdminHeader($moduleDirname, $table, $tables); $this->tdmcfile->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php 2015-05-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminIndex.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -97,7 +97,7 @@ foreach (array_keys($tables) as $i) { $tableName = $tables[$i]->getVar('table_name'); $content .= <<<EOT -\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}'); +//\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}'); \$count_{$tableName} = \${$tableName}Handler->getCount();\n EOT; } 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-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminObjects.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -88,17 +88,34 @@ /* * @public function getUrlFileSetVar - * @param string $tableName - * @param string $fieldName + * @param $moduleDirname + * @param $tableName + * @param $fieldName * @return string */ - public function getUrlFileSetVar($tableName, $fieldName) + public function getUrlFileSetVar($moduleDirname, $tableName, $fieldName) { - $ret = <<<EOT + $stuModuleDirname = strtoupper($moduleDirname); + $ret = <<<EOT // Set Var {$fieldName} \${$tableName}Obj->setVar('{$fieldName}', formatUrl(\$_REQUEST['{$fieldName}']));\n + // Set Var {$fieldName} + include_once XOOPS_ROOT_PATH.'/class/uploader.php'; + \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}'; + \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), + \${$moduleDirname}->getConfig('maxsize'), null, null); + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) { + \$uploader->fetchMedia(\$_POST['xoops_upload_file'][]); + if (!\$uploader->upload()) { + \$errors = \$uploader->getErrors(); + redirect_header('javascript:history.go(-1)', 3, \$errors); + } else { + \${$tableName}Obj->setVar('{$fieldName}', \$uploader->getSavedFileName()); + } + }\n EOT; - return $ret; + + return $ret; } /* @@ -195,6 +212,20 @@ } /* + * @public function getIdGetVar + * @param string $lpFieldName + * @return string + */ + public function getIdGetVar($lpFieldName) + { + $ret = <<<EOT +\t\t\t\t// Get Var Id +\t\t\t\t\${$lpFieldName}['id'] = \$i;\n +EOT; + return $ret; + } + + /* * @public function getSimpleGetVar * @param string $lpFieldName * @param string $rpFieldName @@ -230,6 +261,30 @@ EOT; return $ret; } + + /* + * @public function getParentTopicGetVar + * @param string $moduleDirname + * @param string $lpFieldName + * @param string $rpFieldName + * @param string $tableName + * @param string $tableSoleNameTopic + * @param string $tableNameTopic + * @param string $fieldNameParent + * @return string + */ + public function getParentTopicGetVar($moduleDirname, $lpFieldName, $rpFieldName, $tableName, $tableSoleNameTopic, $tableNameTopic, $fieldNameParent) + { + $ret = <<<EOT +\t\t\t\tif(!isset(\${$tableNameTopic}Handler)) { +\t\t\t\t\t// Get {$tableNameTopic} Handler +\t\t\t\t\t\${$tableNameTopic}Handler =& \${$moduleDirname}->getHandler('{$tableNameTopic}'); +\t\t\t\t} +\t\t\t\t// Get Var {$fieldNameParent} +\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableNameTopic}Handler->get{$tableSoleNameTopic}FromId(\${$tableName}All[\$i]->getVar('{$fieldNameParent}'));\n +EOT; + return $ret; + } /* * @public function getUploadImageGetVar 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-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -90,8 +90,6 @@ \$op = XoopsRequest::getString('op', 'list'); // Request {$fpif} \${$fpif} = XoopsRequest::getInt('{$fpif}'); -// Get {$ucfTableName} Handler -\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}'); // Switch options switch (\$op) {\n @@ -155,14 +153,17 @@ EOT; foreach (array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); - $fieldParent = $fields[$f]->getVar('field_parent'); + $fieldParent = $fields[$f]->getVar('field_parent'); // Verify if table_fieldname is not empty $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableSoleName; - $rpFieldName = $this->tdmcfile->getRightString($fieldName); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); // + if($f < 1) { + $ret .= $this->adminobjects->getIdGetVar($lpFieldName); + } $fieldElement = $fields[$f]->getVar('field_element'); - if ((1 == $fields[$f]->getVar('field_admin')) || ((1 == $tableAutoincrement) && (1 == $fields[$f]->getVar('field_inlist')))) { - switch ($fieldElement) { + if ((1 == $fields[$f]->getVar('field_admin')) || ((1 == $tableAutoincrement) && (1 == $fields[$f]->getVar('field_inlist')))) { + switch ($fieldElement) { case 3: case 4: $ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); @@ -180,26 +181,33 @@ $ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); break; default: - if ((1 == $fieldParent) && 0 == $table->getVar('table_category')) { - if ($fieldElement > 15) { - $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); - $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); - $fieldElementName = $fieldElements->getVar('fieldelement_name'); - $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName)); + if ($fieldElement > 15) { + $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); + $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); + $fieldElementName = $fieldElements->getVar('fieldelement_name'); + $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName)); + if (1 == $fieldParent) { + $criteriaFieldsTopic = new CriteriaCompo(); + $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid)); + $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic); + unset($criteriaFieldsTopic); + foreach (array_keys($fieldsTopic) as $ft) { + if (1 == $fieldsTopic[$ft]->getVar('field_main')) { + $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name'); + } + } + $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldName, $fieldNameTopic); + } else { // - $fieldNameParent = $fieldName; - // - $criteriaFieldsTopic = new CriteriaCompo(); - $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid)); - $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic); - unset($criteriaFieldsTopic); - foreach (array_keys($fieldsTopic) as $ft) { - if (1 == $fieldsTopic[$ft]->getVar('field_main')) { - $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name'); - } + $criteriaTablesTopic = new CriteriaCompo(); + $criteriaTablesTopic->add(new Criteria('table_id', $fieldElementTid)); + $tablesTopic = $this->tdmcreate->getHandler('tables')->getObjects($criteriaTablesTopic); + unset($criteriaTablesTopic); + foreach (array_keys($tablesTopic) as $ft) { + $ucfTableSoleNameTopic = ucfirst($tablesTopic[$ft]->getVar('table_solename')); } - $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic); - } + $ret .= $this->adminobjects->getParentTopicGetVar($moduleDirname, $lpFieldName, $rpFieldName, $tableName, $ucfTableSoleNameTopic, $rpFieldElementName, $fieldName); + } } else { $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName); } @@ -290,7 +298,7 @@ $ret .= $this->adminobjects->getImageListSetVar($moduleDirname, $tableName, $fieldName); break; case 12: - $ret .= $this->adminobjects->getUrlFileSetVar($tableName, $fieldName); + $ret .= $this->adminobjects->getUrlFileSetVar($moduleDirname, $tableName, $fieldName); break; case 13: $ret .= $this->adminobjects->getUploadImageSetVar($moduleDirname, $tableName, $fieldName); 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-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -92,7 +92,7 @@ { redirect_header( XOOPS_URL.'/modules/'.\$xoopsModule->dirname().'/admin/permissions.php', 1, _MP_GPERMUPDATED ); } -\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}'); +//\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}'); // Check admin have access to this page /*\$group = \$xoopsUser->getGroups (); \$groups = xoops_getModuleOption ( 'admin_groups', \$thisDirname ); @@ -144,7 +144,7 @@ break; case 2: \$formTitle = {$language}APPROVE; - \$permName = '{$moduleDirname}_access'; + \$permName = '{$moduleDirname}_approve'; \$permDesc = {$language}APPROVE_DESC; break; case 3: 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-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -231,12 +231,13 @@ */ private function getHeadInForm($module, $table) { - $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableSoleName = $table->getVar('table_solename'); - $ucfTableName = ucfirst($tableName); + $moduleDirname = $module->getVar('mod_dirname'); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tablePermissions = $table->getVar('table_permissions'); + $ucfTableName = ucfirst($tableName); $stuTableSoleName = strtoupper($tableSoleName); - $language = $this->getLanguage($moduleDirname, 'AM'); + $language = $this->getLanguage($moduleDirname, 'AM'); $this->formelements->initForm($module, $table); $ret = <<<EOT /* @@ -248,8 +249,27 @@ { if (\$action === false) { \$action = \$_SERVER['REQUEST_URI']; + }\n +EOT; + if(1 == $tablePermissions) { + $ret .= <<<EOT + global \$xoopsUser, \$xoopsModule; + // Permissions for uploader + \$gperm_handler =& 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 ; + }else{ + \$perm_upload = true; + } + }else{ + \$perm_upload = (\$gperm_handler->checkRight('{$moduleDirname}_ac', 32, \$groups, \$xoopsModule->getVar('mid'))) ? true : false ; } - // Title +EOT; + } + $ret .= <<<EOT + // Title \$title = \$this->isNew() ? sprintf({$language}{$stuTableSoleName}_ADD) : sprintf({$language}{$stuTableSoleName}_EDIT); // Get Theme Form xoops_load('XoopsFormLoader'); @@ -380,11 +400,15 @@ * @param $fpmf * @return string */ - private function getClassHandler($moduleDirname, $tableName, $tableCategory, $tableFieldname, $fpif, $fpmf) + private function getClassHandler($moduleDirname, $table, $fpif, $fpmf) { - $ucfModuleDirname = ucfirst($moduleDirname); + $tableName = $table->getVar('table_name'); + $tableCategory = $table->getVar('table_category'); + $tableSoleName = $table->getVar('table_solename'); + $tableFieldname = $table->getVar('table_fieldname'); + $ucfModuleDirname = ucfirst($moduleDirname); $ucfTableName = ucfirst($tableName); - $ucfTableFieldname = ucfirst($tableFieldname); + $ucfTableSoleName = ucfirst($tableSoleName); $ucfModuleTable = $ucfModuleDirname . $ucfTableName; $ret = <<<EOT /* @@ -393,6 +417,10 @@ class {$ucfModuleTable}Handler extends XoopsPersistableObjectHandler { /* + * @var mixed + */ + private \${$moduleDirname} = null; + /* * Constructor * * @param string \$db @@ -400,6 +428,7 @@ public function __construct(&\$db) { parent::__construct(\$db, '{$moduleDirname}_{$tableName}', '{$moduleDirname}{$tableName}', '{$fpif}', '{$fpmf}'); + \$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance(); } /** @@ -464,22 +493,22 @@ if (1 == $tableCategory) { $ret .= <<<EOT \n\t/** - * Returns the {$ucfTableFieldname} from id + * Returns the {$ucfTableSoleName} from id * * @return string **/ - public function get{$ucfTableFieldname}FromId(\${$tableFieldname}Id) + public function get{$ucfTableSoleName}FromId(\${$tableSoleName}Id) { - \${$tableFieldname}Id = (int) ( \${$tableFieldname}Id ); - \${$fpmf} = ''; - if (\${$tableFieldname}id > 0) { - \${$tableFieldname}Handler = \$this->{$moduleDirname}->getHandler( '{$tableName}' ); - \${$tableFieldname} = & \${$tableFieldname}Handler->get( \${$tableFieldname}Id ); - if (is_object( \${$tableFieldname} )) { - \${$fpmf} = \${$tableFieldname}->getVar( '{$fpmf}' ); + \${$tableSoleName}Id = (int) ( \${$tableSoleName}Id ); + \${$tableSoleName} = ''; + if (\${$tableSoleName}Id > 0) { + \${$tableName}Handler = \$this->{$moduleDirname}->getHandler( '{$tableName}' ); + \${$tableSoleName}Obj = & \${$tableName}Handler->get( \${$tableSoleName}Id ); + if (is_object( \${$tableSoleName}Obj )) { + \${$tableSoleName} = \${$tableSoleName}Obj->getVar( '{$fpmf}' ); } } - return \${$fpmf}; + return \${$tableSoleName}; }\n EOT; } @@ -503,9 +532,6 @@ $module = $this->getModule(); $table = $this->getTable(); $tableName = $table->getVar('table_name'); - $tableCategory = $table->getVar('table_category'); - $tFieldname = $table->getVar('table_fieldname'); - $tableFieldname = empty($tFieldname) ? $tableName : $tFieldname; $moduleDirname = $module->getVar('mod_dirname'); $fields = $this->getTableFields($table->getVar('table_id')); foreach (array_keys($fields) as $f) { @@ -528,7 +554,7 @@ $content .= $this->getFootInForm(); } $content .= $this->getToArray(); - $content .= $this->getClassHandler($moduleDirname, $tableName, $tableCategory, $tableFieldname, $fpif, $fpmf); + $content .= $this->getClassHandler($moduleDirname, $table, $fpif, $fpmf); $this->tdmcfile->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-03 12:51:24 UTC (rev 13054) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-03 20:24:25 UTC (rev 13055) @@ -155,10 +155,10 @@ } $ret .= <<<EOT <td class="center"> - <a href="{$tableName}.php?op=edit&{$field_id}=<{\$list.{$rpFieldName}}>" title="<{\$smarty.const._EDIT}>"> + <a href="{$tableName}.php?op=edit&{$field_id}=<{\$list.id}>" title="<{\$smarty.const._EDIT}>"> <img src="<{xoModuleIcons16 edit.png}>" alt="<{\$smarty.const._EDIT}>" /> </a> - <a href="{$tableName}.php?op=delete&{$field_id}=<{\$list.{$rpFieldName}}>" title="<{\$smarty.const._DELETE}>"> + <a href="{$tableName}.php?op=delete&{$field_id}=<{\$list.id}>" title="<{\$smarty.const._DELETE}>"> <img src="<{xoModuleIcons16 delete.png}>" alt="<{\$smarty.const._DELETE}>" /> </a> </td> |
From: <txm...@us...> - 2015-05-03 12:51:27
|
Revision: 13054 http://sourceforge.net/p/xoops/svn/13054 Author: txmodxoops Date: 2015-05-03 12:51:24 +0000 (Sun, 03 May 2015) Log Message: ----------- Added field table_solename in tables to distinguish the singular name from the plural to the singular name. Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.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/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/IncludeInstall.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.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/user/UserObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -171,10 +171,11 @@ $tablesObj->setVars(array( 'table_mid' => $tableMid, 'table_name' => $_POST['table_name'], + 'table_solename' => $_POST['table_solename'], 'table_category' => ((1 == $_REQUEST['table_category']) ? 1 : 0), + 'table_fieldname' => $tableFieldname, 'table_nbfields' => $tableNumbFields, - 'table_order' => $order, - 'table_fieldname' => $tableFieldname)); + 'table_order' => $order)); //Form table_image include_once XOOPS_ROOT_PATH . '/class/uploader.php'; $uploaddir = is_dir(XOOPS_ICONS32_PATH) ? XOOPS_ICONS32_PATH : TDMC_UPLOAD_IMGTAB_PATH; 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -244,7 +244,6 @@ $modId = $module->getVar('mod_id'); $moduleDirname = $module->getVar('mod_dirname'); $uploadTablesIcons32 = $this->structure->getUploadPath() . '/images/tables'; - $framePathIcon32 = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'; $icon32 = 'assets/icons/32'; // Id of tables $criteriaTables = new CriteriaCompo(); @@ -271,7 +270,7 @@ // Copy of tables images file if (file_exists($uploadTableImage = $uploadTablesIcons32 . '/' . $tableImage)) { $this->structure->copyFile($icon32, $uploadTableImage, $tableImage); - } elseif (file_exists($uploadTableImage = $framePathIcon32 . '/' . $tableImage)) { + } elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH . '/' . $tableImage)) { $this->structure->copyFile($icon32, $uploadTableImage, $tableImage); } // Creation of admin files 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -96,7 +96,8 @@ switch (\$op) {\n EOT; - return $ret; + + return $ret; } /* @@ -111,13 +112,16 @@ * @param $fpmf * @return string */ - public function getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fieldInForm, $fpmf) + public function getAdminPagesList($moduleDirname, $table, $language, $fields, $fpif, $fieldInForm, $fpmf) { $stuModuleDirname = strtoupper($moduleDirname); $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tableFieldname = $table->getVar('table_fieldname'); + $stuTableName = strtoupper($tableName); + $stuTableSoleName = strtoupper($tableSoleName); + $stuTableFieldname = strtoupper($tableFieldname); $tableAutoincrement = $table->getVar('table_autoincrement'); - $stuTableName = strtoupper($tableName); - $stuTableFieldname = strtoupper($tableFieldname); $ret = <<<EOT case 'list': default: @@ -128,7 +132,7 @@ EOT; if (1 == $fieldInForm) { $ret .= <<<EOT - \$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add'); + \$adminMenu->addItemButton({$language}ADD_{$stuTableSoleName}, '{$tableName}.php?op=new', 'add'); \$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());\n EOT; } @@ -153,7 +157,7 @@ $fieldName = $fields[$f]->getVar('field_name'); $fieldParent = $fields[$f]->getVar('field_parent'); // Verify if table_fieldname is not empty - $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName; + $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableSoleName; $rpFieldName = $this->tdmcfile->getRightString($fieldName); // $fieldElement = $fields[$f]->getVar('field_element'); @@ -219,7 +223,8 @@ } break;\n EOT; - return $ret; + + return $ret; } /* @@ -244,7 +249,8 @@ \$GLOBALS['xoopsTpl']->assign('form', \$form->render()); break;\n EOT; - return $ret; + + return $ret; } /* @@ -312,7 +318,8 @@ \$GLOBALS['xoopsTpl']->assign('form', \$form->render()); break;\n EOT; - return $ret; + + return $ret; } /* @@ -324,14 +331,18 @@ * @param string $fpif * @return string */ - public function getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif) + public function getAdminPagesEdit($moduleDirname, $table, $language, $fpif) { - $stuTableName = strtoupper($tableName); + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $tableFieldname = $table->getVar('table_fieldname'); + $stuTableName = strtoupper($tableName); + $stuTableSoleName = strtoupper($tableSoleName); $stuTableFieldname = strtoupper($tableFieldname); $ret = <<<EOT case 'edit': \$template_main = '{$moduleDirname}_admin_{$tableName}.tpl'; - \$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add'); + \$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()); @@ -341,7 +352,8 @@ \$GLOBALS['xoopsTpl']->assign('form', \$form->render()); break;\n EOT; - return $ret; + + return $ret; } /* @@ -400,7 +412,8 @@ echo \${$tableName}Obj->getHtmlErrors(); break;\n EOT; - return $ret; + + return $ret; } /* @@ -416,7 +429,8 @@ } include __DIR__ . '/footer.php'; EOT; - return $ret; + + return $ret; } /* @@ -432,8 +446,7 @@ $module = $this->getModule(); $table = $this->getTable(); $moduleDirname = $module->getVar('mod_dirname'); - $tableName = $table->getVar('table_name'); - $tableFieldname = $table->getVar('table_fieldname'); + $tableName = $table->getVar('table_name'); $language = $this->tdmcfile->getLanguage($moduleDirname, 'AM'); $fields = $this->tdmcfile->getTableFields($table->getVar('table_id')); foreach (array_keys($fields) as $f) { @@ -448,11 +461,11 @@ } $content = $this->getHeaderFilesComments($module, $filename); $content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fpif); - $content .= $this->getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fieldInForm, $fpmf); + $content .= $this->getAdminPagesList($moduleDirname, $table, $language, $fields, $fpif, $fieldInForm, $fpmf); if (1 == $fieldInForm) { $content .= $this->getAdminPagesNew($moduleDirname, $tableName, $language); $content .= $this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf); - $content .= $this->getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif); + $content .= $this->getAdminPagesEdit($moduleDirname, $table, $language, $fpif); } $content .= $this->getAdminPagesDelete($tableName, $language, $fpif, $fpmf); $content .= $this->getAdminPagesFooter(); 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -140,9 +140,7 @@ \$formTitle = {$language}GLOBAL; \$permName = '{$moduleDirname}_ac'; \$permDesc = {$language}GLOBAL_DESC; - \$globalPerms = array( '4' => {$language}GLOBAL_4, - '8' => {$language}GLOBAL_8, - '16' => {$language}GLOBAL_16 ); + \$globalPerms = array( '4' => {$language}GLOBAL_4, '8' => {$language}GLOBAL_8, '16' => {$language}GLOBAL_16 ); break; case 2: \$formTitle = {$language}APPROVE; 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -233,8 +233,9 @@ { $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); $ucfTableName = ucfirst($tableName); - $stuTableName = strtoupper($tableName); + $stuTableSoleName = strtoupper($tableSoleName); $language = $this->getLanguage($moduleDirname, 'AM'); $this->formelements->initForm($module, $table); $ret = <<<EOT @@ -249,7 +250,7 @@ \$action = \$_SERVER['REQUEST_URI']; } // Title - \$title = \$this->isNew() ? sprintf({$language}{$stuTableName}_ADD) : sprintf({$language}{$stuTableName}_EDIT); + \$title = \$this->isNew() ? sprintf({$language}{$stuTableSoleName}_ADD) : sprintf({$language}{$stuTableSoleName}_EDIT); // Get Theme Form xoops_load('XoopsFormLoader'); \$form = new XoopsThemeForm(\$title, 'form', \$action, 'post', true); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -36,6 +36,7 @@ { parent::__construct(); $this->tdmcreate = TDMCreateHelper::getInstance(); + $this->tdmcfile = TDMCreateFile::getInstance(); } /* @@ -590,6 +591,7 @@ $table = $this->getTable(); $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); $language_funct = $this->getLanguage($moduleDirname, 'AM'); //$language_table = $language_funct . strtoupper($tableName); $ret = ''; @@ -609,7 +611,8 @@ if (1 == $fields[$f]->getVar('field_main')) { $fieldMain = $fieldName; } - $language = $language_funct . strtoupper($fieldName); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); + $language = $language_funct . strtoupper($tableSoleName) . '_' . strtoupper($rpFieldName); $required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : ''; // if (1 == $fieldInForm) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -253,14 +253,17 @@ $fieldElement = $fields[$f]->getVar('field_element'); // All fields elements selected switch ($fieldElement) { - case 11: + case 10: + case 13: $content .= $this->getInstallImagesFolder($moduleDirname); foreach (array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); $content .= $this->getInstallTableImagesFolder($tableName); } break; - case 12: + case 11: + case 12: + case 14: $content .= $this->getInstallFilesFolder($moduleDirname); foreach (array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -123,10 +123,10 @@ // foreach (array_keys($tables) as $t) { $tableName = $tables[$t]->getVar('table_name'); - $tableFieldname = $tables[$t]->getVar('table_fieldname'); - $stuTableFieldname = strtoupper($tableFieldname); - $ucfTableFieldname = ucfirst($tableFieldname); - $ret .= $this->defines->getDefine($language, "ADD_{$stuTableFieldname}", "Add {$ucfTableFieldname}"); + $tableSoleName = $tables[$t]->getVar('table_solename'); + $stuTableSoleName = strtoupper($tableSoleName); + $ucfTableSoleName = ucfirst($tableSoleName); + $ret .= $this->defines->getDefine($language, "ADD_{$stuTableSoleName}", "Add New {$ucfTableSoleName}"); } $ret .= $this->defines->getAboveDefines('Lists'); // @@ -152,28 +152,40 @@ $ret = $this->defines->getAboveHeadDefines('Admin Classes'); // foreach (array_keys($tables) as $t) { - $tableId = $tables[$t]->getVar('table_id'); - $tableName = $tables[$t]->getVar('table_name'); - $stuTableName = strtoupper($tableName); - $ucfTableName = ucfirst($tableName); - $ret .= $this->defines->getAboveDefines("{$ucfTableName} add/edit"); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_ADD", "Add {$tableName}"); - $ret .= $this->defines->getDefine($language, "{$stuTableName}_EDIT", "Edit {$tableName}"); - $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableName}"); + $tableId = $tables[$t]->getVar('table_id'); + $tableName = $tables[$t]->getVar('table_name'); + $tableSoleName = $tables[$t]->getVar('table_solename'); + $ucfTableSoleName = ucfirst($tableSoleName); // - $fields = $this->getTableFields($tableId); + $fields = $this->getTableFields($tableId); + foreach (array_keys($fields) as $f) { + $fieldInForm = $fields[$f]->getVar('field_inform'); + } + if(1 == $fieldInForm) { + $ret .= $this->defines->getAboveDefines("{$ucfTableSoleName} add/edit"); + $ret .= $this->defines->getDefine($language, "{$tableSoleName}_ADD", "Add {$ucfTableSoleName}"); + $ret .= $this->defines->getDefine($language, "{$tableSoleName}_EDIT", "Edit {$ucfTableSoleName}"); + } + $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableSoleName}"); + // foreach (array_keys($fields) as $f) { $fieldName = $fields[$f]->getVar('field_name'); $fieldElement = $fields[$f]->getVar('field_element'); $stuFieldName = strtoupper($fieldName); // $rpFieldName = $this->tdmcfile->getRightString($fieldName); - $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_')); + if ($fieldElement > 15) { + $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement); + $fieldElementTid = $fieldElements->getVar('fieldelement_tid'); + $fieldElementName = $fieldElements->getVar('fieldelement_name'); + $fieldNameDesc = substr($fieldElementName, strrpos($fieldElementName, ':'), strlen($fieldElementName)); + $fieldNameDesc = str_replace(': ', '', $fieldNameDesc); + } else { + $fieldNameDesc = ucfirst($rpFieldName); + } // - $fieldNameDesc = ucfirst($rpFieldName); + $ret .= $this->defines->getDefine($language, $tableSoleName .'_'. $rpFieldName, $fieldNameDesc); // - $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc); - // switch ($fieldElement) { case 10: $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images"); @@ -253,7 +265,6 @@ public function render() { $module = $this->getModule(); - $table = $this->getTable(); $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); @@ -263,9 +274,7 @@ $content .= $this->getLanguageAdminIndex($language, $tables); $content .= $this->getLanguageAdminPages($language, $tables); $content .= $this->getLanguageAdminClass($language, $tables); - if (1 == $table->getVar('table_permissions')) { - $content .= $this->getLanguageAdminPermissions($language); - } + $content .= $this->getLanguageAdminPermissions($language); } $content .= $this->getLanguageAdminFoot($language); // 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -87,7 +87,8 @@ */ public function getDefine($language, $defined, $description) { - $ret = <<<EOT + $defined = strtoupper($defined); + $ret = <<<EOT define('{$language}{$defined}', "{$description}");\n EOT; return $ret; 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-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -57,10 +57,10 @@ /* * @public function write - * @param string $module - * @param string $table - * @param string $tables - * @param string $filename + * @param $module + * @param $table + * @param $tables + * @param $filename */ /** * @param $module @@ -76,7 +76,7 @@ /* * @private function getHeaderSqlComments - * @param string $moduleName + * @param $moduleName */ /** * @param $moduleName @@ -105,8 +105,8 @@ /* * @private function getHeadDatabaseTable - * @param string $moduleDirname - * @param string $tableName + * @param $moduleDirname + * @param $tableName * @param integer $fieldsNumb * * Unused IF NOT EXISTS @@ -126,7 +126,7 @@ /* * @private function getDatabaseTables - * @param string $moduleDirname + * @param $moduleDirname * @return null|string */ private function getDatabaseTables($moduleDirname) @@ -146,10 +146,10 @@ /* * @private function getDatabaseFields - * @param string $moduleDirname - * @param string $tableName - * @param integer $tableAutoincrement - * @param integer $fieldsNumb + * @param $moduleDirname + * @param $tableName + * @param $tableAutoincrement + * @param $fieldsNumb * @return null|string */ private function getDatabaseFields($moduleDirname, $tableId, $tableName, $tableAutoincrement, $fieldsNumb) @@ -276,12 +276,12 @@ /* * @private function getFieldRow - * @param string $fieldName - * @param string $fieldTypeValue - * @param string $fieldAttribute - * @param string $fieldNull - * @param string $fieldDefault - * @param string $autoincrement + * @param $fieldName + * @param $fieldTypeValue + * @param $fieldAttribute + * @param $fieldNull + * @param $fieldDefault + * @param $autoincrement * @return string */ private function getFieldRow($fieldName, $fieldTypeValue, $fieldAttribute = null, $fieldNull = null, $fieldDefault = null, $autoincrement = null) @@ -349,8 +349,8 @@ /* * @private function getComma - * @param array $row - * @param string $comma + * @param $row + * @param $comma * @return string */ private function getComma($row, $comma = null) @@ -364,8 +364,8 @@ /* * @private function getCommaCicle - * @param array $comma - * @param integer $index + * @param $comma + * @param $index * @return string */ private function getCommaCicle($comma, $index) @@ -394,7 +394,7 @@ $moduleName = strtolower($module->getVar('mod_name')); $moduleDirname = strtolower($module->getVar('mod_dirname')); $content = $this->getHeaderSqlComments($moduleName); - $content .= $this->getDatabaseTables($moduleDirname); + $content .= $this->getDatabaseTables($moduleDirname); // $this->tdmcfile->create($moduleDirname, 'sql', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -77,8 +77,9 @@ */ private function getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language) { - $tableName = $table->getVar('table_name'); - $ret = <<<EOT + $tableName = $table->getVar('table_name'); + $tableSoleName = $table->getVar('table_solename'); + $ret = <<<EOT <{include file="db:{$moduleDirname}_admin_header.tpl"}> <{if {$tableName}_list}> <table class="outer {$tableName} width100"> @@ -86,8 +87,9 @@ <tr class="head">\n EOT; foreach (array_keys($fields) as $f) { - $fieldName = $fields[$f]->getVar('field_name'); - $lang_fn = $language . strtoupper($fieldName); + $fieldName = $fields[$f]->getVar('field_name'); + $rpFieldName = $this->tdmcfile->getRightString($fieldName); + $lang_fn = $language . strtoupper($tableSoleName) . '_' . strtoupper($rpFieldName); if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_inlist'))) { $ret .= <<<EOT <th class="center"><{\$smarty.const.{$lang_fn}}></th>\n Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -51,7 +51,7 @@ public function getUserHeader($moduleDirname, $tableName) { $ret = <<<EOT -include_once 'header.php'; +include __DIR__ . '/header.php'; \$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl'; include_once XOOPS_ROOT_PATH.'/header.php';\n EOT; @@ -66,7 +66,7 @@ public function getUserIndex($moduleDirname) { $ret = <<<EOT -include_once 'header.php'; +include __DIR__ . '/header.php'; \$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_index.tpl'; include_once XOOPS_ROOT_PATH.'/header.php';\n EOT; @@ -83,7 +83,7 @@ public function getUserFooter() { $ret = <<<EOT -include_once 'footer.php'; +include __DIR__ . '/footer.php'; EOT; return $ret; } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -62,10 +62,10 @@ /* * @public function write - * @param string $module + * @param $module * @param mixed $table * @param mixed $tables - * @param string $filename + * @param $filename */ /** * @param $module @@ -115,7 +115,7 @@ /* * @private function getXoopsVersionHeader - * @param string $language + * @param $language */ /** * @param $module @@ -211,8 +211,8 @@ /* * @private function getXoopsVersionMySQL - * @param string $moduleDirname - * @param string $table + * @param $moduleDirname + * @param $table */ /** * @param $moduleDirname @@ -245,7 +245,7 @@ /* * @private function getXoopsVersionSearch - * @param string $moduleDirname + * @param $moduleDirname */ /** * @param $moduleDirname @@ -265,7 +265,7 @@ /* * @private function getXoopsVersionComments - * @param string $moduleDirname + * @param $moduleDirname */ /** * @param $moduleDirname @@ -288,7 +288,7 @@ /* * @private function getXoopsVersionTemplatesAdmin - * @param string $moduleDirname + * @param $moduleDirname */ /** * @param $moduleDirname @@ -325,7 +325,7 @@ /* * @private function getXoopsVersionTemplatesUser - * @param string $moduleDirname + * @param $moduleDirname */ /** * @param $moduleDirname @@ -353,7 +353,7 @@ /* * @private function getXoopsVersionSubmenu - * @param string $language + * @param $language */ /** * @param $language @@ -384,8 +384,8 @@ /* * @private function getXoopsVersionBlocks - * @param string $moduleDirname - * @param string $language + * @param $moduleDirname + * @param $language */ /** * @param $moduleDirname @@ -420,8 +420,8 @@ /* * @private function getXoopsVersionConfig - * @param string $moduleDirname - * @param string $language + * @param $moduleDirname + * @param $language */ /** * @param $module @@ -596,15 +596,15 @@ /* * @private function getTypeNotifications - * @param string $language - * @param string $type - * @param string $tableName - * @param string $item - * @param string $typeOfNotify + * @param $language + * @param $type + * @param $tableName + * @param $item + * @param $typeOfNotify */ /** * @param $language - * @param string $type + * @param $type * @param $tableName * @param $notifyFile * @param $item @@ -647,8 +647,8 @@ /* * @private function getXoopsVersionNotifications - * @param string $moduleDirname - * @param string $language + * @param $moduleDirname + * @param $language */ /** * @param $moduleDirname Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -51,6 +51,7 @@ $this->initVar('table_mid', XOBJ_DTYPE_INT); $this->initVar('table_category', XOBJ_DTYPE_INT); $this->initVar('table_name', XOBJ_DTYPE_TXTBOX); + $this->initVar('table_solename', XOBJ_DTYPE_TXTBOX); $this->initVar('table_fieldname', XOBJ_DTYPE_TXTBOX); $this->initVar('table_nbfields', XOBJ_DTYPE_INT); $this->initVar('table_order', XOBJ_DTYPE_INT); @@ -137,9 +138,13 @@ } $form->addElement($mods_select, true); // - $table_name_field = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 50, 255, $table_name); + $table_name_field = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 40, 150, $table_name); $table_name_field->setDescription(_AM_TDMCREATE_TABLE_NAME_DESC); $form->addElement($table_name_field, true); + // + $table_solename_field = new XoopsFormText(_AM_TDMCREATE_TABLE_SOLENAME, 'table_solename', 40, 150, $this->getVar('table_solename')); + $table_solename_field->setDescription(_AM_TDMCREATE_TABLE_SOLENAME_DESC); + $form->addElement($table_solename_field, true); // $tablesHandler =& $this->tdmcreate->getHandler('tables'); $criteria = new CriteriaCompo(new Criteria('table_category', 0), 'AND'); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php 2015-05-03 12:51:24 UTC (rev 13054) @@ -137,6 +137,10 @@ define('_AM_TDMCREATE_TABLE_MODULES', "Choose a module"); define('_AM_TDMCREATE_TABLE_NAME', "Table Name"); define('_AM_TDMCREATE_TABLE_NAME_DESC', "Unique Name: It's recommended to use plural word (i.e.: <span style='text-decoration: underline;'>categorie</span><span class='white bold'>s</span>)"); +// Added in version 1.91 +define('_AM_TDMCREATE_TABLE_SOLENAME', "Table Singular Name"); +define('_AM_TDMCREATE_TABLE_SOLENAME_DESC', "Singular Name: It's recommended to use singular word (i.e.: <span style='text-decoration: underline;'>category</span> for admin buttons)"); + define('_AM_TDMCREATE_TABLE_CATEGORY', "This table is a category or topic?"); define('_AM_TDMCREATE_TABLE_CATEGORY_DESC', "<b class='red bold'>WARNING</b>: <i>Once you have used this option for this module, and edit this table,<br />will not be displayed following the creation of other tables</i>"); define('_AM_TDMCREATE_TABLE_NBFIELDS', "Number fields"); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql 2015-05-03 07:22:23 UTC (rev 13053) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql 2015-05-03 12:51:24 UTC (rev 13054) @@ -62,6 +62,7 @@ `table_mid` INT(5) UNSIGNED NOT NULL DEFAULT '0', `table_category` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', `table_name` VARCHAR(150) NOT NULL DEFAULT '', + `table_solename` VARCHAR(150) NOT NULL DEFAULT '', `table_fieldname` VARCHAR(150) NOT NULL DEFAULT '', `table_nbfields` INT(5) UNSIGNED NOT NULL DEFAULT '0', `table_order` INT(5) UNSIGNED NOT NULL DEFAULT '0', |
From: <txm...@us...> - 2015-05-03 07:22:26
|
Revision: 13053 http://sourceforge.net/p/xoops/svn/13053 Author: txmodxoops Date: 2015-05-03 07:22:23 +0000 (Sun, 03 May 2015) Log Message: ----------- Autoloader for all classes Now is not needed to add link in common.php file to the new classes Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/TDMCreateAutoload.php 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/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/include/common.php XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields.tpl Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/TDMCreateAutoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/TDMCreateAutoload.php 2015-05-02 13:42:44 UTC (rev 13052) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/TDMCreateAutoload.php 2015-05-03 07:22:23 UTC (rev 13053) @@ -16,196 +16,42 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: autoloader.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); /** * @since 1.91 */ -class TDMCreateAutoload -{ - /** - * File where classes index is stored - */ - const INDEX_FILE = 'cache/class_index.php'; +// Autoload Function +ini_set('display_errors',1); +error_reporting(E_ALL|E_STRICT); - /** - * @var Autoload - */ - protected static $instance; +function application_autoloader($class) { + $classFilename = $class.'.php'; + $cacheFile = __DIR__ . '/cache/classpaths.cache'; + $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); + if (!is_array($pathCache)) { $pathCache = array(); } + + if (array_key_exists($class, $pathCache)) { + /* Load class using path from cache file (if the file still exists) */ + if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } - /** - * @var string module directory - */ - protected $mod_dir; + } else { + /* Determine the location of the file within the $class_root and, if found, load and cache it */ + $directories = new RecursiveDirectoryIterator(__DIR__); + foreach(new RecursiveIteratorIterator($directories) as $file) { + if ($file->getFilename() == $classFilename) { + $fullPath = $file->getRealPath(); + $pathCache[$class] = $fullPath; + require_once $fullPath; + break; + } + } + } - /** - * @var array array('classname' => 'path/to/filename') - */ - public $index = array(); - - protected static $class_aliases = array('Autoload' => 'TDMCreateAutoload'); - - /** - * - */ - public function __construct() - { - $this->mod_dir = TDMC_PATH . '/'; - $file = TDMC_CLASSES_PATH . TDMCreateAutoload::INDEX_FILE; - if (@filemtime($file) && is_readable($file)) { - $this->index = include($file); - } else { - $this->generateIndex(); - } - } - - /** - * Get instance of autoload - * - * @return TDMCreateAutoload - */ - public static function getInstance() - { - if (!TDMCreateAutoload::$instance) { - TDMCreateAutoload::$instance = new TDMCreateAutoload(); - } - - return TDMCreateAutoload::$instance; - } - - /** - * Retrieve informations about a class in classes index and load it - * - * @param string $classname - * @return mixed - */ - public function load($classname) - { - // Retrocompatibility - if (isset(TDMCreateAutoload::$class_aliases[$classname]) && !interface_exists($classname, false) && !class_exists($classname, false)) { - return eval('class ' . $classname . ' extends ' . TDMCreateAutoload::$class_aliases[$classname] . ' {}'); - } - // regenerate the class index if the requested file doesn't exists - if ((isset($this->index[$classname]) && $this->index[$classname]['path'] && !is_file($this->mod_dir . $this->index[$classname]['path']))) { - $this->generateIndex(); - } - // Call directly class - if (isset($this->index[$classname]['path']) && $this->index[$classname]['path']) { - require($this->mod_dir . $this->index[$classname]['path']); - } - return null; - } - - /** - * Generate classes index - */ - public function generateIndex() - { - $classes = array_merge($this->getClassesFromDir('class/'), - $this->getClassesFromDir('class/files/'), - $this->getClassesFromDir('class/files/admin/'), - $this->getClassesFromDir('class/files/blocks/'), - $this->getClassesFromDir('class/files/classes/'), - $this->getClassesFromDir('class/files/css/'), - $this->getClassesFromDir('class/files/docs/'), - $this->getClassesFromDir('class/files/include/'), - $this->getClassesFromDir('class/files/language/'), - $this->getClassesFromDir('class/files/sql/'), - $this->getClassesFromDir('class/files/templates/'), - $this->getClassesFromDir('class/files/user/')); - ksort($classes); - $content = '<?php return ' . var_export($classes, true) . '; ?>'; - - // Write classes index on disc to cache it - $filename = TDMC_CLASSES_PATH . TDMCreateAutoload::INDEX_FILE; - $filename_tmp = tempnam(dirname($filename), basename($filename . '.')); - if ($filename_tmp !== false && file_put_contents($filename_tmp, $content) !== false) { - if (!@rename($filename_tmp, $filename)) { - unlink($filename_tmp); - } else { - @chmod($filename, 0644); - } - } - // $filename_tmp couldn't be written . $filename should be there anyway (even if outdated), no need to die. - else { - error_log('Cannot write temporary file ' . $filename_tmp); - } - $this->index = $classes; - } - - /** - * Retrieve recursively all classes in a directory and its subdirectories - * - * @param string $path Relative path from root to the directory - * @return array - */ - protected function getClassesFromDir($path) - { - $classes = array(); - $mod_dir = $this->mod_dir; - - foreach (scandir($mod_dir . $path) as $file) { - if ($file[0] != '.') { - if (is_dir($mod_dir . $path . $file)) { - $classes = array_merge($classes, $this->getClassesFromDir($path . $file . '/')); - } else { - if (substr($file, -4) == '.php') { - $content = file_get_contents($mod_dir . $path . $file); - $pattern = '#\W((abstract\s+)?class|interface)\s+(?P<classname>' . basename($file, '.php') . '?)' . '(?:\s+extends\s+[a-z][a-z0-9_]*)?(?:\s+implements\s+[a-z][a-z0-9_]*(?:\s*,\s*[a-z][a-z0-9_]*)*)?\s*\{#i'; - if (preg_match($pattern, $content, $m)) { - $classes[$m['classname']] = array('path' => $path . $file); - } - } - } - } - } - - return $classes; - } - - /** - * @param $classname - * @return null - */ - public function getClassPath($classname) - { - return (isset($this->index[$classname]) && isset($this->index[$classname]['path'])) ? $this->index[$classname]['path'] : null; - } + $serialized_paths = serialize($pathCache); + if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } } -/* - function autoLoader($className) { - // Directories - $directories = array( - '', - 'files/', - 'files/admin/', - 'files/blocks/', - 'files/classes/', - 'files/css/', - 'files/docs/', - 'files/include/', - 'files/language/', - 'files/sql/', - 'files/templates/user/', - 'files/templates/admin/', - 'files/templates/blocks/', - 'files/user/' - ); - // File naming format - $fileNameFormats = array( '%s.php' ); - - foreach($directories as $directory) { - foreach($fileNameFormats as $fileNameFormat) { - $path = $directory.sprintf($fileNameFormat, $className); - if(file_exists($path)) { - include_once $path; - return true; - } - } - } - return false; -}*/ -//spl_autoload_register('TDMCreateAutoload'); +spl_autoload_register('application_autoloader'); \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-02 13:42:44 UTC (rev 13052) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-03 07:22:23 UTC (rev 13053) @@ -19,9 +19,10 @@ * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -require_once 'html/TDMCreateFormLabel.php'; +/*require_once 'html/TDMCreateFormLabel.php'; require_once 'form/TDMCreateFormRadio.php'; -require_once 'form/TDMCreateThemeForm.php'; +require_once 'form/TDMCreateThemeForm.php';*/ +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-02 13:42:44 UTC (rev 13052) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-03 07:22:23 UTC (rev 13053) @@ -19,7 +19,8 @@ * @version $Id: TDMCreateArchitecture.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -require_once 'TDMCreateStructure.php'; +// Autoloader Classes +include __DIR__ . '/TDMCreateAutoload.php'; /** * Class TDMCreateArchitecture @@ -357,7 +358,7 @@ $ret[] = $adminTemplatesHeader->render(); // Language Admin File $languageAdmin = LanguageAdmin::getInstance(); - $languageAdmin->write($module, $tables, 'admin.php'); + $languageAdmin->write($module, $table, $tables, 'admin.php'); $ret[] = $languageAdmin->render(); } // Class Helper File @@ -516,4 +517,4 @@ // Return Array return $ret; } -} +} \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAutoload.php 2015-05-03 07:22:23 UTC (rev 13053) @@ -0,0 +1,57 @@ +<?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: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * @since 1.91 + */ +// Autoload Function +ini_set('display_errors',1); +error_reporting(E_ALL|E_STRICT); + +function applicationAutoloader($class) { + $classFilename = $class.'.php'; + $cacheFile = __DIR__ . '/cache/classpaths.cache'; + $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); + if (!is_array($pathCache)) { $pathCache = array(); } + + if (array_key_exists($class, $pathCache)) { + /* Load class using path from cache file (if the file still exists) */ + if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } + + } else { + /* Determine the location of the file within the $class_root and, if found, load and cache it */ + $directories = new RecursiveDirectoryIterator(__DIR__); + foreach(new RecursiveIteratorIterator($directories) as $file) { + if ($file->getFilename() == $classFilename) { + $fullPath = $file->getRealPath(); + $pathCache[$class] = $fullPath; + require_once $fullPath; + break; + } + } + } + + $serialized_paths = serialize($pathCache); + if ($serialized_paths != $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/language/LanguageAdmin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-02 13:42:44 UTC (rev 13052) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-03 07:22:23 UTC (rev 13053) @@ -69,10 +69,11 @@ * @param string $filename * @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); } @@ -252,19 +253,17 @@ public function render() { $module = $this->getModule(); - $tables = $this->getTables(); + $table = $this->getTable(); + $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $language = $this->getLanguage($moduleDirname, 'AM'); $content = $this->getHeaderFilesComments($module, $filename); - foreach (array_keys($tables) as $t) { - $tablePermissions = $tables[$t]->getVar('table_permissions'); - } if (is_array($tables)) { $content .= $this->getLanguageAdminIndex($language, $tables); $content .= $this->getLanguageAdminPages($language, $tables); $content .= $this->getLanguageAdminClass($language, $tables); - if (1 == $tablePermissions) { + if (1 == $table->getVar('table_permissions')) { $content .= $this->getLanguageAdminPermissions($language); } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/include/common.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/include/common.php 2015-05-02 13:42:44 UTC (rev 13052) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/include/common.php 2015-05-03 07:22:23 UTC (rev 13053) @@ -49,68 +49,4 @@ // Xoops Request include_once XOOPS_ROOT_PATH . '/class/xoopsrequest.php'; include_once TDMC_PATH . '/include/functions.php'; -//require_once(TDMC_CLASSES_PATH.'/TDMCreateAutoload.php'); -//spl_autoload_register(array(TDMCreateAutoload::getInstance(), 'load')); -// Include files -$cf = '/class/files/'; -$cfa = '/class/files/admin/'; -$cfb = '/class/files/blocks/'; -$cfcl = '/class/files/classes/'; -$cfcs = '/class/files/css/'; -$cfd = '/class/files/docs/'; -$cfi = '/class/files/include/'; -$cfl = '/class/files/language/'; -$cfs = '/class/files/sql/'; -$cftu = '/class/files/templates/user/'; -$cfta = '/class/files/templates/admin/'; -$cftb = '/class/files/templates/blocks/'; -$cfu = '/class/files/user/'; -include_once TDMC_PATH . '/class/TDMCreateHelper.php'; -include_once TDMC_PATH . '/class/TDMCreateSession.php'; -require_once TDMC_PATH . $cf . 'TDMCreateFile.php'; -include_once TDMC_PATH . $cfa . 'AdminAbout.php'; -include_once TDMC_PATH . $cfa . 'AdminFooter.php'; -include_once TDMC_PATH . $cfa . 'AdminHeader.php'; -include_once TDMC_PATH . $cfa . 'AdminIndex.php'; -include_once TDMC_PATH . $cfa . 'AdminMenu.php'; -include_once TDMC_PATH . $cfa . 'AdminPages.php'; -include_once TDMC_PATH . $cfa . 'AdminPermissions.php'; -include_once TDMC_PATH . $cfb . 'BlocksFiles.php'; -include_once TDMC_PATH . $cfcl . 'ClassFiles.php'; -include_once TDMC_PATH . $cfcl . 'ClassHelper.php'; -include_once TDMC_PATH . $cfcs . 'CssStyles.php'; -include_once TDMC_PATH . $cfd . 'DocsChangelog.php'; -include_once TDMC_PATH . $cfd . 'DocsFiles.php'; -include_once TDMC_PATH . $cfi . 'IncludeComments.php'; -include_once TDMC_PATH . $cfi . 'IncludeCommentFunctions.php'; -include_once TDMC_PATH . $cfi . 'IncludeCommon.php'; -include_once TDMC_PATH . $cfi . 'IncludeFunctions.php'; -include_once TDMC_PATH . $cfi . 'IncludeInstall.php'; -include_once TDMC_PATH . $cfi . 'IncludeJquery.php'; -include_once TDMC_PATH . $cfi . 'IncludeNotifications.php'; -include_once TDMC_PATH . $cfi . 'IncludeSearch.php'; -include_once TDMC_PATH . $cfi . 'IncludeUpdate.php'; -include_once TDMC_PATH . $cfl . 'LanguageAdmin.php'; -include_once TDMC_PATH . $cfl . 'LanguageBlocks.php'; -include_once TDMC_PATH . $cfl . 'LanguageHelp.php'; -include_once TDMC_PATH . $cfl . 'LanguageMailTpl.php'; -include_once TDMC_PATH . $cfl . 'LanguageMain.php'; -include_once TDMC_PATH . $cfl . 'LanguageModinfo.php'; -include_once TDMC_PATH . $cfs . 'SqlFile.php'; -include_once TDMC_PATH . $cfta . 'TemplatesAdminAbout.php'; -include_once TDMC_PATH . $cfta . 'TemplatesAdminHeader.php'; -include_once TDMC_PATH . $cfta . 'TemplatesAdminIndex.php'; -include_once TDMC_PATH . $cfta . 'TemplatesAdminFooter.php'; -include_once TDMC_PATH . $cfta . 'TemplatesAdminPages.php'; -include_once TDMC_PATH . $cfta . 'TemplatesAdminPermissions.php'; -include_once TDMC_PATH . $cftb . 'TemplatesBlocks.php'; -include_once TDMC_PATH . $cftu . 'TemplatesUserHeader.php'; -include_once TDMC_PATH . $cftu . 'TemplatesUserIndex.php'; -include_once TDMC_PATH . $cftu . 'TemplatesUserFooter.php'; -include_once TDMC_PATH . $cftu . 'TemplatesUserPages.php'; -include_once TDMC_PATH . $cfu . 'UserFooter.php'; -include_once TDMC_PATH . $cfu . 'UserHeader.php'; -include_once TDMC_PATH . $cfu . 'UserIndex.php'; -include_once TDMC_PATH . $cfu . 'UserPages.php'; -include_once TDMC_PATH . $cfu . 'UserNotificationUpdate.php'; -include_once TDMC_PATH . $cfu . 'UserXoopsVersion.php'; +include_once TDMC_PATH . '/class/TDMCreateHelper.php'; \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields.tpl =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields.tpl 2015-05-02 13:42:44 UTC (rev 13052) +++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/templates/admin/tdmcreate_fields.tpl 2015-05-03 07:22:23 UTC (rev 13053) @@ -73,4 +73,4 @@ <div class="spacer"><{$form}></div> <{/if}> <!-- Footer --> -<{includeq file="db:tdmcreate_footer.tpl"}> +<{includeq file="db:tdmcreate_footer.tpl"}> \ No newline at end of file |