txmodxoops / tdmcreate

admin/settings.php

Spacing +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
  */
 $GLOBALS['xoopsOption']['template_main'] = 'tdmcreate_settings.tpl';
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Recovered value of argument op in the URL $
 $op = \Xmf\Request::getString('op', 'list');
@@ -45,7 +45,7 @@ 
         $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
         $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL);
         $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL);
-        $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
+        $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL.'/'.$modPathIcon16);
         $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
         $settingsCount = $helper->getHandler('Settings')->getCountSettings();
         $settingsAll   = $helper->getHandler('Settings')->getAllSettings($start, $limit);
@@ -57,8 +57,8 @@ 
                 unset($setting);
             }
             if ($settingsCount > $limit) {
-                include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($settingsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $pagenav = new \XoopsPageNav($settingsCount, $limit, $start, 'start', 'op=list&limit='.$limit);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
             }
         } else {
@@ -187,4 +187,4 @@ 
         }
         break;
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

admin/menu.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
  *
  * @version         $Id: menu.php 11084 2013-02-23 15:44:20Z timgno $
  */
-include dirname(__DIR__) . '/preloads/autoloader.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
@@ -46,62 +46,62 @@ 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU1,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/dashboard.png',
+    'icon'  => $pathIcon32.'/dashboard.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU2,
     'link'  => 'admin/settings.php',
-    'icon'  => $modPathIcon32 . '/settings.png',
+    'icon'  => $modPathIcon32.'/settings.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU3,
     'link'  => 'admin/modules.php',
-    'icon'  => $modPathIcon32 . '/addmodule.png',
+    'icon'  => $modPathIcon32.'/addmodule.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU4,
     'link'  => 'admin/tables.php',
-    'icon'  => $modPathIcon32 . '/addtable.png',
+    'icon'  => $modPathIcon32.'/addtable.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU5,
     'link'  => 'admin/fields.php',
-    'icon'  => $modPathIcon32 . '/fields.png',
+    'icon'  => $modPathIcon32.'/fields.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU6,
     'link'  => 'admin/morefiles.php',
-    'icon'  => $modPathIcon32 . '/files.png',
+    'icon'  => $modPathIcon32.'/files.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ADMENU7,
     'link'  => 'admin/building.php',
-    'icon'  => $modPathIcon32 . '/builder.png',
+    'icon'  => $modPathIcon32.'/builder.png',
 ];
 
 //Feedback
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK'),
+    'title' => constant('CO_'.$moduleDirNameUpper.'_'.'ADMENU_FEEDBACK'),
     'link'  => 'admin/feedback.php',
-    'icon'  => $pathIcon32 . 'mail_foward.png',
+    'icon'  => $pathIcon32.'mail_foward.png',
 ];
 
 if ($helper->getConfig('displayDeveloperTools')) {
     $adminmenu[] = [
-        'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
+        'title' => constant('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE'),
         'link'  => 'admin/migrate.php',
-        'icon'  => $pathIcon32 . 'database_go.png',
+        'icon'  => $pathIcon32.'database_go.png',
     ];
 }
 
 $adminmenu[] = [
     'title' => _MI_TDMCREATE_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png',
+    'icon'  => $pathIcon32.'about.png',
 ];

admin/index.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,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();
@@ -34,11 +34,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,
@@ -56,4 +56,4 @@ 
 $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('index.php'));
 $GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());
 
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

admin/logo.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  *
  * @version         $Id: 1.59 logo.php 11297 2013-03-24 10:58:10Z timgno $
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $funct    = \Xmf\Request::getString('funct', '', 'GET');
 $iconName = \Xmf\Request::getString('iconName', '', 'GET');
 $caption  = \Xmf\Request::getString('caption', '', 'GET');

admin/footer.php

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
  */
 $pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
 
-echo "<div class='adminfooter'>\n" . "  <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" . '</div>';
+echo "<div class='adminfooter'>\n"."  <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".'</div>';
 
 xoops_cp_footer();

include/functions.php

Indentation +8 added lines, -8 removed lines

@@ -34,14 +34,14 @@
     $donationform = [
         0 => '<form name="donation" id="donation" action="http://www.txmodxoops.org/modules/xdonations/" method="post" onsubmit="return xoopsFormValidate_donation();">',
         1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'
-             . _AM_TDMCREATE_ABOUT_MAKE_DONATION
-             . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'
-             . _AM_TDMCREATE_DONATION_AMOUNT
-             . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'
-             . _SUBMIT
-             . '" title="'
-             . _SUBMIT
-             . '" type="submit"></td></tr></tbody></table>',
+                . _AM_TDMCREATE_ABOUT_MAKE_DONATION
+                . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'
+                . _AM_TDMCREATE_DONATION_AMOUNT
+                . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'
+                . _SUBMIT
+                . '" title="'
+                . _SUBMIT
+                . '" type="submit"></td></tr></tbody></table>',
         2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="EUR" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"></form>',
         'D' => '',
         3 => '',

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 //--></script>
 <!-- End Form Validation JavaScript //-->',
     ];
