mambax7 / contact

class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -40,13 +40,13 @@ 
         //check for minimum XOOPS version
         $currentVer = mb_substr(\XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (\version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -77,7 +77,7 @@ 
 
         if (false !== $reqVer && '' !== $reqVer) {
             if (\version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }
@@ -101,7 +101,7 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
         $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
+        $repository         = 'XoopsModules25x/'.$moduleDirName;
         //        $repository         = 'XoopsModules25x/publisher'; //for testing only
         $ret             = '';
         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
@@ -115,14 +115,14 @@ 
                 if (false === $curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
                 } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                    \trigger_error('Repository Not Found: '.$infoReleasesUrl);
                 } else {
                     $file              = json_decode($curlReturn, false);
                     $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? \reset($file)->tag_name : $default);
                     $latestVersion     = $file[0]->tag_name;
                     $prerelease        = $file[0]->prerelease;
                     if ('master' !== $latestVersionLink) {
-                        $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = mb_strtolower($latestVersion);
@@ -130,7 +130,7 @@ 
                         $latestVersion = \str_replace('_', '', mb_strtolower($latestVersion));
                         $latestVersion = \str_replace('final', '', mb_strtolower($latestVersion));
                     }
-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
+                    $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));
                     //"PHP-standardized" version
                     $moduleVersion = \str_replace(' ', '', mb_strtolower($moduleVersion));
                     //                    $moduleVersion = '1.0'; //for testing only

ajax.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @author      Trabis <lusopoemas@gmail.com>
  * @author      Hossein Azizabadi (AKA Voltan)
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 /** @var ContactHandler $contactHandler */
 
 if (!empty($_POST)) {

admin/blockform.php

Spacing +9 added lines, -9 removed lines

@@ -21,9 +21,9 @@ 
 /** @var Admin $adminObject */
 /** @var Helper $helper */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -48,9 +48,9 @@ 
     ]
 );
 $form->addElement($sideSelect);
