mambax7 / altsys

xoops_trust_path/libs/altsys/compilehookadmin.php

Spacing +29 added lines, -29 removed lines

@@ -5,9 +5,9 @@ 
 //                       GIJOE <https://www.peak.ne.jp>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__ . '/class/AltsysBreadcrumbs.class.php';
-require_once __DIR__ . '/include/gtickets.php';
-require_once __DIR__ . '/include/altsys_functions.php';
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/gtickets.php';
+require_once __DIR__.'/include/altsys_functions.php';
 
 // this page can be called only from altsys
 // if( $xoopsModule->getVar('dirname') != 'altsys' ) die( 'this page can be called only from altsys' ) ;
@@ -32,7 +32,7 @@ 
 
     'enclosebybordereddiv' => [
         'pre' => '<div class="altsys_tplsadmin_frame" style="border:1px solid black;word-wrap:break-word;">',
-        'post' => '<br><a href="' . XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=%1$s" style="color:red;">Edit:<br>%1$s</a></div>',
+        'post' => '<br><a href="'.XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=%1$s" style="color:red;">Edit:<br>%1$s</a></div>',
         'success_msg' => _TPLSADMIN_FMT_MSG_ENCLOSEBYBORDEREDDIV,
         'dt' => _TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV,
         'dd' => _TPLSADMIN_DD_ENCLOSEBYBORDEREDDIV,
@@ -41,7 +41,7 @@ 
     ],
 
     'hooksavevars' => [
-        'pre' => '<?php require_once \'' . XOOPS_TRUST_PATH . ',$this) ; ?>',
+        'pre' => '<?php require_once \''.XOOPS_TRUST_PATH.',$this) ; ?>',
         'post' => '',
         'success_msg' => _TPLSADMIN_FMT_MSG_HOOKSAVEVARS,
         'dt' => _TPLSADMIN_DT_HOOKSAVEVARS,
@@ -70,10 +70,10 @@ 
     // Ticket Check
 
     if (!$xoopsGTicket->check()) {
-        redirect_header(XOOPS_URL . '/', 3, $xoopsGTicket->getErrors());
+        redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+    if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
         while (false !== ($file = readdir($handler))) {
             if (!empty($_POST['clearcache'])) {
                 // judging template cache '*.php'
@@ -86,7 +86,7 @@ 
                 continue;
             }
 
-            $file_path = XOOPS_COMPILE_PATH . '/' . $file;
+            $file_path = XOOPS_COMPILE_PATH.'/'.$file;
 
             @unlink($file_path);
         }
@@ -105,10 +105,10 @@ 
         // Ticket Check
 
         if (!$xoopsGTicket->check()) {
-            redirect_header(XOOPS_URL . '/', 3, $xoopsGTicket->getErrors());
+            redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
         }
 
-        if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+        if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
             $file_count = 0;
 
             while (false !== ($file = readdir($handler))) {
@@ -132,7 +132,7 @@ 
                     $skip_mode = false;
                 }
 
-                $file_path = XOOPS_COMPILE_PATH . '/' . $file;
+                $file_path = XOOPS_COMPILE_PATH.'/'.$file;
 
                 $file_bodies = file($file_path);
 
@@ -161,7 +161,7 @@ 
                 // insert "pre" command before the compiled cache
 
                 if ($compile_hook['pre'] && !$skip_mode) {
-                    fwrite($fw, sprintf($compile_hook['pre'], htmlspecialchars($tpl_name, ENT_QUOTES | ENT_HTML5)) . "\r\n");
+                    fwrite($fw, sprintf($compile_hook['pre'], htmlspecialchars($tpl_name, ENT_QUOTES | ENT_HTML5))."\r\n");
                 }
 
                 // rest of template cache
@@ -173,7 +173,7 @@ 
                 // insert "post" command after the compiled cache
 
                 if ($compile_hook['post'] && !$skip_mode) {
-                    fwrite($fw, "\r\n" . sprintf($compile_hook['post'], htmlspecialchars($tpl_name, ENT_QUOTES | ENT_HTML5)));
+                    fwrite($fw, "\r\n".sprintf($compile_hook['post'], htmlspecialchars($tpl_name, ENT_QUOTES | ENT_HTML5)));
                 }
 
                 fclose($fw);
@@ -203,7 +203,7 @@ 
 // count template vars & compiled caches
 $compiledcache_num = 0;
 $tplsvars_num = 0;
-if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
     while (false !== ($file = readdir($handler))) {
         if (0 === strncmp($file, 'tplsvars_', 9)) {
             $tplsvars_num++;
@@ -214,7 +214,7 @@ 
 }
 
 // get tplsets
-$sql = 'SELECT tplset_name,COUNT(DISTINCT tpl_file) FROM ' . $xoopsDB->prefix('tplset') . ' LEFT JOIN ' . $xoopsDB->prefix('tplfile') . " ON tplset_name=tpl_tplset GROUP BY tpl_tplset, tplset_name, tpl_file ORDER BY tpl_tplset='default' DESC,tpl_tplset";
+$sql = 'SELECT tplset_name,COUNT(DISTINCT tpl_file) FROM '.$xoopsDB->prefix('tplset').' LEFT JOIN '.$xoopsDB->prefix('tplfile')." ON tplset_name=tpl_tplset GROUP BY tpl_tplset, tplset_name, tpl_file ORDER BY tpl_tplset='default' DESC,tpl_tplset";
 $srs = $xoopsDB->query($sql);
 $tplset_options = "<option value=''>----</option>\n";
 while ([$tplset, $tpl_count] = $xoopsDB->fetchRow($srs)) {
@@ -234,7 +234,7 @@ 
 
 // breadcrumbs
 $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
-$breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=compilehookadmin', _MI_ALTSYS_MENU_COMPILEHOOKADMIN);
+$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=compilehookadmin', _MI_ALTSYS_MENU_COMPILEHOOKADMIN);
 
 echo "
     <style>
@@ -252,7 +252,7 @@ 
             <dl>
                 <dt>
                     {$compile_hook['dt']}
-                    <input type='submit' name='$command' id='$command' value='" . _GO . "' onclick='return confirm(\"{$compile_hook['conf_msg']}\");'>
+                    <input type='submit' name='$command' id='$command' value='"._GO."' onclick='return confirm(\"{$compile_hook['conf_msg']}\");'>
                 </dt>
                 <dd>
                     {$compile_hook['dd']}
@@ -264,26 +264,26 @@ 
 
 echo "
         <p style='margin:10px;'>
-            " . _TPLSADMIN_NUMCAP_COMPILEDCACHES . ": <strong>$compiledcache_num</strong>
-            <input type='submit' name='clearcache' value='" . _DELETE . "' onclick='return confirm(\"" . _TPLSADMIN_CNF_DELETEOK . "\");'>
+            " . _TPLSADMIN_NUMCAP_COMPILEDCACHES.": <strong>$compiledcache_num</strong>
+            <input type='submit' name='clearcache' value='"._DELETE."' onclick='return confirm(\""._TPLSADMIN_CNF_DELETEOK."\");'>
 
         </p>
         <p style='margin:10px;'>
-            " . _TPLSADMIN_NUMCAP_TPLSVARS . ": <strong>$tplsvars_num</strong>
-            <input type='submit' name='cleartplsvars' value='" . _DELETE . "' onclick='return confirm(\"" . _TPLSADMIN_CNF_DELETEOK . "\");'>
+            " . _TPLSADMIN_NUMCAP_TPLSVARS.": <strong>$tplsvars_num</strong>
+            <input type='submit' name='cleartplsvars' value='"._DELETE."' onclick='return confirm(\""._TPLSADMIN_CNF_DELETEOK."\");'>
 
         </p>
-        " . $xoopsGTicket->getTicketHtml(__LINE__) . "
+        " . $xoopsGTicket->getTicketHtml(__LINE__)."
     </form>
 
     <form action='?mode=admin&amp;lib=altsys&amp;page=get_tplsvarsinfo' method='post' class='odd' style='margin: 40px;' target='_blank'>
         <p>
             <dl>
                 <dt>
-                    " . _TPLSADMIN_DT_GETTPLSVARSINFO_DW . '
+                    " . _TPLSADMIN_DT_GETTPLSVARSINFO_DW.'
                 </dt>
                 <dd>
-                    ' . _TPLSADMIN_DD_GETTPLSVARSINFO_DW . "
+                    ' . _TPLSADMIN_DD_GETTPLSVARSINFO_DW."
                     <br>
                     <input type='submit' name='as_dw_extension_zip' value='zip'>
                     <input type='submit' name='as_dw_extension_tgz' value='tar.gz'>
@@ -296,10 +296,10 @@ 
         <p>
             <dl>
                 <dt>
-                    " . _TPLSADMIN_DT_GETTEMPLATES . '
+                    " . _TPLSADMIN_DT_GETTEMPLATES.'
                 </dt>
                 <dd>
-                    ' . _TPLSADMIN_DD_GETTEMPLATES . "
+                    ' . _TPLSADMIN_DD_GETTEMPLATES."
                     <br>
                     <select name='tplset'>$tplset_options</select>
                     <input type='submit' name='download_zip' value='zip'>
@@ -313,14 +313,14 @@ 
         <p>
             <dl>
                 <dt>
-                    " . _TPLSADMIN_DT_PUTTEMPLATES . '
+                    "._TPLSADMIN_DT_PUTTEMPLATES.'
                 </dt>
                 <dd>
-                    ' . _TPLSADMIN_DD_PUTTEMPLATES . "
+                    ' . _TPLSADMIN_DD_PUTTEMPLATES."
                     <br>
                     <select name='tplset'>$tplset_options</select>
                     <input type='file' name='tplset_archive' size='60'>
-                    <input type='submit' value='" . _SUBMIT . "'>
+                    <input type='submit' value='"._SUBMIT."'>
                 </dd>
             </dl>
         </p>

xoops_trust_path/libs/altsys/preload.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 //admin page
 if ($root->mController->_mStrategy) {
     if (mb_strtolower(get_class($root->mController->_mStrategy)) == mb_strtolower('Legacy_AdminControllerStrategy')) {
-        require_once __DIR__ . '/include/altsys_functions.php';
+        require_once __DIR__.'/include/altsys_functions.php';
 
         // language file (modinfo.php)
 
@@ -14,4 +14,4 @@ 
     }
 }
 // load altsys newly gticket class for other modules
-require_once XOOPS_TRUST_PATH . '/libs/altsys/include/gtickets.php';
+require_once XOOPS_TRUST_PATH.'/libs/altsys/include/gtickets.php';

xoops_trust_path/libs/altsys/include/admin_in_theme_header.inc.php

Indentation +7 added lines, -7 removed lines

@@ -29,13 +29,13 @@
     $xoopsTpl->xoops_setDebugging(true);
 }
 $xoopsTpl->assign([
-                      'xoops_theme' => $xoopsConfig['theme_set'],
-                      'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
-                      'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']),
-                      'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES | ENT_HTML5),
-                      'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES | ENT_HTML5),
-                      'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES | ENT_HTML5),
-                  ]);
+                        'xoops_theme' => $xoopsConfig['theme_set'],
+                        'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
+                        'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']),
+                        'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES | ENT_HTML5),
+                        'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES | ENT_HTML5),
+                        'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES | ENT_HTML5),
+                    ]);
 // Meta tags
 $configHandler = xoops_getHandler('config');
 $criteria = new \CriteriaCompo(new \Criteria('conf_modid', 0));

