txmodxoops / tdmcreate

preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        include __DIR__ . '/autoloader.php';
+        include __DIR__.'/autoloader.php';
     }
 }

preloads/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 /**
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
-spl_autoload_register(static function ($class) {
+spl_autoload_register(static function($class) {
     // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+    $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
     // base directory for the namespace prefix
-    $baseDir = __DIR__ . '/../class/';
+    $baseDir = __DIR__.'/../class/';
 
     // does the class use the namespace prefix?
     $len = mb_strlen($prefix);
@@ -23,7 +23,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+    $file = $baseDir.str_replace('\\', '/', $relativeClass).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

xoops_version.php

Spacing +20 added lines, -20 removed lines

@@ -42,7 +42,7 @@ 
 $modversion['release_info']        = 'README';
 $modversion['release_file']        = 'https://github.com/txmodxoops/tdmcreate-1.91/releases';
 $modversion['manual']              = 'MANUAL';
-$modversion['manual_file']         = XOOPS_URL . "/modules/{$moduleDirName}/docs/manual.txt";
+$modversion['manual_file']         = XOOPS_URL."/modules/{$moduleDirName}/docs/manual.txt";
 $modversion['image']               = "assets/images/{$moduleDirName}_logo.png";
 $modversion['dirname']             = $moduleDirName;
 // Frameworks icons
@@ -52,7 +52,7 @@ 
 // Module icons
 $modversion['modicons16']          = 'assets/images/icons/16';
 $modversion['modicons32']          = 'assets/images/icons/32';
-$modversion['targetdir']           = XOOPS_UPLOAD_PATH . "/{$moduleDirName}/repository/";
+$modversion['targetdir']           = XOOPS_UPLOAD_PATH."/{$moduleDirName}/repository/";
 $modversion['module_website_url']  = 'https://github.com/txmodxoops/tdmcreate-1.91';
 $modversion['module_website_name'] = 'GitHub Txmodx Xoops';
 $modversion['min_php']             = '5.5';
@@ -88,17 +88,17 @@ 
 $modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
 // Tables created by sql file (without prefix!)
 $modversion['tables'] = [
-    $moduleDirName . '_' . 'settings',
-    $moduleDirName . '_' . 'modules',
-    $moduleDirName . '_' . 'tables',
-    $moduleDirName . '_' . 'fields',
-    $moduleDirName . '_' . 'languages',
-    $moduleDirName . '_' . 'fieldtype',
-    $moduleDirName . '_' . 'fieldattributes',
-    $moduleDirName . '_' . 'fieldnull',
-    $moduleDirName . '_' . 'fieldkey',
-    $moduleDirName . '_' . 'fieldelements',
-    $moduleDirName . '_' . 'morefiles',
+    $moduleDirName.'_'.'settings',
+    $moduleDirName.'_'.'modules',
+    $moduleDirName.'_'.'tables',
+    $moduleDirName.'_'.'fields',
+    $moduleDirName.'_'.'languages',
+    $moduleDirName.'_'.'fieldtype',
+    $moduleDirName.'_'.'fieldattributes',
+    $moduleDirName.'_'.'fieldnull',
+    $moduleDirName.'_'.'fieldkey',
+    $moduleDirName.'_'.'fieldelements',
+    $moduleDirName.'_'.'morefiles',
 ];
 // Scripts to run upon installation or update
 $modversion['onInstall'] = 'include/install.php';
@@ -109,7 +109,7 @@ 
 $c = 1;
 
 $modversion['config'][] = [
-    'name'        => 'break' . $c,
+    'name'        => 'break'.$c,
     'title'       => '_MI_TDMCREATE_CONFIG_BREAK_GENERAL',
     'description' => '_MI_TDMCREATE_CONFIG_',
     'formtype'    => 'line_break',
@@ -197,7 +197,7 @@ 
 
 ++$c;
 $modversion['config'][] = [
-    'name'        => 'break' . $c,
+    'name'        => 'break'.$c,
     'title'       => '_MI_TDMCREATE_CONFIG_BREAK_REQUIRED',
     'description' => '_MI_TDMCREATE_CONFIG_',
     'formtype'    => 'line_break',
@@ -378,7 +378,7 @@ 
 
 ++$c;
 $modversion['config'][] = [
-    'name'        => 'break' . $c,
+    'name'        => 'break'.$c,
     'title'       => '_MI_TDMCREATE_CONFIG_BREAK_OPTIONAL',
     'description' => '_MI_TDMCREATE_CONFIG_',
     'formtype'    => 'line_break',
@@ -582,8 +582,8 @@ 
  */
 $modversion['config'][] = [
     'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
@@ -594,8 +594,8 @@ 
  */
 $modversion['config'][] = [
     'name'        => 'displayDeveloperTools',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,

admin/footer.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      . "  <div style='text-align: center;'>\n"
      . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
      . "  </div>\n"
-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+     . '  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"
      . '</div>';
 
 xoops_cp_footer();

include/update.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
 {
     global $xoopsDB;
     $result = $xoopsDB->query(
-        'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile')
+        'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile')
         . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
     );
     $tplids = [];
@@ -66,7 +66,7 @@ 
     if (count($tplids) > 0) {
         $tplfileHandler = xoops_getHandler('tplfile');
         $duplicate_files = $tplfileHandler->getObjects(
-            new \Criteria('tpl_id', '(' . implode(',', $tplids) . ')', 'IN')
+            new \Criteria('tpl_id', '('.implode(',', $tplids).')', 'IN')
         );
 
         if (count($duplicate_files) > 0) {
@@ -75,9 +75,9 @@ 
             }
         }
     }
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($this->db->error() . '<br />' . $sql);
+        xoops_error($this->db->error().'<br />'.$sql);
 
         return false;
     }