-$form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-$form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-$moduleSelect = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+$form->addElement(new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+$form->addElement(new \XoopsFormRadioYN(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE'), 'bvisible', $block['visible']));
+$moduleSelect = new \XoopsFormSelect(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
 /** @var \XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $criteria      = new \CriteriaCompo(new \Criteria('hasmain', 1));
@@ -61,10 +61,10 @@ 
 ksort($moduleList);
 $moduleSelect->addOptionArray($moduleList);
 $form->addElement($moduleSelect);
-$form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE'), 'btitle', 50, 255, $block['title']), false);
+$form->addElement(new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'TITLE'), 'btitle', 50, 255, $block['title']), false);
 if ($block['is_custom']) {
     $textarea = new \XoopsFormDhtmlTextArea(_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-    $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . _AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+    $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'._AM_SYSTEM_BLOCKS_USEFULTAGS.'</span><br><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
     $form->addElement($textarea, true);
     $ctypeSelect = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
     $ctypeSelect->addOptionArray(
@@ -82,11 +82,11 @@ 
         $tplfileHandler = xoops_getHandler('tplfile');
         $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
         if (count($btemplate) > 0) {
-            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
         } else {
             $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
             if (count($btemplate2) > 0) {
-                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" target="_blank">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
             }
         }
     }

admin/blocksadmin.php

Indentation +70 added lines, -70 removed lines

@@ -88,28 +88,28 @@ 
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
-             . "</th><th align='center' nowrap='nowrap'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
-             . '<br>'
-             . _LEFT
-             . '-'
-             . _CENTER
-             . '-'
-             . _RIGHT
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
-             . "</th><th align='center'>"
-             . _AM_SYSTEM_BLOCKS_VISIBLEIN
-             . "</th><th align='center'>"
-             . _AM_SYSTEM_ADGS
-             . "</th><th align='center'>"
-             . _AM_SYSTEM_BLOCKS_BCACHETIME
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
-             . '</th></tr>
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
+                . "</th><th align='center' nowrap='nowrap'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
+                . '<br>'
+                . _LEFT
+                . '-'
+                . _CENTER
+                . '-'
+                . _RIGHT
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
+                . "</th><th align='center'>"
+                . _AM_SYSTEM_BLOCKS_VISIBLEIN
+                . "</th><th align='center'>"
+                . _AM_SYSTEM_ADGS
+                . "</th><th align='center'>"
+                . _AM_SYSTEM_BLOCKS_BCACHETIME
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
+                . '</th></tr>
         ';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
         $blockCount = count($blockArray);
@@ -175,69 +175,69 @@ 
             }
             $name = $i->getVar('name');
             echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . $title
-                 . "'></td><td class='$class' align='center' nowrap='nowrap'>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . $title
+                    . "'></td><td class='$class' align='center' nowrap='nowrap'>
                     <div align='center' >
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_LEFT
-                 . "'$ssel2>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_LEFT
+                    . "'$ssel2>
                         <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_CENTER
-                 . "'$ssel3>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_CENTER
+                    . "'$ssel3>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_RIGHT
-                 . "'$ssel4>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_RIGHT
+                    . "'$ssel4>
                     </div>
                     <div>
                         <span style='float:right;'><input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_SIDEBLOCK_RIGHT
-                 . "'$ssel1></span>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_SIDEBLOCK_RIGHT
+                    . "'$ssel1></span>
                     <div align='left'><input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_SIDEBLOCK_LEFT
-                 . "'$ssel0></div>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_SIDEBLOCK_LEFT
+                    . "'$ssel0></div>
                     </div>
                     <div align='center'>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_BOTTOMLEFT
-                 . "'$ssel5>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_BOTTOMLEFT
+                    . "'$ssel5>
                         <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_BOTTOM
-                 . "'$ssel7>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_BOTTOM
+                    . "'$ssel7>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_BOTTOMRIGHT
-                 . "'$ssel6>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_BOTTOMRIGHT
+                    . "'$ssel6>
                     </div>
                 </td><td class='$class' align='center'><input type='text' name='weight["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . $i->getVar('weight')
-                 . "' size='5' maxlength='5'></td><td class='$class' align='center' nowrap><input type='radio' name='visible["
-                 . $i->getVar('bid')
-                 . "]' value='1'$sel1>"
-                 . _YES
-                 . "&nbsp;<input type='radio' name='visible["
-                 . $i->getVar('bid')
-                 . "]' value='0'$sel0>"
-                 . _NO
-                 . '</td>';
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . $i->getVar('weight')
+                    . "' size='5' maxlength='5'></td><td class='$class' align='center' nowrap><input type='radio' name='visible["
+                    . $i->getVar('bid')
+                    . "]' value='1'$sel1>"
+                    . _YES
+                    . "&nbsp;<input type='radio' name='visible["
+                    . $i->getVar('bid')
+                    . "]' value='0'$sel0>"
+                    . _NO
+                    . '</td>';
 
             echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
             foreach ($moduleList as $k => $v) {

Spacing +53 added lines, -53 removed lines

@@ -21,7 +21,7 @@ 
 /** @var Admin $adminObject */
 /** @var Helper $helper */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -30,10 +30,10 @@ 
 
 if (!is_object($GLOBALS['xoopsUser']) || !is_object($xoopsModule)
     || !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
+    exit(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403'));
 }
 if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
     $op = 'list';
     if (isset($_POST)) {
         foreach ($_POST as $k => $v) {
@@ -57,7 +57,7 @@ 
     function listBlocks()
     {
         global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
         $moduleDirName = basename(dirname(__DIR__));
         $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
@@ -83,14 +83,14 @@ 
         $moduleList[0]  = _AM_SYSTEM_BLOCKS_ALLPAGES;
         ksort($moduleList);
         echo "
-        <h4 style='text-align:left;'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
-        echo "<form action='" . $_SERVER['SCRIPT_NAME'] . "' name='blockadmin' method='post'>";
+        <h4 style='text-align:left;'>" . constant('CO_'.$moduleDirNameUpper.'_'.'BADMIN').'</h4>';
+        echo "<form action='".$_SERVER['SCRIPT_NAME']."' name='blockadmin' method='post'>";
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'TITLE')
              . "</th><th align='center' nowrap='nowrap'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'SIDE')
              . '<br>'
              . _LEFT
              . '-'
@@ -98,9 +98,9 @@ 
              . '-'
              . _RIGHT
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT')
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE')
              . "</th><th align='center'>"
              . _AM_SYSTEM_BLOCKS_VISIBLEIN
              . "</th><th align='center'>"
@@ -108,7 +108,7 @@ 
              . "</th><th align='center'>"
              . _AM_SYSTEM_BLOCKS_BCACHETIME
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'ACTION')
              . '</th></tr>
         ';
         $blockArray = \XoopsBlock::getByModule($xoopsModule->mid());
@@ -129,11 +129,11 @@ 
         ];
         foreach ($blockArray as $i) {
             $groupsPerms = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+            $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.$i->getVar('bid');
             $result = $db->query($sql);
             $modules = [];
             while (false !== ($row = $db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
 
             $cachetimeOptions = '';
@@ -239,47 +239,47 @@ 
                  . _NO
                  . '</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='bmodule[".$i->getVar('bid')."][]' id='bmodule[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($moduleList as $k => $v) {
-                echo "<option value='$k'" . (in_array($k, $modules) ? 'selected' : '') . ">$v</option>";
+                echo "<option value='$k'".(in_array($k, $modules) ? 'selected' : '').">$v</option>";
             }
             echo '</select></td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='groups[".$i->getVar('bid')."][]' id='groups[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($groups as $grp) {
-                echo "<option value='" . $grp->getVar('groupid') . "' " . (in_array($grp->getVar('groupid'), $groupsPerms) ? 'selected' : '') . '>' . $grp->getVar('name') . '</option>';
+                echo "<option value='".$grp->getVar('groupid')."' ".(in_array($grp->getVar('groupid'), $groupsPerms) ? 'selected' : '').'>'.$grp->getVar('name').'</option>';
             }
             echo '</select></td>';
 
             // Cache lifetime
-            echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetimeOptions . '</select>
+            echo '<td class="'.$class.'" align="center"> <select name="bcachetime['.$i->getVar('bid').']" size="1">'.$cachetimeOptions.'</select>
                                     </td>';
 
             // Actions
 
-            echo "<td class='$class' align='center'><a href='blocksadmin.php?op=edit&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/edit.png' . " alt='" . _EDIT . "' title='" . _EDIT . "'>
-                 </a> <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/editcopy.png' . " alt='" . _CLONE . "' title='" . _CLONE . "'>
+            echo "<td class='$class' align='center'><a href='blocksadmin.php?op=edit&amp;bid=".$i->getVar('bid')."'><img src=".$pathIcon16.'/edit.png'." alt='"._EDIT."' title='"._EDIT."'>
+                 </a> <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid')."'><img src=".$pathIcon16.'/editcopy.png'." alt='"._CLONE."' title='"._CLONE."'>
                  </a>";
             if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
-                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
+                echo "&nbsp;<a href='".XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid='.$i->getVar('bid')."'><img src=".$pathIcon16.'/delete.png'." alt='"._DELETE."' title='"._DELETE."'>
                      </a>";
             }
             echo "
-            <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
-            <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
-            <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
-            <input type='hidden' name='oldvisible[" . $i->getVar('bid') . "]' value='" . $i->getVar('visible') . "'>
-            <input type='hidden' name='oldgroups[" . $i->getVar('groups') . "]' value='" . $i->getVar('groups') . "'>
-            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid') . "]' value='" . $i->getVar('bcachetime') . "'>
-            <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
+            <input type='hidden' name='oldtitle[" . $i->getVar('bid')."]' value='".$i->getVar('title')."'>
+            <input type='hidden' name='oldside[" . $i->getVar('bid')."]' value='".$i->getVar('side')."'>
+            <input type='hidden' name='oldweight[" . $i->getVar('bid')."]' value='".$i->getVar('weight')."'>
+            <input type='hidden' name='oldvisible[" . $i->getVar('bid')."]' value='".$i->getVar('visible')."'>
+            <input type='hidden' name='oldgroups[" . $i->getVar('groups')."]' value='".$i->getVar('groups')."'>
+            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid')."]' value='".$i->getVar('bcachetime')."'>
+            <input type='hidden' name='bid[" . $i->getVar('bid')."]' value='".$i->getVar('bid')."'>
             </td></tr>
             ";
             $class = ('even' === $class) ? 'odd' : 'even';
         }
         echo "<tr><td class='foot' align='center' colspan='8'>
         <input type='hidden' name='op' value='order'>
-        " . $GLOBALS['xoopsSecurity']->getTokenHTML() . "
-        <input type='submit' name='submit' value='" . _SUBMIT . "'>
+        " . $GLOBALS['xoopsSecurity']->getTokenHTML()."
+        <input type='submit' name='submit' value='" . _SUBMIT."'>
         </td></tr></table>
         </form>
         <br><br>";
@@ -290,7 +290,7 @@ 
      */
     function cloneBlock($bid)
     {
-        require_once __DIR__ . '/admin_header.php';
+        require_once __DIR__.'/admin_header.php';
 
         xoops_cp_header();
 
@@ -305,16 +305,16 @@ 
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
+        $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.(int) $bid;
         $result = $db->query($sql);
         $modules = [];
         while (false !== ($row = $db->fetchArray($result))) {
-            $modules[] = (int)$row['module_id'];
+            $modules[] = (int) $row['module_id'];
         }
         $isCustom = ('C' === $myblock->getVar('block_type') || 'E' === $myblock->getVar('block_type'));
         $block = [
-            'title' => $myblock->getVar('title') . ' Clone',
-            'form_title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+            'title' => $myblock->getVar('title').' Clone',
+            'form_title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK'),
             'name' => $myblock->getVar('name'),
             'side' => $myblock->getVar('side'),
             'weight' => $myblock->getVar('weight'),
@@ -330,12 +330,12 @@ 
             'template' => $myblock->getVar('template'),
             'options' => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
-        require_once __DIR__ . '/blockform.php';
+        echo '<a href="blocksadmin.php">'.constant('CO_'.$moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'._AM_SYSTEM_BLOCKS_CLONEBLOCK.'<br><br>';
+        require_once __DIR__.'/blockform.php';
         /** @var XoopsThemeForm $form */
         $form->display();
         //        xoops_cp_footer();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -398,12 +398,12 @@ 
         }
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
         foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+            $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
             $db->query($sql);
         }
         $groups = &$GLOBALS['xoopsUser']->getGroups();
         foreach ($groups as $iValue) {
-            $sql = 'INSERT INTO ' . $db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $iValue . ', ' . $newid . ", 1, 'block_read')";
+            $sql = 'INSERT INTO '.$db->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ('.$iValue.', '.$newid.", 1, 'block_read')";
             $db->query($sql);
         }
         redirect_header('blocksadmin.php?op=listar', 1, _AM_DBUPDATED);
@@ -437,7 +437,7 @@ 
      */
     function editBlock($bid)
     {
-        require_once __DIR__ . '/admin_header.php';
+        require_once __DIR__.'/admin_header.php';
         xoops_cp_header();
         $adminObject = Admin::getInstance();
         $adminObject->displayNavigation(basename(__FILE__));
@@ -449,16 +449,16 @@ 
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
+        $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.(int) $bid;
         $result = $db->query($sql);
         $modules = [];
         while (false !== ($row = $db->fetchArray($result))) {
-            $modules[] = (int)$row['module_id'];
+            $modules[] = (int) $row['module_id'];
         }
         $isCustom = ('C' === $myblock->getVar('block_type') || 'E' === $myblock->getVar('block_type'));
         $block = [
             'title' => $myblock->getVar('title'),
-            'form_title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_EDITBLOCK'),
+            'form_title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_EDITBLOCK'),
             //        'name'       => $myblock->getVar('name'),
             'side' => $myblock->getVar('side'),
             'weight' => $myblock->getVar('weight'),
@@ -474,12 +474,12 @@ 
             'template' => $myblock->getVar('template'),
             'options' => $myblock->getVar('options'),
         ];
-        echo '<a href="blocksadmin.php">' . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
-        require_once __DIR__ . '/blockform.php';
+        echo '<a href="blocksadmin.php">'.constant('CO_'.$moduleDirNameUpper.'_'.'BADMIN').'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'._AM_SYSTEM_BLOCKS_EDITBLOCK.'<br><br>';
+        require_once __DIR__.'/blockform.php';
         /** @var XoopsThemeForm $form */
         $form->display();
         //        xoops_cp_footer();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -535,7 +535,7 @@ 
                 $xoopsDB->query($sql);
             } else {
                 foreach ($bmodule as $bmid) {
-                    $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid, (int)$bmid);
+                    $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid, (int) $bmid);
                     $xoopsDB->query($sql);
                 }
             }
@@ -548,14 +548,14 @@ 
                 $xoopsDB->query($sql);
             }
         }
-        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     if ('list' === $op) {
         xoops_cp_header();
         //        mpu_adm_menu();
         listBlocks();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -577,7 +577,7 @@ 
                     $xoopsDB->query($sql);
                 } else {
                     foreach ($bmodule[$i] as $bmid) {
-                        $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid[$i], (int)$bmid);
+                        $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $xoopsDB->prefix('block_module_link'), $bid[$i], (int) $bmid);
                         $xoopsDB->query($sql);
                     }
                 }
@@ -591,7 +591,7 @@ 
                 }
             }
         }