-    $paypalform   = [
+    $paypalform = [
         0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
         1 => '<input name="cmd" value="_s-xclick" type="hidden">',
         2 => '<input name="hosted_button_id" value="%s" type="hidden">',
@@ -67,11 +67,11 @@ 
             case 2:
                 $donationform[$key] = sprintf(
                     $donationform[$key],
-                    $GLOBALS['xoopsConfig']['sitename'] . ' - ' . ('' != $GLOBALS['xoopsUser']->getVar('name') ? $GLOBALS['xoopsUser']->getVar('name') . ' [' . $GLOBALS['xoopsUser']->getVar('uname') . ']' : $GLOBALS['xoopsUser']->getVar('uname')),
+                    $GLOBALS['xoopsConfig']['sitename'].' - '.('' != $GLOBALS['xoopsUser']->getVar('name') ? $GLOBALS['xoopsUser']->getVar('name').' ['.$GLOBALS['xoopsUser']->getVar('uname').']' : $GLOBALS['xoopsUser']->getVar('uname')),
                     $GLOBALS['xoopsUser']->getVar('email'),
                     XOOPS_LICENSE_KEY,
                     mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')),
-                    mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')) . ' ' . $GLOBALS['xoopsModule']->getVar('name')
+                    mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')).' '.$GLOBALS['xoopsModule']->getVar('name')
                 );
                 break;
         }

include/install.php

Spacing +17 added lines, -17 removed lines

@@ -21,60 +21,60 @@
  *
  * @version         $Id: install.php 11084 2013-02-23 15:44:20Z timgno $
  */
-$indexFile = XOOPS_UPLOAD_PATH . '/index.html';
-$blankFile = XOOPS_UPLOAD_PATH . '/blank.gif';
-$emptyFile = XOOPS_ROOT_PATH . '/modules/tdmcreate/assets/images/logos/empty.png';
+$indexFile = XOOPS_UPLOAD_PATH.'/index.html';
+$blankFile = XOOPS_UPLOAD_PATH.'/blank.gif';
+$emptyFile = XOOPS_ROOT_PATH.'/modules/tdmcreate/assets/images/logos/empty.png';
 
 // Making of "uploads" folder
-$helper = XOOPS_UPLOAD_PATH . '/tdmcreate';
+$helper = XOOPS_UPLOAD_PATH.'/tdmcreate';
 if (!is_dir($helper)) {
     if (!mkdir($helper, 0777) && !is_dir($helper)) {
         throw new \RuntimeException(sprintf('Directory "%s" was not created', $helper));
     }
 }
 chmod($helper, 0777);
-copy($indexFile, $helper . '/index.html');
+copy($indexFile, $helper.'/index.html');
 
 // Making of images uploads folder
-$repository = $helper . '/repository';
+$repository = $helper.'/repository';
 if (!is_dir($repository)) {
     if (!mkdir($repository, 0777) && !is_dir($repository)) {
         throw new \RuntimeException(sprintf('Directory "%s" was not created', $repository));
     }
 }
 chmod($repository, 0777);
-copy($indexFile, $repository . '/index.html');
+copy($indexFile, $repository.'/index.html');
 
 // Making of images uploads folder
-$images = $helper . '/images';
+$images = $helper.'/images';
 if (!is_dir($images)) {
     if (!mkdir($images, 0777) && !is_dir($images)) {
         throw new \RuntimeException(sprintf('Directory "%s" was not created', $images));
     }
 }
 chmod($images, 0777);
-copy($indexFile, $images . '/index.html');
-copy($blankFile, $images . '/blank.gif');
+copy($indexFile, $images.'/index.html');
+copy($blankFile, $images.'/blank.gif');
 
 // Making of "modules" images folder
-$modules = $images . '/modules';
+$modules = $images.'/modules';
 if (!is_dir($modules)) {
     if (!mkdir($modules, 0777) && !is_dir($modules)) {
         throw new \RuntimeException(sprintf('Directory "%s" was not created', $modules));
     }
 }
 chmod($modules, 0777);
-copy($indexFile, $modules . '/index.html');
-copy($blankFile, $modules . '/blank.gif');
-copy($emptyFile, $modules . '/empty.png');
+copy($indexFile, $modules.'/index.html');
+copy($blankFile, $modules.'/blank.gif');
+copy($emptyFile, $modules.'/empty.png');
 
 // Making of "tables" images folder
-$tables = $images . '/tables';
+$tables = $images.'/tables';
 if (!is_dir($tables)) {
     if (!mkdir($tables, 0777) && !is_dir($tables)) {
         throw new \RuntimeException(sprintf('Directory "%s" was not created', $tables));
     }
 }
 chmod($tables, 0777);
-copy($indexFile, $tables . '/index.html');
-copy($blankFile, $tables . '/blank.gif');
+copy($indexFile, $tables.'/index.html');
+copy($blankFile, $tables.'/blank.gif');

include/update.php

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
 {
     global $xoopsDB;
     $result = $xoopsDB->query(
-        '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'
+        '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 = [];
     while (list($tplid) = $xoopsDB->fetchRow($result)) {
@@ -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,9 +92,9 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
+    $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."
         );

config/icons.php

Spacing +10 added lines, -10 removed lines

@@ -6,17 +6,17 @@
     $moduleDirName = basename(dirname(__DIR__));
 
     return (object)[
-        'name'  => mb_strtoupper($moduleDirName) . ' IconConfigurator',
+        'name'  => mb_strtoupper($moduleDirName).' IconConfigurator',
         'icons' => [
-            'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-            'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-            'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-            'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-            'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-            'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-            'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-            '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-            '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+            'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+            'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+            'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+            'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+            'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+            'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+            'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+            '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+            '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
         ],
     ];
 }