From: <txm...@us...> - 2015-06-10 16:08:37
|
Revision: 13086 http://sourceforge.net/p/xoops/svn/13086 Author: txmodxoops Date: 2015-06-10 16:08:35 +0000 (Wed, 10 Jun 2015) Log Message: ----------- Fix added more files Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php 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/include/IncludeFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php 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/include/common.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -98,4 +98,58 @@ { parent::__construct($db, 'tdmcreate_fieldelements', 'tdmcreatefieldelements', 'fieldelement_id', 'fieldelement_name'); } + + /** + * Get Count Fields + */ + public function getCountFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getCount($criteria); + } + + /** + * Get Objects Fields + */ + public function getObjectsFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getObjects($criteria); + } + + /** + * Get All Fields + */ + public function getAllFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_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 getAllFieldElementsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('fieldelement_mid', $modId)); + $criteria->add(new Criteria('fieldelement_tid', $tabId)); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getAll($criteria); + } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -35,6 +35,24 @@ * @var mixed */ private $tdmcreate; + + /** + * Options + */ + public $options = array( + 'parent', + 'admin', + 'inlist', + 'inform', + 'user', + 'thead', + 'tbody', + 'tfoot', + 'block', + 'main', + 'search', + 'required' + ); /* * @public function constructor class @@ -46,7 +64,6 @@ public function __construct() { $this->tdmcreate = TDMCreateHelper::getInstance(); - $this->tdmcreate = TDMCreateHelper::getInstance(); $this->initVar('field_id', XOBJ_DTYPE_INT); $this->initVar('field_mid', XOBJ_DTYPE_INT); $this->initVar('field_tid', XOBJ_DTYPE_INT); @@ -120,7 +137,7 @@ $form->setExtra('enctype="multipart/form-data"'); // New Object HtmlTable - $form->addElement(new TDMCreateFormLabel('<table border="0" cellspacing="1" class="outer width100">')); + $form->addElement(new TDMCreateFormLabel('<table cellspacing="1" class="outer width100">')); $form->addElement(new TDMCreateFormLabel('<thead class="center">')); $form->addElement(new TDMCreateFormLabel('<tr class="head"><th colspan="9">' . $title . '</th></tr>')); $form->addElement(new TDMCreateFormLabel('<tr class="head width5">')); @@ -156,8 +173,8 @@ $fieldsForm = TDMCreateFields::getInstance(); $form = $fieldsForm->getHeaderForm($action); // Get handler tables - $table_obj = $this->tdmcreate->getHandler('tables'); // Changed by goffy - $tableAutoincrement = $table_obj->get($fieldTid)->getVar('table_autoincrement'); // Added by goffy + $tableObj = $this->tdmcreate->getHandler('tables'); // Changed by goffy + $tableAutoincrement = $tableObj->get($fieldTid)->getVar('table_autoincrement'); // Added by goffy // Loop for fields number $class = 'even'; for ($i = 1; $i <= $fieldNumb; ++$i) { @@ -242,11 +259,7 @@ $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); - $checkFieldParent->addOption($i, _AM_TDMCREATE_FIELD_PARENT ); - $parametersTray->addElement($checkFieldParent);*/ - + $field_admin = 0; $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin); $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); @@ -287,11 +300,6 @@ $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); $parametersTray->addElement($checkFieldBlock); - $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); @@ -301,6 +309,11 @@ $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required); $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); $parametersTray->addElement($checkFieldRequired); + + $fieldMain = (1 == $tableAutoincrement) ? 2 : 1; + $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); + $checkFieldMain->addOption($i, _AM_TDMCREATE_FIELD_MAIN); + $parametersTray->addElement($checkFieldMain); // $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>')); } @@ -392,6 +405,15 @@ $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaTable)); unset($criteriaElement, $criteriaTable); $parametersTray->addElement($fieldElementsSelect); + + // Options + /*$moduleOption = $this->getOptions(); + $checkbox = new XoopsFormCheckbox(' ', 'fields_option[' . $id . ']', $moduleOption, '<br />'); + $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC); + foreach ($this->options as $option) { + $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_FIELD_' . strtoupper($option))); + } + $parametersTray->addElement($checkbox);*/ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent')); $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT); @@ -428,19 +450,20 @@ $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block')); $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); $parametersTray->addElement($checkFieldBlock); - - $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 = new XoopsFormCheckBox(' ', 'field_search[' . $id . ']', $field->getVar('field_search')); $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH); $parametersTray->addElement($check_field_search); $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required')); $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); $parametersTray->addElement($checkFieldRequired); + + $fieldMain = (1 == $field->getVar('field_main')) ? $id : 1; + $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); + $checkFieldMain->addOption($id, _AM_TDMCREATE_FIELD_MAIN); + $parametersTray->addElement($checkFieldMain); + // $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>')); } } @@ -504,6 +527,75 @@ return $ret; } + + /** + * Get Options + */ + /** + * @param $key + * + * @return string + */ + public function getOptions() + { + $ret = array(); + // + if ($this->getVar('field_parent') == 1) { + array_push($ret, 'parent'); + } + if ($this->getVar('field_admin') == 1) { + array_push($ret, 'admin'); + } + if ($this->getVar('field_inlist') == 1) { + array_push($ret, 'inlist'); + } + if ($this->getVar('field_inform') == 1) { + array_push($ret, 'inform'); + } + if ($this->getVar('field_user') == 1) { + array_push($ret, 'user'); + } + if ($this->getVar('field_thead') == 1) { + array_push($ret, 'thead'); + } + if ($this->getVar('field_tbody') == 1) { + array_push($ret, 'tbody'); + } + if ($this->getVar('field_tfoot') == 1) { + array_push($ret, 'tfoot'); + } + if ($this->getVar('field_block') == 1) { + array_push($ret, 'block'); + } + if ($this->getVar('field_main') == 1) { + array_push($ret, 'main'); + } + if ($this->getVar('field_search') == 1) { + array_push($ret, 'search'); + } + if ($this->getVar('field_required') == 1) { + array_push($ret, 'required'); + } + + return $ret; + } + + /** + * Get Defined Language + */ + /** + * @param $lang + * + * @return string + */ + private static function getDefinedLanguage($lang) + { + if (defined($lang)) { + return constant($lang); + } + + return $lang; + } } /* 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-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -134,12 +134,12 @@ // If file exists if (!file_exists($logoGifFrom)) { // Rename file - $copyFile = TDMC_IMAGE_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif'; + $copyFile = TDMC_IMAGES_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif'; $copyNewFile = $logoGifFrom; copy($copyFile, $copyNewFile); } else { // Copy file - $copyFile = TDMC_IMAGE_LOGOS_URL . '/' . $stlModuleAuthor . '_logo.gif'; + $copyFile = TDMC_IMAGES_LOGOS_URL . '/' . $stlModuleAuthor . '_logo.gif'; $copyNewFile = $logoGifFrom; copy($copyFile, $copyNewFile); } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -414,10 +414,10 @@ $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); $content = $this->getHeaderFilesComments($module, $filename); - $content .= $this->getFunctionBlock($moduleDirname); - if(1 == $table->getVar('table_blocks')) { - $content .= $this->getFunctionCleanVars($moduleDirname); + if(1 == $table->getVar('table_blocks')) { + $content .= $this->getFunctionBlock($moduleDirname); } + $content .= $this->getFunctionCleanVars($moduleDirname); if(1 == $table->getVar('table_permissions')) { $content .= $this->getFunctionGetMyItemIds($moduleDirname, $tableName); } Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -0,0 +1,110 @@ +<?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: TemplatesUserDisqusComments.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Class TemplatesUserDisqusComments + */ +class TemplatesUserDisqusComments extends TDMCreateFile +{ + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TemplatesUserDisqusComments + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param string $filename + */ + /** + * @param $module + * @param $filename + * @return string + */ + public function write($module, $filename) + { + $this->setModule($module); + $this->setFileName($filename); + } + + /* + * @private function getTemplatesCommentCode + * @param null + */ + /** + * @param null + * @return string + */ + private function getTemplatesCommentCode() + { + $ret = <<<EOT +Pleace! Enter here your comments code +EOT; + + return $ret; + } + + /* + * @public function renderFile + * @param string $filename + */ + /** + * @param $filename + * @return bool|string + */ + public function renderFile() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $content = $this->getTemplatesCommentCode(); + // + $this->tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -0,0 +1,110 @@ +<?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: TemplatesUserFacebookComments.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Class TemplatesUserFacebookComments + */ +class TemplatesUserFacebookComments extends TDMCreateFile +{ + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TemplatesUserFacebookComments + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param string $filename + */ + /** + * @param $module + * @param $filename + * @return string + */ + public function write($module, $filename) + { + $this->setModule($module); + $this->setFileName($filename); + } + + /* + * @private function getTemplatesCommentCode + * @param null + */ + /** + * @param null + * @return string + */ + private function getTemplatesCommentCode() + { + $ret = <<<EOT +Pleace! Enter here your comments code +EOT; + + return $ret; + } + + /* + * @public function renderFile + * @param string $filename + */ + /** + * @param $filename + * @return bool|string + */ + public function renderFile() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $content = $this->getTemplatesCommentCode(); + // + $this->tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -137,11 +137,11 @@ if(in_array(1, $fieldParentId)) { $ret .= <<<EOT \${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}(); -// -include_once XOOPS_ROOT_PATH . '/class/tree.php'; -\$mytree = new XoopsObjectTree(\${$tableName}All, '{$fieldId}', '{$fieldParent}'); +// If there are {$tableName} if (\${$tableName}Count > 0) { \${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}(); + include_once XOOPS_ROOT_PATH . '/class/tree.php'; + \$mytree = new XoopsObjectTree(\${$tableName}All, '{$fieldId}', '{$fieldParent}'); foreach (array_keys(\${$tableName}All) as \${$tableFieldname}) { \${$tableSoleName} = \${$tableName}All[\${$tableFieldname}]->getValues(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -795,11 +795,19 @@ 'default' => 0); \$modversion['config'][] = array( - 'name' => "fbcomments", - 'title' => "{$language}FBCOMMENTS", - 'description' => "{$language}FBCOMMENTS_DESC", + 'name' => "facebook_comments", + 'title' => "{$language}FACEBOOK_COMMENTS", + 'description' => "{$language}FACEBOOK_COMMENTS_DESC", 'formtype' => "yesno", 'valuetype' => "int", + 'default' => 0); + +\$modversion['config'][] = array( + 'name' => "disqus_comments", + 'title' => "{$language}DISQUS_COMMENTS", + 'description' => "{$language}DISQUS_COMMENTS_DESC", + 'formtype' => "yesno", + 'valuetype' => "int", 'default' => 0);\n EOT; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -48,7 +48,7 @@ } } } - if (!file_exists($imageBase = TDMC_IMAGE_LOGOS_PATH . "/empty.png") || + if (!file_exists($imageBase = TDMC_IMAGES_LOGOS_PATH . "/empty.png") || !file_exists($font = TDMC_FONTS_PATH . "/VeraBd.ttf") || !file_exists($iconFile = XOOPS_ICONS32_PATH . '/' . basename($logoIcon))) { return false; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -415,7 +415,7 @@ } } } - if (!file_exists($imageBase = TDMC_IMAGE_LOGOS_PATH . '/empty.png') || + if (!file_exists($imageBase = TDMC_IMAGES_LOGOS_PATH . '/empty.png') || !file_exists($font = TDMC_FONTS_PATH . '/VeraBd.ttf') || !file_exists($iconFile = XOOPS_ICONS32_PATH . '/' . basename($logoIcon)) ) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -33,8 +33,8 @@ define('TDMC_FONTS_URL', TDMC_URL . '/assets/fonts'); define('TDMC_IMAGE_PATH', TDMC_PATH . '/assets/images'); define('TDMC_IMAGE_URL', TDMC_URL . '/assets/images'); -define('TDMC_IMAGE_LOGOS_PATH', TDMC_PATH . '/assets/images/logos'); -define('TDMC_IMAGE_LOGOS_URL', TDMC_URL . '/assets/images/logos'); +define('TDMC_IMAGES_LOGOS_PATH', TDMC_PATH . '/assets/images/logos'); +define('TDMC_IMAGES_LOGOS_URL', TDMC_URL . '/assets/images/logos'); define('TDMC_ICONS_PATH', TDMC_PATH . '/assets/icons'); define('TDMC_ICONS_URL', TDMC_URL . '/assets/icons'); // Uploads Directories 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-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -248,7 +248,7 @@ define('_AM_TDMCREATE_FIELD_ADMIN', "Admin: In Files"); define('_AM_TDMCREATE_FIELD_USER', "User: In Files"); define('_AM_TDMCREATE_FIELD_BLOCK', "Block: In Files"); -define('_AM_TDMCREATE_FIELD_MAINFIELD', "Table: Main Field"); +define('_AM_TDMCREATE_FIELD_MAIN', "Table: Main Field"); define('_AM_TDMCREATE_FIELD_SEARCH', "Search: Index"); define('_AM_TDMCREATE_FIELD_REQUIRED', "Field: Required"); define('_AM_TDMCREATE_ADMIN_SUBMIT', "Send"); |