txmodxoops / tdmcreate

class/Modules.php

Spacing +21 added lines, -21 removed lines

@@ -183,7 +183,7 @@ 
         $isNew = $this->isNew();
         $title = $isNew ? sprintf(_AM_TDMCREATE_MODULE_NEW) : sprintf(_AM_TDMCREATE_MODULE_EDIT);
 
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $form = new \XoopsThemeForm($title, 'moduleform', $action, 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
@@ -242,7 +242,7 @@ 
         // Options
         $checkbox = new \XoopsFormCheckbox(' ', 'module_option', $this->getOptionsModules(), '<br>');
         foreach ($this->options as $option) {
-            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_MODULE_' . mb_strtoupper($option)));
+            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_MODULE_'.mb_strtoupper($option)));
         }
         $optionsTray->addElement($checkbox);
 
@@ -251,17 +251,17 @@ 
         $modImage = $this->getVar('mod_image');
         $modImage = $modImage ?: $set['image'];
 
-        $uploadDirectory = 'uploads/' . $GLOBALS['xoopsModule']->dirname() . '/images/modules';
+        $uploadDirectory = 'uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/modules';
         $imgtray         = new \XoopsFormElementTray(_AM_TDMCREATE_MODULE_IMAGE, '<br>');
-        $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './' . mb_strtolower($uploadDirectory) . '/');
+        $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.mb_strtolower($uploadDirectory).'/');
         $imageselect     = new \XoopsFormSelect($imgpath, 'mod_image', $modImage);
         $modImageArray   = \XoopsLists::getImgListAsArray(TDMC_UPLOAD_IMGMOD_PATH);
         foreach ($modImageArray as $image) {
             $imageselect->addOption($image, $image);
         }
-        $imageselect->setExtra("onchange='showImgSelected(\"image3\", \"mod_image\", \"" . $uploadDirectory . '", "", "' . XOOPS_URL . "\")'");
+        $imageselect->setExtra("onchange='showImgSelected(\"image3\", \"mod_image\", \"".$uploadDirectory.'", "", "'.XOOPS_URL."\")'");
         $imgtray->addElement($imageselect);
-        $imgtray->addElement(new \XoopsFormLabel('', "<br><img src='" . TDMC_UPLOAD_IMGMOD_URL . '/' . $modImage . "' name='image3' id='image3' alt='' /><br>"));
+        $imgtray->addElement(new \XoopsFormLabel('', "<br><img src='".TDMC_UPLOAD_IMGMOD_URL.'/'.$modImage."' name='image3' id='image3' alt='' /><br>"));
 
         $fileseltray = new \XoopsFormElementTray('', '<br>');
         $fileseltray->addElement(new \XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $helper->getConfig('maxsize')));
@@ -271,25 +271,25 @@ 
         //---------- START LOGO GENERATOR -----------------
         $tables_img = $this->getVar('table_image') ?: 'about.png';
         $iconsdir   = '/Frameworks/moduleclasses/icons/32';
-        if (is_dir(XOOPS_ROOT_PATH . $iconsdir)) {
+        if (is_dir(XOOPS_ROOT_PATH.$iconsdir)) {
             $uploadDirectory = $iconsdir;
             $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, ".{$iconsdir}/");
         } else {
-            $uploadDirectory = '/uploads/' . $GLOBALS['xoopsModule']->dirname() . '/images/tables';
-            $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './uploads/' . $GLOBALS['xoopsModule']->dirname() . '/images/tables');
+            $uploadDirectory = '/uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/tables';
+            $imgpath         = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/tables');
         }
         $createLogoTray    = new \XoopsFormElementTray(_AM_TDMCREATE_MODULE_CREATENEWLOGO, '<br>');
         $iconSelect        = new \XoopsFormSelect($imgpath, 'tables_img', $tables_img, 8);
-        $tablesImagesArray = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $uploadDirectory);
+        $tablesImagesArray = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.$uploadDirectory);
         foreach ($tablesImagesArray as $image) {
             $iconSelect->addOption($image, $image);
         }
-        $iconSelect->setExtra(" onchange='showImgSelected2(\"image4\", \"tables_img\", \"" . $uploadDirectory . '", "", "' . XOOPS_URL . "\")' ");
+        $iconSelect->setExtra(" onchange='showImgSelected2(\"image4\", \"tables_img\", \"".$uploadDirectory.'", "", "'.XOOPS_URL."\")' ");
         $createLogoTray->addElement($iconSelect);