@@ -92,10 +92,10 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile')
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile')
         . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br />' . $sql);
+        xoops_error($xoopsDB->error().'<br />'.$sql);
         $module->setErrors(
             "'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index."
         );

class/Settings.php

Spacing +8 added lines, -8 removed lines

@@ -145,7 +145,7 @@ 
         $isNew = $this->isNew();
         $title = $isNew ? sprintf(_AM_TDMCREATE_SETTING_NEW) : sprintf(_AM_TDMCREATE_SETTING_EDIT);
 
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $form = new \XoopsThemeForm($title, 'settingform', $action, 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
@@ -174,7 +174,7 @@ 
         $checkbox = new \XoopsFormCheckbox(' ', 'setting_option', $settingOption, '<br>');
         $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC);
         foreach ($this->options as $option) {
-            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_SETTING_' . mb_strtoupper($option)));
+            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_SETTING_'.mb_strtoupper($option)));
         }
         $optionsTray->addElement($checkbox);
 
@@ -183,17 +183,17 @@ 
         $modImage = $this->getVar('set_image');
         $modImage = $modImage ?: $set['image'];
 
-        $uploadDirectory = 'uploads/' . $GLOBALS['xoopsModule']->dirname() . '/images/modules';
+        $uploadDirectory = 'uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/modules';
         $imgtray = new \XoopsFormElementTray(_AM_TDMCREATE_SETTING_IMAGE, '<br>');
-        $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './' . mb_strtolower($uploadDirectory) . '/');
+        $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.mb_strtolower($uploadDirectory).'/');
         $imageSelect = new \XoopsFormSelect($imgpath, 'set_image', $modImage);
         $modImage_array = \XoopsLists::getImgListAsArray(TDMC_UPLOAD_IMGMOD_PATH);
         foreach ($modImage_array as $image) {
             $imageSelect->addOption($image, $image);
         }
-        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"set_image\", \"" . $uploadDirectory . '", "", "' . XOOPS_URL . "\")'");
+        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"set_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')));
@@ -221,7 +221,7 @@ 
         $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')));
 