-        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        redirect_header($_SERVER['SCRIPT_NAME'], 1, constant('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
     if ('clone' === $op) {
         cloneBlock($bid);
@@ -609,5 +609,5 @@ 
         isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
     }
 } else {
-    echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
+    echo constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403');
 }

admin/menu.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 $helper->loadLanguage('feedback');
 
 $pathIcon32 = Admin::menuIconPath('');
-$pathModIcon32 = XOOPS_URL .   '/modules/' . $moduleDirName . '/assets/images/icons/32/';
+$pathModIcon32 = XOOPS_URL.'/modules/'.$moduleDirName.'/assets/images/icons/32/';
 if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
     $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
 }
@@ -40,41 +40,41 @@ 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_HOME,
     'desc'  => _MI_CONTACT_MENU_HOME_DESC,
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
     'link'  => 'admin/index.php',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_CONTACT,
     'desc'  => _MI_CONTACT_MENU_CONTACT_DESC,
-    'icon'  => $pathIcon32 . '/content.png',
+    'icon'  => $pathIcon32.'/content.png',
     'link'  => 'admin/main.php',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_LOGS,
     'desc'  => _MI_CONTACT_MENU_LOGS_DESC,
-    'icon'  => $pathIcon32 . '/identity.png',
+    'icon'  => $pathIcon32.'/identity.png',
     'link'  => 'admin/log.php',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_TOOLS,
     'desc'  => _MI_CONTACT_MENU_TOOLS_DESC,