-        $createLogoTray->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . '/' . $uploadDirectory . '/' . $tables_img . "' name='image4' id='image4' alt='' />"));
+        $createLogoTray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL.'/'.$uploadDirectory.'/'.$tables_img."' name='image4' id='image4' alt='' />"));
         // Create preview and submit buttons
         $buttonLogoGenerator4 = new \XoopsFormButton('', 'button4', _AM_TDMCREATE_MODULE_CREATENEWLOGO, 'button');
-        $buttonLogoGenerator4->setExtra(" onclick='createNewModuleLogo(\"" . TDMC_URL . "\")' ");
+        $buttonLogoGenerator4->setExtra(" onclick='createNewModuleLogo(\"".TDMC_URL."\")' ");
         $createLogoTray->addElement($buttonLogoGenerator4);
 
         $form->addElement($createLogoTray);
@@ -349,7 +349,7 @@ 
         $modSubversion = $isNew ? $set['subversion'] : $this->getVar('mod_subversion');
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_MODULE_SUBVERSION, 'mod_subversion', 50, 255, $modSubversion));
 
-        $buttonTray = new \XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', '');
+        $buttonTray = new \XoopsFormElementTray(_REQUIRED.' <sup class="red bold">*</sup>', '');
         $buttonTray->addElement(new \XoopsFormHidden('op', 'save'));
         $buttonTray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $form->addElement($buttonTray);
@@ -376,9 +376,9 @@ 
             }
         }
 
-        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))) {
+        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;
         }
         $imageModule = imagecreatefrompng($imageBase);
@@ -388,12 +388,12 @@ 
         $spaceBorder = (92 - mb_strlen($moduleDirname) * 7.5) / 2;
         imagefttext($imageModule, 8.5, 0, $spaceBorder, 45, $textColor, $font, ucfirst($moduleDirname), []);
         imagecopy($imageModule, $imageIcon, 29, 2, 0, 0, 32, 32);
-        $logoImg = '/' . 'logoModule.png';
-        imagepng($imageModule, TDMC_UPLOAD_IMGMOD_PATH . $logoImg);
+        $logoImg = '/'.'logoModule.png';
+        imagepng($imageModule, TDMC_UPLOAD_IMGMOD_PATH.$logoImg);
         imagedestroy($imageModule);
         imagedestroy($imageIcon);
 
-        return TDMC_UPLOAD_IMGMOD_URL . $logoImg;
+        return TDMC_UPLOAD_IMGMOD_URL.$logoImg;
     }
 
     /**
@@ -435,7 +435,7 @@ 
     {
         $retModules = [];
         foreach ($this->options as $option) {
-            if (1 == $this->getVar('mod_' . $option)) {
+            if (1 == $this->getVar('mod_'.$option)) {
                 $retModules[] = $option;
             }
         }

class/Files/CreateFile.php

Spacing +11 added lines, -11 removed lines

@@ -154,7 +154,7 @@ 
      */
     private function setRepositoryPath($moduleDirname)
     {
-        $this->uploadPath = TDMC_UPLOAD_REPOSITORY_PATH . '/' . $moduleDirname;
+        $this->uploadPath = TDMC_UPLOAD_REPOSITORY_PATH.'/'.$moduleDirname;
     }
 
     /**
@@ -253,7 +253,7 @@ 
     private function getUploadPath()
     {
         if (null != $this->getSubDir()) {
-            $ret = $this->getRepositoryPath() . '/' . $this->getSubDir();
+            $ret = $this->getRepositoryPath().'/'.$this->getSubDir();
         } else {
             $ret = $this->getRepositoryPath();
         }
@@ -310,12 +310,12 @@ 
      */
     public function getLanguage($moduleDirname, $prefix = '', $suffix = '')
     {
-        $lang = '_' . $prefix . '_' . mb_strtoupper($moduleDirname);
+        $lang = '_'.$prefix.'_'.mb_strtoupper($moduleDirname);
         $ret  = $lang;
         if (!empty($suffix) || '_' !== $suffix) {
-            $ret = $lang . '_' . $suffix;
+            $ret = $lang.'_'.$suffix;
         } elseif ('_' === $suffix) {
-            $ret = $lang . '_';
+            $ret = $lang.'_';
         }
 
         return $ret;
@@ -365,10 +365,10 @@ 
         $rightString = $this->getRightString($string);
         $leftString  = $this->getLeftString($string);
         if ($ucfirst) {
-            return $this->getUcfirst($leftString) . $this->getUcfirst($rightString);
+            return $this->getUcfirst($leftString).$this->getUcfirst($rightString);
         }
         if ($lcfirst) {
-            return $this->getLcfirst($leftString) . $this->getUcfirst($rightString);
+            return $this->getLcfirst($leftString).$this->getUcfirst($rightString);
         }
 
         return $string;
@@ -493,11 +493,11 @@ 
         } else {
             $ret .= "\n/*\n";
         }