-        $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);
@@ -261,7 +261,7 @@ 
     {
         $retSet = [];
         foreach ($this->options as $option) {
-            if (1 == $this->getVar('set_' . $option)) {
+            if (1 == $this->getVar('set_'.$option)) {
                 $retSet[] = $option;
             }
         }

class/LogoGenerator.php

Spacing +10 added lines, -10 removed lines

@@ -23,11 +23,11 @@ 
  *
  * @version         $Id: LogoGenerator.php 12258 2014-01-02 09:33:29Z timgno $
  */
-include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+include_once dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 //include_once XOOPS_ROOT_PATH . '/modules/TDMCreate/include/common.php';
 
 if (function_exists($_GET['f'])) { // get function name and parameter  $_GET['f']($_GET["p"]);
-    include_once __DIR__ . '/LogoGenerator.php';
+    include_once __DIR__.'/LogoGenerator.php';
     $ret = LogoGenerator::createLogo($_GET['iconName'], $_GET['caption']);
     phpFunction($ret);
 } else {
@@ -66,15 +66,15 @@ 
         }
 
         $dirname = 'tdmcreate';
-        $iconFileName = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32/' . basename($logoIcon);
+        $iconFileName = XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32/'.basename($logoIcon);
 
         //$dirFonts = TDMC_PATH . "/assets/fonts";
         //$dirLogos = TDMC_PATH . "/assets/images/logos";
-        $dirFonts = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/assets/fonts';
-        $dirLogos = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/assets/images/logos';
+        $dirFonts = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/assets/fonts';
+        $dirLogos = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/assets/images/logos';
 
-        if (!file_exists($imageBase = $dirLogos . '/empty.png') ||
-            !file_exists($font = $dirFonts . '/VeraBd.ttf') ||
+        if (!file_exists($imageBase = $dirLogos.'/empty.png') ||
+            !file_exists($font = $dirFonts.'/VeraBd.ttf') ||
             !file_exists($iconFile = $iconFileName)) {
             return false;
         }
@@ -90,13 +90,13 @@ 
         imagecopy($imageModule, $imageIcon, 29, 2, 0, 0, 32, 32);
 
         //$targetImage = TDMC_UPLOAD_IMGMOD_URL . "/" . $moduleName . "_logo.png";
-        $targetImage = '/uploads/' . $dirname . '/images/modules/' . $moduleName . '_logo.png';
+        $targetImage = '/uploads/'.$dirname.'/images/modules/'.$moduleName.'_logo.png';
 
-        imagepng($imageModule, XOOPS_ROOT_PATH . $targetImage);
+        imagepng($imageModule, XOOPS_ROOT_PATH.$targetImage);
 
         imagedestroy($imageModule);
         imagedestroy($imageIcon);
 
-        return XOOPS_URL . $targetImage;
+        return XOOPS_URL.$targetImage;
     }
 }

class/Building.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
         $form->addElement($mod_select, true);
 
         $form->addElement(new \XoopsFormHidden('op', 'build'));
-        $form->addElement(new \XoopsFormButton(_REQUIRED . ' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
+        $form->addElement(new \XoopsFormButton(_REQUIRED.' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
 
         return $form;
     }
@@ -82,7 +82,7 @@ 
     public function clearDir($dir, $pattern = '*')
     {
         // Find all files and folders matching pattern
-        $files = glob($dir . "/$pattern");
+        $files = glob($dir."/$pattern");
         // Interate thorugh the files and folders
         foreach ($files as $file) {
             // if it's a directory then re-call clearDir function to delete files inside this directory
@@ -109,12 +109,12 @@ 
         }
         while (false !== ($file = readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
+                if (is_dir($src.'/'.$file)) {
                     // Copy the directory itself
-                    $this->copyDir($src . '/' . $file, $dst . '/' . $file);
+                    $this->copyDir($src.'/'.$file, $dst.'/'.$file);
                 } else {
                     // Make sure you copy the current script
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }

class/Tables.php

Spacing +7 added lines, -7 removed lines

@@ -181,18 +181,18 @@ 
         $tableImage = $getTableImage ?: 'blank.gif';
         $icons32Directory = '/Frameworks/moduleclasses/icons/32';
         $uploadsDirectory = '/uploads/tdmcreate/images/tables';
-        $iconsDirectory = is_dir(XOOPS_ROOT_PATH . $icons32Directory) ? $icons32Directory : $uploadsDirectory;
+        $iconsDirectory = is_dir(XOOPS_ROOT_PATH.$icons32Directory) ? $icons32Directory : $uploadsDirectory;
 
         $imgtray1 = new \XoopsFormElementTray(_AM_TDMCREATE_TABLE_IMAGE, '<br>');
         $imgpath1 = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, ".{$iconsDirectory}/");
         $imageSelect1 = new \XoopsFormSelect($imgpath1, 'table_image', $tableImage, 10);
-        $imageArray1 = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $iconsDirectory);
+        $imageArray1 = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.$iconsDirectory);
         foreach ($imageArray1 as $image1) {
             $imageSelect1->addOption($image1, $image1);
         }
-        $imageSelect1->setExtra("onchange='showImgSelected(\"image1\", \"table_image\", \"" . $iconsDirectory . '", "", "' . XOOPS_URL . "\")'");
+        $imageSelect1->setExtra("onchange='showImgSelected(\"image1\", \"table_image\", \"".$iconsDirectory.'", "", "'.XOOPS_URL."\")'");
         $imgtray1->addElement($imageSelect1, false);
-        $imgtray1->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . '/' . $iconsDirectory . '/' . $tableImage . "' name='image1' id='image1' alt='' />"));
+        $imgtray1->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL.'/'.$iconsDirectory.'/'.$tableImage."' name='image1' id='image1' alt='' />"));
         $fileseltray1 = new \XoopsFormElementTray('', '<br>');
         $fileseltray1->addElement(new \XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $helper->getConfig('maxsize')));
         $fileseltray1->addElement(new \XoopsFormLabel(''));
@@ -216,7 +216,7 @@ 
         $checkbox = new \XoopsFormCheckbox(' ', 'table_option', $this->getOptionsTables(), '<br>');
         $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC);
         foreach ($this->options as $option) {
-            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_TABLE_' . mb_strtoupper($option)));
+            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_TABLE_'.mb_strtoupper($option)));
         }
         $optionsTray->addElement($checkbox);
 
@@ -224,7 +224,7 @@ 
 
         $form->addElement($optionsTray);
 
-        $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 \XoopsFormHidden('table_id', ($isNew ? 0 : $this->getVar('table_id'))));
         $buttonTray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
@@ -273,7 +273,7 @@ 
     {
         $retTable = [];
         foreach ($this->options as $option) {
-            if (1 == $this->getVar('table_' . $option)) {
+            if (1 == $this->getVar('table_'.$option)) {
                 $retTable[] = $option;
             }
         }