-    'icon'  => $pathIcon32 . '/delete.png',
+    'icon'  => $pathIcon32.'/delete.png',
     'link'  => 'admin/tools.php',
 ];
 
 // Blocks Admin
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
+    'title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS'),
     'link' => 'admin/blocksadmin.php',
-    'icon' => $pathIcon32 . '/block.png',
+    'icon' => $pathIcon32.'/block.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_ABOUT,
     'desc'  => _MI_CONTACT_MENU_ABOUT_DESC,
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
     'link'  => 'admin/about.php',
 ];

language/german/common.php

Spacing +129 added lines, -129 removed lines

@@ -17,138 +17,138 @@ 
 $moduleDirName = \basename(\dirname(__DIR__, 2));
 $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(__DIR__, 2)));
-\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(__DIR__, 2)));
+\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 . '_' . 'LOAD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM', 'Are you sure to Import Sample Data? (It will delete ALL current data)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS', 'Sample Date imported  successfully');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS', 'Export Tables to YAML successfully');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA', 'Clear Sample Data');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK', 'The Sample Data has been cleared');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_CONFIRM', 'Are you sure to Clear Sample Data? (It will delete ALL current data)');
-\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 . '_' . '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 . '_' . '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.'_'.'LOAD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM', 'Are you sure to Import Sample Data? (It will delete ALL current data)');
+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS', 'Sample Date imported  successfully');
+\define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');
+\define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS', 'Export Tables to YAML successfully');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA', 'Clear Sample Data');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK', 'The Sample Data has been cleared');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_CONFIRM', 'Are you sure to Clear Sample Data? (It will delete ALL current data)');
+\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.'_'.'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.'_'.'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 . '_' . 'UPDATE_SUCCESS', 'Update successful');
+\define('CO_'.$moduleDirNameUpper.'_'.'AGDS', 'Admin Groups');
+\define('CO_'.$moduleDirNameUpper.'_'.'BCACHETIME', 'Cache Time');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADMIN', 'Blocks Admin');
+\define('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS', 'Update successful');
 
 //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 . '_' . 'MIGRATE_OK', 'Database migrated to current schema.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING', 'Warning! This is intended for developers only. Confirm write schema file from current database.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK', 'Current schema file written');