-        $filename = TDMC_CLASS_PATH . '/files/docs/license.txt';
+        $filename = TDMC_CLASS_PATH.'/files/docs/license.txt';
         $handle   = fopen($filename, 'rb');
         $data     = fread($handle, filesize($filename));
         fclose($handle);
-        $ret       .= $data . "\n";
+        $ret       .= $data."\n";
         $ret       .= "*/\n";
         $copyright = [
             $name           => 'module for xoops',
@@ -510,7 +510,7 @@ 
             '@author    '   => "    {$author} - Email:<{$authorMail}> - Website:<{$authorWebsiteUrl}>",
 //            '@version    '  => "   \$Id: {$version} {$fileName} {$subversion} {$date}Z {$credits} \$",
         ];
-        $ret       .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentMultiLine($copyright);
+        $ret .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentMultiLine($copyright);
 
         return $ret;
     }
@@ -523,7 +523,7 @@ 
     public function renderFile()
     {
         $fileName   = $this->getFileName();
-        $path       = $this->getUploadPath() . '/' . $fileName;
+        $path       = $this->getUploadPath().'/'.$fileName;
         $created    = $this->getCreated();
         $notCreated = $this->getNotCreated();
         $folderName = $this->getFolderName();

admin/index.php

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
  */
 $GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_index.tpl';
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $countSettings = $helper->getHandler('Settings')->getCount();
 $countModules  = $helper->getHandler('Modules')->getCount();
 $countTables   = $helper->getHandler('Tables')->getCount();
@@ -33,11 +33,11 @@ 
 
 //$templateMain = 'tdmcreate_index.tpl';
 $adminObject->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES);