Spacing +21 added lines, -21 removed lines

@@ -17,12 +17,12 @@ 
 
 // This is a mimic file from header.php of 2.0.16-JP
 
-require_once dirname(__DIR__) . '/class/AltsysBreadcrumbs.class.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
 $xoopsOption['theme_use_smarty'] = 1;
 // include Smarty template engine and initialize it
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 $xoopsTpl = new \XoopsTpl();
 $xoopsTpl->xoops_setCaching(2);
 if (3 == $xoopsConfig['debug_mode']) {
@@ -30,7 +30,7 @@ 
 }
 $xoopsTpl->assign([
                       'xoops_theme' => $xoopsConfig['theme_set'],
-                      'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
+                      'xoops_imageurl' => XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/',
                       'xoops_themecss' => xoops_getcss($xoopsConfig['theme_set']),
                       'xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES | ENT_HTML5),
                       'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES | ENT_HTML5),
@@ -44,7 +44,7 @@ 
 foreach (array_keys($config) as $i) {
     // prefix each tag with 'xoops_'
 
-    $xoopsTpl->assign('xoops_' . $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+    $xoopsTpl->assign('xoops_'.$config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
 }
 //unset($config);
 // Weird, but need extra <script> tags for 2.0.x themes
@@ -85,9 +85,9 @@ 
         if ($breadcrumbsObj->hasPaths()) {
             $xoops_breadcrumbs = $breadcrumbsObj->getXoopsBreadcrumbs();
         } else {
-            $mod_url = XOOPS_URL . '/modules/' . $target_module->getVar('dirname');
+            $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
 
-            $mod_path = XOOPS_ROOT_PATH . '/modules/' . $target_module->getVar('dirname');
+            $mod_path = XOOPS_ROOT_PATH.'/modules/'.$target_module->getVar('dirname');
 
             $modinfo = &$target_module->getInfo();
 
@@ -95,14 +95,14 @@ 
 
             if (!empty($modinfo['hasMain'])) {
                 $xoops_breadcrumbs[] = [
-                    'url' => $mod_url . '/',
+                    'url' => $mod_url.'/',
                     'name' => sprintf(_MD_A_AINTHEME_FMT_PUBLICTOP, $target_module->getVar('name')),
                 ];
             }
 
             if (!empty($modinfo['adminindex'])) {
                 $xoops_breadcrumbs[] = [
-                    'url' => $mod_url . '/' . $modinfo['adminindex'],
+                    'url' => $mod_url.'/'.$modinfo['adminindex'],
                     'name' => sprintf(_MD_A_AINTHEME_FMT_ADMINTOP, $target_module->getVar('name')),
                 ];
             }
@@ -110,7 +110,7 @@ 
             if (!empty($GLOBALS['altsysAdminPageTitle'])) {
                 $xoops_breadcrumbs[] = ['name' => htmlspecialchars($GLOBALS['altsysAdminPageTitle'], ENT_QUOTES | ENT_HTML5)];
             } elseif (!empty($modinfo['adminmenu'])) {
-                @include $mod_path . '/' . $modinfo['adminmenu'];
+                @include $mod_path.'/'.$modinfo['adminmenu'];
 
                 if (is_array(@$adminmenu)) {
                     foreach ($adminmenu as $eachmenu) {
@@ -130,7 +130,7 @@ 
 
         $xoops_breadcrumbs = [
             [
-                'url' => XOOPS_URL . '/admin.php',
+                'url' => XOOPS_URL.'/admin.php',
                 'name' => _CPHOME,
             ],
         ];
@@ -141,18 +141,18 @@ 
 
 // get block_arr
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-$sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (" . implode(',', $xoopsUser->getGroups()) . ')';
+$sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1 AND gperm_groupid IN (".implode(',', $xoopsUser->getGroups()).')';
 $result = $db->query($sql);
 
 $blockids = [];
 while ([$blockid] = $db->fetchRow($result)) {
-    $blockids[] = (int) $blockid;
+    $blockids[] = (int)$blockid;
 }
 
 global $block_arr, $i; // for piCal :-)
 $block_arr = [];
 if (!empty($blockids)) {
-    $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id=' . (int) $altsysModuleId . ' AND b.bid IN (' . implode(',', $blockids) . ') ORDER BY b.weight,b.bid';
+    $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid AND b.isactive=1 AND b.visible=1 AND m.module_id='.(int)$altsysModuleId.' AND b.bid IN ('.implode(',', $blockids).') ORDER BY b.weight,b.bid';
 
     $result = $db->query($sql);
 
@@ -190,7 +190,7 @@ 
     $btpl = $block_arr[$i]->getVar('template');
 
     if ('' != $btpl) {
-        if (empty($bcachetime) || !$xoopsTpl->isCached('db:' . $btpl, 'blk_' . $block_arr[$i]->getVar('bid'))) {
+        if (empty($bcachetime) || !$xoopsTpl->isCached('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'))) {
             $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
 
             $bresult = $block_arr[$i]->buildBlock();
@@ -201,18 +201,18 @@ 
 
             $xoopsTpl->assignByRef('block', $bresult);
 
-            $bcontent = $xoopsTpl->fetch('db:' . $btpl, 'blk_' . $block_arr[$i]->getVar('bid'));
+            $bcontent = $xoopsTpl->fetch('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'));
 
             $xoopsTpl->clearAssign('block');
         } else {
             $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
 
-            $bcontent = $xoopsTpl->fetch('db:' . $btpl, 'blk_' . $block_arr[$i]->getVar('bid'));
+            $bcontent = $xoopsTpl->fetch('db:'.$btpl, 'blk_'.$block_arr[$i]->getVar('bid'));
         }
     } else {
         $bid = $block_arr[$i]->getVar('bid');
 
-        if (empty($bcachetime) || !$xoopsTpl->isCached('db:system_dummy.tpl', 'blk_' . $bid)) {
+        if (empty($bcachetime) || !$xoopsTpl->isCached('db:system_dummy.tpl', 'blk_'.$bid)) {
             $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
 
             $bresult = $block_arr[$i]->buildBlock();
@@ -223,13 +223,13 @@ 
 
             $xoopsTpl->assignByRef('dummy_content', $bresult['content']);
 
-            $bcontent = $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_' . $bid);
+            $bcontent = $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_'.$bid);
 
             $xoopsTpl->clearAssign('block');
         } else {
             $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
 
-            $bcontent = $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_' . $bid);
+            $bcontent = $xoopsTpl->fetch('db:system_dummy.tpl', 'blk_'.$bid);
         }
     }
 
@@ -281,7 +281,7 @@ 
 
 // FALLBACK inserting admin_menu_block in admin side
 if (!$adminmenublock_exists) {
-    require_once XOOPS_ROOT_PATH . '/modules/altsys/blocks/blocks.php';
+    require_once XOOPS_ROOT_PATH.'/modules/altsys/blocks/blocks.php';
 
     $admin_menu_block = [b_altsys_admin_menu_show(['altsys'])];
 

xoops_trust_path/libs/altsys/include/autoupdate_from_module.inc.php

Spacing +11 added lines, -11 removed lines

@@ -14,21 +14,21 @@ 
 foreach ($tplsadmin_autoupdate_dirnames as $dirname) {
     $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname);
 
-    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates';
+    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates';
 
     // modules
 
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (false !== ($file = readdir($handler))) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
 
             if (is_file($file_path) && '.tpl' == mb_substr($file, -5)) {
-                $mtime = (int) (@filemtime($file_path));
+                $mtime = (int)(@filemtime($file_path));
 
-                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime"));
+                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
 
                 if ($count <= 0) {
-                    require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                     tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }
@@ -38,17 +38,17 @@ 
 
     // blocks
 
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/blocks/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/blocks/')) {
         while (false !== ($file = readdir($handler))) {
-            $file_path = $tplsadmin_autoupdate_path . '/blocks/' . $file;
+            $file_path = $tplsadmin_autoupdate_path.'/blocks/'.$file;
 
             if (is_file($file_path) && '.tpl' == mb_substr($file, -5)) {
-                $mtime = (int) (@filemtime($file_path));
+                $mtime = (int)(@filemtime($file_path));
 
-                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime"));
+                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
 
                 if ($count <= 0) {
-                    require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                     tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }

xoops_trust_path/libs/altsys/include/Text_Diff.php

Spacing +3 added lines, -3 removed lines

@@ -557,7 +557,7 @@ 
                 }
             }
 
-            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
 
             for (; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
@@ -608,7 +608,7 @@ 
         $ymid = $ymids[$this->lcs];
 
         for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
+            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
 
             $y1 = $ymid[$n] + 1;
 
@@ -639,7 +639,7 @@ 
         $beg = 1;
 
         while ($beg < $end) {
-            $mid = (int) (($beg + $end) / 2);
+            $mid = (int)(($beg + $end) / 2);
 
             if ($ypos > $this->seq[$mid]) {
                 $beg = $mid + 1;

xoops_trust_path/libs/altsys/include/altsys_functions.php

Spacing +16 added lines, -16 removed lines

@@ -45,17 +45,17 @@ 
     global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
 
     $mymenu_find_paths = [
-        $mydirpath . '/admin/mymenu.php',
-        $mydirpath . '/mymenu.php',
-        $mytrustdirpath . '/admin/mymenu.php',
-        $mytrustdirpath . '/mymenu.php',
+        $mydirpath.'/admin/mymenu.php',
+        $mydirpath.'/mymenu.php',
+        $mytrustdirpath.'/admin/mymenu.php',
+        $mytrustdirpath.'/mymenu.php',
     ];
 
     foreach ($mymenu_find_paths as $mymenu_find_path) {
         if (is_file($mymenu_find_path)) {
             include $mymenu_find_path;
 
-            require_once __DIR__ . '/adminmenu_functions.php';
+            require_once __DIR__.'/adminmenu_functions.php';
 
             altsys_adminmenu_insert_mymenu($xoopsModule);
 
@@ -73,14 +73,14 @@ 
 {
     $mylang = $GLOBALS['xoopsConfig']['language'];
 
-    if (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php';
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php')) {
-        require_once XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php';
-    } elseif (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php';
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php')) {
-        require_once XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php';
+    if (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
+        require_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
+    } elseif (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
+        require_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
     }
 }
 
@@ -144,9 +144,9 @@ 
         case ALTSYS_CORE_TYPE_X23P:
         case ALTSYS_CORE_TYPE_ICMS:
         default:
-            return XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
+            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
         case ALTSYS_CORE_TYPE_XCL21:
-            return XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
+            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid;
     }
 }
 
@@ -179,7 +179,7 @@ 
             continue;
         }
 
-        @unlink(XOOPS_COMPILE_PATH . '/' . $file);
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
     }
 
     closedir($dh);

xoops_trust_path/libs/altsys/include/autoupdate_from_theme.inc.php

Spacing +6 added lines, -6 removed lines

@@ -5,19 +5,19 @@
 }
 
 // templates/ under the theme
-$tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates';
+$tplsadmin_autoupdate_path = XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/templates';
 
-if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
     while (false !== ($file = readdir($handler))) {
-        $file_path = $tplsadmin_autoupdate_path . '/' . $file;
+        $file_path = $tplsadmin_autoupdate_path.'/'.$file;
 
         if (is_file($file_path) && '.tpl' == mb_substr($file, -5)) {
-            $mtime = (int) (@filemtime($file_path));
+            $mtime = (int)(@filemtime($file_path));
 
-            [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime"));
+            [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
 
             if ($count <= 0) {
-                require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                 tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
             }

xoops_trust_path/libs/altsys/include/gtickets.php

Spacing +20 added lines, -20 removed lines

@@ -27,8 +27,8 @@ 
             // language file
 
             if (defined('XOOPS_ROOT_PATH') && !empty($xoopsConfig['language']) && !mb_strstr($xoopsConfig['language'], '/')) {
-                if (is_file(dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml')) {
-                    include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml';
+                if (is_file(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml')) {
+                    include dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml';
                 }
             }
 
@@ -59,7 +59,7 @@ 
 
         public function getTicketHtml($salt = '', $timeout = 1800, $area = '')
         {
-            return '<input type="hidden" name="XOOPS_G_TICKET" value="' . $this->issue($salt, $timeout, $area) . '">';
+            return '<input type="hidden" name="XOOPS_G_TICKET" value="'.$this->issue($salt, $timeout, $area).'">';
         }
 
         // returns an object of XoopsFormHidden including theh ticket
@@ -116,7 +116,7 @@ 
 
         public function getTicketParamString($salt = '', $noamp = false, $timeout = 1800, $area = '')
         {
-            return ($noamp ? '' : '&amp;') . 'XOOPS_G_TICKET=' . $this->issue($salt, $timeout, $area);
+            return ($noamp ? '' : '&amp;').'XOOPS_G_TICKET='.$this->issue($salt, $timeout, $area);
         }
 
         // issue a ticket
@@ -134,9 +134,9 @@ 
 
             if ('' === $salt) {
                 if (version_compare(PHP_VERSION, '7.0.0') >= 0 && function_exists('random_bytes')) {
-                    $salt = '$2y$07$' . str_replace('+', '.', base64_encode(random_bytes(self::PBKDF2_SALT_BYTES)));
+                    $salt = '$2y$07$'.str_replace('+', '.', base64_encode(random_bytes(self::PBKDF2_SALT_BYTES)));
                 } elseif (function_exists('mcrypt_create_iv')) {
-                    $salt = '$2y$07$' . str_replace('+', '.', base64_encode(mcrypt_create_iv(16, MCRYPT_DEV_URANDOM)));
+                    $salt = '$2y$07$'.str_replace('+', '.', base64_encode(mcrypt_create_iv(16, MCRYPT_DEV_URANDOM)));
                 }
             }
 
@@ -146,7 +146,7 @@ 
 
             $appendix_salt = empty($_SERVER['PATH']) ? XOOPS_DB_NAME : $_SERVER['PATH'];
 
-            $token = crypt($salt . $usec . $appendix_salt . $sec, $salt);
+            $token = crypt($salt.$usec.$appendix_salt.$sec, $salt);
 
             $this->_latest_token = $token;
 
@@ -181,7 +181,7 @@ 
 
             // paid md5ed token as a ticket
 
-            return md5($token . XOOPS_DB_PREFIX);
+            return md5($token.XOOPS_DB_PREFIX);
         }
 
         // check a ticket
@@ -227,14 +227,14 @@ 
                 // default lifetime 30min
 
                 if ($stub['expire'] >= time()) {
-                    if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                    if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                         $found_stub = $stub;
                     } else {
                         // store the other valid stubs into session
 
                         $_SESSION['XOOPS_G_STUBS'][] = $stub;
                     }
-                } elseif (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                } elseif (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                         // not CSRF but Time-Out
 
                         $timeout_flag = true;
@@ -318,7 +318,7 @@ 
 
             $table = '<table>';
 
-            $form = '<form action="?' . htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES | ENT_HTML5) . '" method="post" >';
+            $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES | ENT_HTML5).'" method="post" >';
 
             foreach ($_POST as $key => $val) {
                 if ('XOOPS_G_TICKET' == $key) {
@@ -340,22 +340,22 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . '</th><td>' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).'</th><td>'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . '" value="' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '">' . "\n";
+                    $form .= '<input type="hidden" name="'.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).'" value="'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'">'."\n";
                 }
             }
 
             $table .= '</table>';
 
-            $form .= $this->getTicketHtml(__LINE__, 300, $area) . '<input type="submit" value="' . $this->messages['btn_repost'] . '"></form>';
+            $form .= $this->getTicketHtml(__LINE__, 300, $area).'<input type="submit" value="'.$this->messages['btn_repost'].'"></form>';
 
             error_reporting(0);
 
             while (@ob_get_level() && @ob_end_clean()) {
             }
 
-            echo '<html><head><title>' . $this->messages['err_general'] . '</title><style>table,td,th {border:solid black 1px; border-collapse:collapse;}</style></head><body>' . sprintf($this->messages['fmt_prompt4repost'], $this->getErrors()) . $table . $form . '</body></html>';
+            echo '<html><head><title>'.$this->messages['err_general'].'</title><style>table,td,th {border:solid black 1px; border-collapse:collapse;}</style></head><body>'.sprintf($this->messages['fmt_prompt4repost'], $this->getErrors()).$table.$form.'</body></html>';
         }
 
         /**
@@ -376,7 +376,7 @@ 
                 }
 
                 if (is_array($val)) {
-                    [$tmp_table, $tmp_form] = $this->extract_post_recursive($key_name . '[' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . ']', $val);
+                    [$tmp_table, $tmp_form] = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).']', $val);
 
                     $table .= $tmp_table;
 
@@ -386,9 +386,9 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . ']</th><td>' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).']</th><td>'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . ']" value="' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '">' . "\n";
+                    $form .= '<input type="hidden" name="'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).']" value="'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'">'."\n";
                 }
             }
 
@@ -448,8 +448,8 @@ 
 
         public function errorHandler4FindOutput($errNo, $errStr, $errFile, $errLine)
         {
-            if (preg_match('?' . preg_quote(XOOPS_ROOT_PATH) . '([^:]+)\:(\d+)?', $errStr, $regs)) {
-                echo 'Irregular output! check the file ' . htmlspecialchars($regs[1], ENT_QUOTES | ENT_HTML5) . ' line ' . htmlspecialchars($regs[2], ENT_QUOTES | ENT_HTML5);
+            if (preg_match('?'.preg_quote(XOOPS_ROOT_PATH).'([^:]+)\:(\d+)?', $errStr, $regs)) {
+                echo 'Irregular output! check the file '.htmlspecialchars($regs[1], ENT_QUOTES | ENT_HTML5).' line '.htmlspecialchars($regs[2], ENT_QUOTES | ENT_HTML5);
             } else {
                 echo 'Irregular output! check language files etc.';
             }

xoops_trust_path/libs/altsys/include/formcheckboxgroup.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 /**
  * Parent
  */
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php';
 
 /**
  * A checkbox field with a choice of available groups
@@ -58,7 +58,7 @@ 
         }
 
         foreach ($options as $k => $v) {
-            $options[$k] = $v . '<br>';
+            $options[$k] = $v.'<br>';
         }
 
         $this->addOptionArray($options);