+\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.'_'.'MIGRATE_OK', 'Database migrated to current schema.');
+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_WARNING', 'Warning! This is intended for developers only. Confirm write schema file from current database.');
+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_SCHEMA_OK', 'Current schema file written');
 
 //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>");
@@ -158,31 +158,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 . '_' . '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');
 
 //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');
 
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_FILE_SIZE', 'Image File Size (in Bytes)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_FILE_SIZE_DSC','The maximum file size of the image file (in Bytes)');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_FILE_SIZE', 'Image File Size (in Bytes)');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_FILE_SIZE_DSC', 'The maximum file size of the image file (in Bytes)');
 
 
 //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');

config/config.php

Spacing +16 added lines, -16 removed lines

@@ -21,33 +21,33 @@ 
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 xoops_loadLanguage('common', $moduleDirName);
 
-return (object)[
-    'name'           => $moduleDirNameUpper . ' ModuleConfigurator',
+return (object) [
+    'name'           => $moduleDirNameUpper.' ModuleConfigurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/midsize',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/midsize',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/thumbs',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/midsize',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/midsize',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/thumbs',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
     'copyTestFolders' => [
         [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
         ],
         //            [
         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
@@ -84,6 +84,6 @@ 
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
 ];
 

class/Utility.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
                 if (!\mkdir($folder) && !\is_dir($folder)) {
                     throw new RuntimeException(\sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (\Exception $e) {
@@ -73,10 +73,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = \readdir($dir))) {
             if (($file !== '.') && ($file !== '..')) {
-                if (\is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (\is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
+                    \copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }

class/ContactHandler.php

Spacing +22 added lines, -22 removed lines

@@ -144,34 +144,34 @@ 
         $info          = '';
         $subjectPrefix = '';
         if ($GLOBALS['xoopsModuleConfig']['form_dept'] && $GLOBALS['xoopsModuleConfig']['subject_prefix'] && $GLOBALS['xoopsModuleConfig']['contact_dept']) {
-            $subjectPrefix = '[' . $GLOBALS['xoopsModuleConfig']['prefix_text'] . ' ' . $contact['contact_department'] . ']: ';
-            $info          .= _MD_CONTACT_DEPARTMENT . ': ' . $contact['contact_department'] . "\n";
+            $subjectPrefix = '['.$GLOBALS['xoopsModuleConfig']['prefix_text'].' '.$contact['contact_department'].']: ';
+            $info .= _MD_CONTACT_DEPARTMENT.': '.$contact['contact_department']."\n";
         }
-        $xoopsMailer->setSubject($subjectPrefix . \html_entity_decode($contact['contact_subject'], \ENT_QUOTES, 'UTF-8'));
+        $xoopsMailer->setSubject($subjectPrefix.\html_entity_decode($contact['contact_subject'], \ENT_QUOTES, 'UTF-8'));
 
         if ($contact['contact_url']) {
-            $info .= _MD_CONTACT_URL . ': ' . $contact['contact_url'] . "\n";
+            $info .= _MD_CONTACT_URL.': '.$contact['contact_url']."\n";
         }
         if ($contact['contact_icq']) {
-            $info .= _MD_CONTACT_ICQ . ': ' . $contact['contact_icq'] . "\n";
+            $info .= _MD_CONTACT_ICQ.': '.$contact['contact_icq']."\n";
         }
         if ($contact['contact_skype']) {
-            $info .= _MD_CONTACT_SKYPE . ': ' . $contact['contact_skype'] . "\n";
+            $info .= _MD_CONTACT_SKYPE.': '.$contact['contact_skype']."\n";
         }
         if ($contact['contact_phone']) {
-            $info .= _MD_CONTACT_PHONE . ': ' . $contact['contact_phone'] . "\n";
+            $info .= _MD_CONTACT_PHONE.': '.$contact['contact_phone']."\n";
         }
         if ($contact['contact_company']) {
-            $info .= _MD_CONTACT_COMPANY . ': ' . $contact['contact_company'] . "\n";
+            $info .= _MD_CONTACT_COMPANY.': '.$contact['contact_company']."\n";
         }
         if ($contact['contact_location']) {
-            $info .= _MD_CONTACT_LOCATION . ': ' . $contact['contact_location'] . "\n";
+            $info .= _MD_CONTACT_LOCATION.': '.$contact['contact_location']."\n";
         }
         if ($contact['contact_address']) {
-            $info .= _MD_CONTACT_ADDRESS . ': ' . $contact['contact_address'] . "\n";
+            $info .= _MD_CONTACT_ADDRESS.': '.$contact['contact_address']."\n";
         }
         if ('' !== $info) {
-            $info = "\n" . $info . "\n";
+            $info = "\n".$info."\n";
         }
 
         $body = \str_replace('{BODY}', \html_entity_decode($contact['contact_message'], \ENT_QUOTES, 'UTF-8'), \_MD_CONTACT_MAIL_BODY);
@@ -204,28 +204,28 @@ 
 
         $info = '';
         if ($contact['contact_url']) {
-            $info .= _MD_CONTACT_URL . ': ' . $contact['contact_url'] . "\n";
+            $info .= _MD_CONTACT_URL.': '.$contact['contact_url']."\n";
         }
         if ($contact['contact_icq']) {
-            $info .= _MD_CONTACT_ICQ . ': ' . $contact['contact_icq'] . "\n";
+            $info .= _MD_CONTACT_ICQ.': '.$contact['contact_icq']."\n";
         }
         if ($contact['contact_skype']) {
-            $info .= _MD_CONTACT_SKYPE . ': ' . $contact['contact_skype'] . "\n";
+            $info .= _MD_CONTACT_SKYPE.': '.$contact['contact_skype']."\n";
         }
         if ($contact['contact_phone']) {
-            $info .= _MD_CONTACT_PHONE . ': ' . $contact['contact_phone'] . "\n";
+            $info .= _MD_CONTACT_PHONE.': '.$contact['contact_phone']."\n";
         }
         if ($contact['contact_company']) {
-            $info .= _MD_CONTACT_COMPANY . ': ' . $contact['contact_company'] . "\n";
+            $info .= _MD_CONTACT_COMPANY.': '.$contact['contact_company']."\n";
         }
         if ($contact['contact_location']) {
-            $info .= _MD_CONTACT_LOCATION . ': ' . $contact['contact_location'] . "\n";
+            $info .= _MD_CONTACT_LOCATION.': '.$contact['contact_location']."\n";
         }
         if ($contact['contact_address']) {
-            $info .= _MD_CONTACT_ADDRESS . ': ' . $contact['contact_address'] . "\n";
+            $info .= _MD_CONTACT_ADDRESS.': '.$contact['contact_address']."\n";
         }
         if ('' !== $info) {
-            $info = "\n" . $info . "\n";
+            $info = "\n".$info."\n";
         }
 
         $body = \str_replace('{NAME}', \html_entity_decode($contact['contact_name'], \ENT_QUOTES, 'UTF-8'), _MD_CONTACT_MAILCONFIRM_BODY);
@@ -312,7 +312,7 @@ 
         $criteria = new \CriteriaCompo();
         $criteria->add(new \Criteria('contact_cid', $contact_id));
         $criteria->add(new \Criteria('contact_type', 'Contact'));
-        $contacts =& $this->getObjects($criteria, false);
+        $contacts = & $this->getObjects($criteria, false);
         if ($contacts) {
             $ret = [];
             /** @var Contact $root */
@@ -343,7 +343,7 @@ 
         $criteria->setOrder($contact['order']);
         $criteria->setStart($contact['start']);
         $criteria->setLimit($contact['limit']);
-        $contacts =& $this->getObjects($criteria, false);
+        $contacts = & $this->getObjects($criteria, false);
         if ($contacts) {
             /** @var Contact $root */
             foreach ($contacts as $root) {
@@ -483,7 +483,7 @@ 
         }
         $criteria->setSort('contact_create');
         $criteria->setOrder('DESC');
-        $contacts =& $this->getObjects($criteria, false);
+        $contacts = & $this->getObjects($criteria, false);
         if ($contacts) {
             /** @var Contact $root */
             foreach ($contacts as $root) {