-$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_TDMCREATE_THEREARE_NUMSETTINGS . '</label>', $countSettings), 'Blue');
-$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_TDMCREATE_THEREARE_NUMMODULES . '</label>', $countModules), 'Green');
-$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_TDMCREATE_THEREARE_NUMTABLES . '</label>', $countTables), 'Orange');
-$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_TDMCREATE_THEREARE_NUMFIELDS . '</label>', $countFields), 'Gray');
-$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_TDMCREATE_THEREARE_NUMFILES . '</label>', $countFiles), 'Red');
+$adminObject->addInfoBoxLine(sprintf('<label>'._AM_TDMCREATE_THEREARE_NUMSETTINGS.'</label>', $countSettings), 'Blue');
+$adminObject->addInfoBoxLine(sprintf('<label>'._AM_TDMCREATE_THEREARE_NUMMODULES.'</label>', $countModules), 'Green');
+$adminObject->addInfoBoxLine(sprintf('<label>'._AM_TDMCREATE_THEREARE_NUMTABLES.'</label>', $countTables), 'Orange');
+$adminObject->addInfoBoxLine(sprintf('<label>'._AM_TDMCREATE_THEREARE_NUMFIELDS.'</label>', $countFields), 'Gray');
+$adminObject->addInfoBoxLine(sprintf('<label>'._AM_TDMCREATE_THEREARE_NUMFILES.'</label>', $countFiles), 'Red');
 // Upload Folders
 $folder = [
     TDMC_UPLOAD_PATH,
@@ -58,20 +58,20 @@ 
 //------------- Test Data ----------------------------
 
 if ($helper->getConfig('displaySampleButton')) {
-    $yamlFile            = dirname(__DIR__) . '/config/admin.yml';
+    $yamlFile            = dirname(__DIR__).'/config/admin.yml';
     $config              = loadAdminConfig($yamlFile);
     $displaySampleButton = $config['displaySampleButton'];
 
     if (1 == $displaySampleButton) {
         xoops_loadLanguage('admin/modulesadmin', 'system');
-        require __DIR__ . '/../testdata/index.php';
+        require __DIR__.'/../testdata/index.php';
 
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
         //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
     } else {
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
         $displaySampleButton = $config['displaySampleButton'];
     }
     $adminObject->displayButton('left', '');
@@ -131,4 +131,4 @@ 
 //$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('index.php'));
 //$GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

admin/migrate.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Tdmcreate;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 //xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -75,7 +75,7 @@ 
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
@@ -97,4 +97,4 @@ 
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

include/common.php

Spacing +29 added lines, -29 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 use XoopsModules\Tdmcreate;
-include dirname(__DIR__) . '/preloads/autoloader.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -31,37 +31,37 @@ 
 $dirname = $GLOBALS['xoopsModule']->getVar('dirname');
 // Root Frameworks icons 32x32 directory
 if (!defined('XOOPS_ICONS32_PATH')) {
-    define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32');
+    define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32');
 }
 if (!defined('XOOPS_ICONS32_URL')) {
-    define('XOOPS_ICONS32_URL', XOOPS_URL . '/Frameworks/moduleclasses/icons/32');
+    define('XOOPS_ICONS32_URL', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');
 }
 // Local Directories
-define('TDMC_PATH', XOOPS_ROOT_PATH . '/modules/' . $dirname);
-define('TDMC_URL', XOOPS_URL . '/modules/' . $dirname);
-define('TDMC_CLASS_PATH', TDMC_PATH . '/class');
-define('TDMC_CLASS_URL', TDMC_URL . '/class');
-define('TDMC_DOCS_PATH', TDMC_PATH . '/docs');
-define('TDMC_DOCS_URL', TDMC_URL . '/docs');
-define('TDMC_FONTS_PATH', TDMC_PATH . '/assets/fonts');
-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_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');
-define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', TDMC_URL . '/assets/images/logoModule.png');
+define('TDMC_PATH', XOOPS_ROOT_PATH.'/modules/'.$dirname);
+define('TDMC_URL', XOOPS_URL.'/modules/'.$dirname);
+define('TDMC_CLASS_PATH', TDMC_PATH.'/class');
+define('TDMC_CLASS_URL', TDMC_URL.'/class');
+define('TDMC_DOCS_PATH', TDMC_PATH.'/docs');
+define('TDMC_DOCS_URL', TDMC_URL.'/docs');
+define('TDMC_FONTS_PATH', TDMC_PATH.'/assets/fonts');
+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_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');
+define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', TDMC_URL.'/assets/images/logoModule.png');
 // Uploads Directories
-define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $dirname);
-define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $dirname);
-define('TDMC_UPLOAD_REPOSITORY_PATH', TDMC_UPLOAD_PATH . '/repository');
-define('TDMC_UPLOAD_REPOSITORY_URL', TDMC_UPLOAD_URL . '/repository');
-define('TDMC_UPLOAD_IMGMOD_PATH', TDMC_UPLOAD_PATH . '/images/modules');
-define('TDMC_UPLOAD_IMGMOD_URL', TDMC_UPLOAD_URL . '/images/modules');
-define('TDMC_UPLOAD_IMGTAB_PATH', TDMC_UPLOAD_PATH . '/images/tables');
-define('TDMC_UPLOAD_IMGTAB_URL', TDMC_UPLOAD_URL . '/images/tables');
+define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$dirname);
+define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$dirname);
+define('TDMC_UPLOAD_REPOSITORY_PATH', TDMC_UPLOAD_PATH.'/repository');
+define('TDMC_UPLOAD_REPOSITORY_URL', TDMC_UPLOAD_URL.'/repository');
+define('TDMC_UPLOAD_IMGMOD_PATH', TDMC_UPLOAD_PATH.'/images/modules');
+define('TDMC_UPLOAD_IMGMOD_URL', TDMC_UPLOAD_URL.'/images/modules');
+define('TDMC_UPLOAD_IMGTAB_PATH', TDMC_UPLOAD_PATH.'/images/tables');
+define('TDMC_UPLOAD_IMGTAB_URL', TDMC_UPLOAD_URL.'/images/tables');
 // Xoops Request
-include_once XOOPS_ROOT_PATH . '/class/xoopsrequest.php';
-include_once TDMC_PATH . '/include/functions.php';
-include_once TDMC_PATH . '/class/helper.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsrequest.php';
+include_once TDMC_PATH.'/include/functions.php';
+include_once TDMC_PATH.'/class/helper.php';

class/Common/Migrate.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

class/Common/Configurator.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         //        require dirname(dirname(__DIR__)) . '/config/config.php';
         //        $config = getConfig();
 
-        $config = include dirname(dirname(__DIR__)) . '/config/config.php';
+        $config = include dirname(dirname(__DIR__)).'/config/config.php';
 
         $this->name            = $config->name;
         $this->paths           = $config->paths;

language/english/common.php

Spacing +118 added lines, -118 removed lines

@@ -21,129 +21,129 @@ 
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
-
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
-
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
-
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');
 
 //Sample Data
-define('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
-define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA', 'Export DB Schema to YAML');
-define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');
-define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');
-define('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK', 'Are you sure to Import Sample Data? (It will delete ALL current data)');
-define('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS', 'Hide the Import buttons');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS', 'Show the Import buttons');
-define('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM', 'Confirm');
+define('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
+define('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
+define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
+define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA', 'Export DB Schema to YAML');
+define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');
+define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');
+define('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA_OK', 'Are you sure to Import Sample Data? (It will delete ALL current data)');
+define('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS', 'Hide the Import buttons');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS', 'Show the Import buttons');
+define('CO_'.$moduleDirNameUpper.'_'.'CONFIRM', 'Confirm');
 
 //letter choice
-define('CO_' . $moduleDirNameUpper . '_' . 'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'OTHER', 'Other');
-define('CO_' . $moduleDirNameUpper . '_' . 'ALL', 'All');
+define('CO_'.$moduleDirNameUpper.'_'.'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'OTHER', 'Other');
+define('CO_'.$moduleDirNameUpper.'_'.'ALL', 'All');
 
 // block defines
-define('CO_' . $moduleDirNameUpper . '_' . 'ACCESSRIGHTS', 'Access Rights');
-define('CO_' . $moduleDirNameUpper . '_' . 'ACTION', 'Action');
-define('CO_' . $moduleDirNameUpper . '_' . 'ACTIVERIGHTS', 'Active Rights');
-define('CO_' . $moduleDirNameUpper . '_' . 'BADMIN', 'Block Administration');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLKDESC', 'Description');
-define('CO_' . $moduleDirNameUpper . '_' . 'CBCENTER', 'Center Middle');
-define('CO_' . $moduleDirNameUpper . '_' . 'CBLEFT', 'Center Left');
-define('CO_' . $moduleDirNameUpper . '_' . 'CBRIGHT', 'Center Right');
-define('CO_' . $moduleDirNameUpper . '_' . 'SBLEFT', 'Left');
-define('CO_' . $moduleDirNameUpper . '_' . 'SBRIGHT', 'Right');
-define('CO_' . $moduleDirNameUpper . '_' . 'SIDE', 'Alignment');
-define('CO_' . $moduleDirNameUpper . '_' . 'TITLE', 'Title');
-define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE', 'Visible');
-define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN', 'Visible In');
-define('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT', 'Weight');
-
-define('CO_' . $moduleDirNameUpper . '_' . 'PERMISSIONS', 'Permissions');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS', 'Blocks Admin');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_DESC', 'Blocks/Group Admin');
-
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_MANAGMENT', 'Manage');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_ADDBLOCK', 'Add a new block');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_EDITBLOCK', 'Edit a block');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK', 'Clone a block');
+define('CO_'.$moduleDirNameUpper.'_'.'ACCESSRIGHTS', 'Access Rights');
+define('CO_'.$moduleDirNameUpper.'_'.'ACTION', 'Action');
+define('CO_'.$moduleDirNameUpper.'_'.'ACTIVERIGHTS', 'Active Rights');
+define('CO_'.$moduleDirNameUpper.'_'.'BADMIN', 'Block Administration');
+define('CO_'.$moduleDirNameUpper.'_'.'BLKDESC', 'Description');
+define('CO_'.$moduleDirNameUpper.'_'.'CBCENTER', 'Center Middle');
+define('CO_'.$moduleDirNameUpper.'_'.'CBLEFT', 'Center Left');
+define('CO_'.$moduleDirNameUpper.'_'.'CBRIGHT', 'Center Right');
+define('CO_'.$moduleDirNameUpper.'_'.'SBLEFT', 'Left');
+define('CO_'.$moduleDirNameUpper.'_'.'SBRIGHT', 'Right');
+define('CO_'.$moduleDirNameUpper.'_'.'SIDE', 'Alignment');
+define('CO_'.$moduleDirNameUpper.'_'.'TITLE', 'Title');
+define('CO_'.$moduleDirNameUpper.'_'.'VISIBLE', 'Visible');
+define('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN', 'Visible In');
+define('CO_'.$moduleDirNameUpper.'_'.'WEIGHT', 'Weight');
+
+define('CO_'.$moduleDirNameUpper.'_'.'PERMISSIONS', 'Permissions');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS', 'Blocks Admin');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_DESC', 'Blocks/Group Admin');
+
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_MANAGMENT', 'Manage');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADDBLOCK', 'Add a new block');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_EDITBLOCK', 'Edit a block');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK', 'Clone a block');
 
 //myblocksadmin
-define('CO_' . $moduleDirNameUpper . '_' . 'AGDS', 'Admin Groups');
-define('CO_' . $moduleDirNameUpper . '_' . 'BCACHETIME', 'Cache Time');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_ADMIN', 'Blocks Admin');
+define('CO_'.$moduleDirNameUpper.'_'.'AGDS', 'Admin Groups');
+define('CO_'.$moduleDirNameUpper.'_'.'BCACHETIME', 'Cache Time');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADMIN', 'Blocks Admin');
 
 //Template Admin
-define('CO_' . $moduleDirNameUpper . '_' . 'TPLSETS', 'Template Management');
-define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE', 'Generate');
-define('CO_' . $moduleDirNameUpper . '_' . 'FILENAME', 'File Name');
+define('CO_'.$moduleDirNameUpper.'_'.'TPLSETS', 'Template Management');
+define('CO_'.$moduleDirNameUpper.'_'.'GENERATE', 'Generate');
+define('CO_'.$moduleDirNameUpper.'_'.'FILENAME', 'File Name');
 
 //Menu
-define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE', 'Migrate');
-define('CO_' . $moduleDirNameUpper . '_' . 'FOLDER_YES', 'Folder "%s" exist');
-define('CO_' . $moduleDirNameUpper . '_' . 'FOLDER_NO', 'Folder "%s" does not exist. Create the specified folder with CHMOD 777.');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS', 'Show Development Tools Button?');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC', 'If yes, the "Migrate" Tab and other Development tools will be visible to the Admin.');
-define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK', 'Feedback');
+define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE', 'Migrate');
+define('CO_'.$moduleDirNameUpper.'_'.'FOLDER_YES', 'Folder "%s" exist');
+define('CO_'.$moduleDirNameUpper.'_'.'FOLDER_NO', 'Folder "%s" does not exist. Create the specified folder with CHMOD 777.');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS', 'Show Development Tools Button?');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS_DESC', 'If yes, the "Migrate" Tab and other Development tools will be visible to the Admin.');
+define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_FEEDBACK', 'Feedback');
 
 //Latest Version Check
-define('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION', 'New Version: ');
+define('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION', 'New Version: ');
 
 //DirectoryChecker
-define('CO_' . $moduleDirNameUpper . '_' . 'AVAILABLE', "<span style='color: green;'>Available</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'CREATETHEDIR', 'Create it');
-define('CO_' . $moduleDirNameUpper . '_' . 'SETMPERM', 'Set the permission');
-define('CO_' . $moduleDirNameUpper . '_' . 'DIRCREATED', 'The directory has been created');
-define('CO_' . $moduleDirNameUpper . '_' . 'DIRNOTCREATED', 'The directory cannot be created');
-define('CO_' . $moduleDirNameUpper . '_' . 'PERMSET', 'The permission has been set');
-define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');
+define('CO_'.$moduleDirNameUpper.'_'.'AVAILABLE', "<span style='color: green;'>Available</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'CREATETHEDIR', 'Create it');
+define('CO_'.$moduleDirNameUpper.'_'.'SETMPERM', 'Set the permission');
+define('CO_'.$moduleDirNameUpper.'_'.'DIRCREATED', 'The directory has been created');
+define('CO_'.$moduleDirNameUpper.'_'.'DIRNOTCREATED', 'The directory cannot be created');
+define('CO_'.$moduleDirNameUpper.'_'.'PERMSET', 'The permission has been set');
+define('CO_'.$moduleDirNameUpper.'_'.'PERMNOTSET', 'The permission cannot be set');
 
 //FileChecker
 //define('CO_' . $moduleDirNameUpper . '_' . 'AVAILABLE', "<span style='color: green;'>Available</span>");
@@ -153,31 +153,31 @@ 
 //define('CO_' . $moduleDirNameUpper . '_' . 'CREATETHEFILE', 'Create it');
 //define('CO_' . $moduleDirNameUpper . '_' . 'SETMPERM', 'Set the permission');
 
-define('CO_' . $moduleDirNameUpper . '_' . 'FILECOPIED', 'The file has been copied');
-define('CO_' . $moduleDirNameUpper . '_' . 'FILENOTCOPIED', 'The file cannot be copied');
+define('CO_'.$moduleDirNameUpper.'_'.'FILECOPIED', 'The file has been copied');
+define('CO_'.$moduleDirNameUpper.'_'.'FILENOTCOPIED', 'The file cannot be copied');
 
 //define('CO_' . $moduleDirNameUpper . '_' . 'PERMSET', 'The permission has been set');
 //define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');
 
 //image config
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH', 'Image Display Width');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC', 'Display width for image');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT', 'Image Display Height');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC', 'Display height for image');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">--- EXTERNAL Image configuration ---</span> ');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC', '');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH', 'Image Upload path');
-define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH', 'Image Display Width');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC', 'Display width for image');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT', 'Image Display Height');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC', 'Display height for image');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">--- EXTERNAL Image configuration ---</span> ');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC', '');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH', 'Image Upload path');
+define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');
 
 //Preferences
-define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');
-define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');
+define('CO_'.$moduleDirNameUpper.'_'.'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');
+define('CO_'.$moduleDirNameUpper.'_'.'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');
 
 //Module Stats
-define('CO_' . $moduleDirNameUpper . '_' . 'STATS_SUMMARY', 'Module Statistics');
-define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_CATEGORIES', 'Categories:');
-define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_ITEMS', 'Items');
-define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_OFFLINE', 'Offline');
-define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_PUBLISHED', 'Published');
-define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_REJECTED', 'Rejected');
-define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_SUBMITTED', 'Submitted');
+define('CO_'.$moduleDirNameUpper.'_'.'STATS_SUMMARY', 'Module Statistics');
+define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_CATEGORIES', 'Categories:');
+define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_ITEMS', 'Items');
+define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_OFFLINE', 'Offline');
+define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_PUBLISHED', 'Published');
+define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_REJECTED', 'Rejected');
+define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_SUBMITTED', 'Submitted');

admin/modules.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 // Define main template
 $templateMain = 'tdmcreate_modules.tpl';
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Recovered value of argument op in the URL $
 $op    = \Xmf\Request::getString('op', 'list');
 $modId = \Xmf\Request::getInt('mod_id');
@@ -42,7 +42,7 @@ 
         $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
         $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
         $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
-        $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
+        $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL.'/'.$modPathIcon16);
         $modulesCount = $helper->getHandler('Modules')->getCountModules();
         $modulesAll   = $helper->getHandler('Modules')->getAllModules($start, $limit);
         // Redirect if there aren't modules
@@ -57,8 +57,8 @@ 
                 unset($module);
             }
             if ($modulesCount > $limit) {
-                include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $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 {
@@ -111,7 +111,7 @@ 
             ]
         );
         //Form mod_image
-        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        include_once XOOPS_ROOT_PATH.'/class/uploader.php';
         $uploader = new \XoopsMediaUploader(
             TDMC_UPLOAD_IMGMOD_PATH, $helper->getConfig('mimetypes'), $helper->getConfig('maxsize'), null, null
         );
@@ -196,9 +196,9 @@ 
         if ($id > 0) {
             $modulesObj = $helper->getHandler('Modules')->get($id);
             foreach ($modFieldArray as $moduleField) {
-                if (isset($_POST['mod_' . $moduleField])) {
-                    $modField = $modulesObj->getVar('mod_' . $moduleField);
-                    $modulesObj->setVar('mod_' . $moduleField, !$modField);
+                if (isset($_POST['mod_'.$moduleField])) {
+                    $modField = $modulesObj->getVar('mod_'.$moduleField);
+                    $modulesObj->setVar('mod_'.$moduleField, !$modField);
                 }
             }
             if ($helper->getHandler('Modules')->insert($modulesObj)) {
@@ -209,5 +209,5 @@ 
         break;
 }
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';