mambax7 / altsys

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

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 
 // Keep Block option values when update (by nobunobu) for XOOPS 2.0.x
 global $xoopsDB;
-$query = 'SELECT mid FROM ' . $xoopsDB->prefix('modules') . " WHERE dirname='" . $modversion['dirname'] . "' ";
+$query = 'SELECT mid FROM '.$xoopsDB->prefix('modules')." WHERE dirname='".$modversion['dirname']."' ";
 $result = $xoopsDB->query($query);
 $record = $xoopsDB->fetchArray($result);
 if ($record) {
@@ -55,20 +55,20 @@ 
         }
     } */
 
-    $sql = 'SELECT * FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $mid . " AND block_type <>'D' AND func_num > $count";
+    $sql = 'SELECT * FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$mid." AND block_type <>'D' AND func_num > $count";
 
     $fresult = $xoopsDB->query($sql);
 
     while (false !== ($fblock = $xoopsDB->fetchArray($fresult))) {
-        $local_msgs[] = 'Non Defined Block <b>' . $fblock['name'] . '</b> will be deleted';
+        $local_msgs[] = 'Non Defined Block <b>'.$fblock['name'].'</b> will be deleted';
 
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('newblocks') . " WHERE bid='" . $fblock['bid'] . "'";
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('newblocks')." WHERE bid='".$fblock['bid']."'";
 
         $iret = $xoopsDB->query($sql);
     }
 
     for ($i = 1; $i <= $count; ++$i) {
-        $sql = 'SELECT name,options FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $mid . ' AND func_num=' . $i . " AND show_func='" . addslashes($modversion['blocks'][$i]['show_func']) . "' AND func_file='" . addslashes($modversion['blocks'][$i]['file']) . "'";
+        $sql = 'SELECT name,options FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$mid.' AND func_num='.$i." AND show_func='".addslashes($modversion['blocks'][$i]['show_func'])."' AND func_file='".addslashes($modversion['blocks'][$i]['file'])."'";
 
         $fresult = $xoopsDB->query($sql);
 
@@ -82,7 +82,7 @@ 
             if (count($old_vals) == count($def_vals)) {
                 $modversion['blocks'][$i]['options'] = $fblock['options'];
 
-                $local_msgs[] = "Option's values of the block <b>" . $fblock['name'] . '</b> will be kept. (value = <b>' . $fblock['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be kept. (value = <b>'.$fblock['options'].'</b>)';
             } elseif (count($old_vals) < count($def_vals)) {
                 for ($j = 0; $j < count($old_vals); $j++) {
                     $def_vals[$j] = $old_vals[$j];
@@ -90,9 +90,9 @@ 
 
                 $modversion['blocks'][$i]['options'] = implode('|', $def_vals);
 
-                $local_msgs[] = "Option's values of the block <b>" . $fblock['name'] . '</b> will be kept and new option(s) are added. (value = <b>' . $modversion['blocks'][$i]['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be kept and new option(s) are added. (value = <b>'.$modversion['blocks'][$i]['options'].'</b>)';
             } else {
-                $local_msgs[] = "Option's values of the block <b>" . $fblock['name'] . '</b> will be reset to the default, because of some decrease of options. (value = <b>' . $modversion['blocks'][$i]['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be reset to the default, because of some decrease of options. (value = <b>'.$modversion['blocks'][$i]['options'].'</b>)';
             }
         }
     }

xoops_trust_path/libs/altsys/include/mygroupperm.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
         }
     }
 
-    $sql = 'DELETE FROM ' . $DB->prefix('group_permission') . ' ' . $criteria->renderWhere();
+    $sql = 'DELETE FROM '.$DB->prefix('group_permission').' '.$criteria->renderWhere();
 
     if (!$result = $DB->query($sql)) {
         return false;
@@ -106,7 +106,7 @@ 
                                 if (0 != $pid && !in_array($pid, array_keys($item_ids), true)) {
                                     // one of the parent items were not selected, so skip this item
 
-                                    $msg[] = sprintf(_MD_A_MYBLOCKSADMIN_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>') . ' (' . _MD_A_MYBLOCKSADMIN_PERMADDNGP . ')';
+                                    $msg[] = sprintf(_MD_A_MYBLOCKSADMIN_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>').' ('._MD_A_MYBLOCKSADMIN_PERMADDNGP.')';
 
                                     continue 2;
                                 }
@@ -124,9 +124,9 @@ 
                         $gperm->setVar('gperm_itemid', $item_id);
 
                         if (!$grouppermHandler->insert($gperm)) {
-                            $msg[] = sprintf(_MD_A_MYBLOCKSADMIN_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
+                            $msg[] = sprintf(_MD_A_MYBLOCKSADMIN_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
                         } else {
-                            $msg[] = sprintf(_MD_A_MYBLOCKSADMIN_PERMADDOK, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
+                            $msg[] = sprintf(_MD_A_MYBLOCKSADMIN_PERMADDOK, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
                         }
 
                         unset($gperm);

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

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 {
     $tplsvars_file = 'tplsvars_';
 
-    $tplsvars_file .= mb_substr(md5(mb_substr(XOOPS_DB_PASS, 0, 4)), 0, 4) . '_';
+    $tplsvars_file .= mb_substr(md5(mb_substr(XOOPS_DB_PASS, 0, 4)), 0, 4).'_';
 
     if (0 === strncmp($file, 'db:', 3)) {
         $tplsvars_file .= mb_substr($file, 3);
@@ -22,7 +22,7 @@ 
         $tplsvars_file .= strtr($file, '/', '%');
     }
 
-    if ($fw = @fopen(XOOPS_COMPILE_PATH . '/' . $tplsvars_file, 'xb')) {
+    if ($fw = @fopen(XOOPS_COMPILE_PATH.'/'.$tplsvars_file, 'xb')) {
         fwrite($fw, serialize($smarty->_tpl_vars));
 
         fclose($fw);

xoops_trust_path/libs/altsys/include/gtickets.php

Spacing +20 added lines, -20 removed lines

@@ -28,8 +28,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';
                 }
             }
 
@@ -60,7 +60,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
@@ -117,7 +117,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
@@ -135,9 +135,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)));
                 }
             }
 
@@ -147,7 +147,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;
 
@@ -182,7 +182,7 @@ 
 
             // paid md5ed token as a ticket
 
-            return md5($token . XOOPS_DB_PREFIX);
+            return md5($token.XOOPS_DB_PREFIX);
         }
 
         // check a ticket
@@ -228,7 +228,7 @@ 
                 // 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
@@ -236,7 +236,7 @@ 
                         $_SESSION['XOOPS_G_STUBS'][] = $stub;
                     }
                 } else {
-                    if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                    if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                         // not CSRF but Time-Out
 
                         $timeout_flag = true;
@@ -321,7 +321,7 @@ 
 
             $table = '<table>';
 
-            $form = '<form action="?' . htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES) . '" method="post" >';
+            $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES).'" method="post" >';
 
             foreach ($_POST as $key => $val) {
                 if ('XOOPS_G_TICKET' == $key) {
@@ -343,22 +343,22 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . htmlspecialchars($key, ENT_QUOTES) . '</th><td>' . htmlspecialchars($val, ENT_QUOTES) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.htmlspecialchars($key, ENT_QUOTES).'</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . htmlspecialchars($key, ENT_QUOTES) . '" value="' . htmlspecialchars($val, ENT_QUOTES) . '" />' . "\n";
+                    $form .= '<input type="hidden" name="'.htmlspecialchars($key, ENT_QUOTES).'" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\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>';
         }
 
         /**
@@ -379,7 +379,7 @@ 
                 }
 
                 if (is_array($val)) {
-                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name . '[' . htmlspecialchars($key, ENT_QUOTES) . ']', $val);
+                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES).']', $val);
 
                     $table .= $tmp_table;
 
@@ -389,9 +389,9 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES) . ']</th><td>' . htmlspecialchars($val, ENT_QUOTES) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES) . ']" value="' . htmlspecialchars($val, ENT_QUOTES) . '" />' . "\n";
+                    $form .= '<input type="hidden" name="'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n";
                 }
             }
 
@@ -451,8 +451,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/adminmenu_functions.php

Spacing +29 added lines, -29 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-require_once dirname(__DIR__) . '/class/altsysUtils.class.php';
+require_once dirname(__DIR__).'/class/altsysUtils.class.php';
 
-define('ALTSYS_ADMINMENU_FILE', XOOPS_CACHE_PATH . '/adminmenu.php');
+define('ALTSYS_ADMINMENU_FILE', XOOPS_CACHE_PATH.'/adminmenu.php');
 define('ALTSYS_ADMINMENU_HACK_NONE', 0);
 define('ALTSYS_ADMINMENU_HACK_2COL', 1);
 define('ALTSYS_ADMINMENU_HACK_NOIMG', 2);
@@ -34,7 +34,7 @@ 
     // read
 
     if (!is_file(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL . '/admin.php', 1, 'Rebuild adminmenu');
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
 
         exit;
     }
@@ -47,7 +47,7 @@ 
 
     $mid = $module->getVar('mid');
 
-    $anchor = '<!-- ALTSYS ANCHOR ' . $dirname . ' -->';
+    $anchor = '<!-- ALTSYS ANCHOR '.$dirname.' -->';
 
     // fetch popup_no
 
@@ -63,13 +63,13 @@ 
 
     // replace
 
-    $search = '<img src=\'' . XOOPS_URL . '/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\'' . XOOPS_URL . '/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=' . $mid . '\'';
+    $search = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mid.'\'';
 
-    $replace = $anchor . '<img src=\'' . XOOPS_URL . '/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\'' . XOOPS_URL . '/modules/' . $dirname . '/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences\'';
+    $replace = $anchor.'<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences\'';
 
     // do replacement
 
-    $new_xoops_admin_menu_dv = preg_replace('#' . preg_quote($search) . '#', $replace, $xoops_admin_menu_dv);
+    $new_xoops_admin_menu_dv = preg_replace('#'.preg_quote($search).'#', $replace, $xoops_admin_menu_dv);
 
     if ($xoops_admin_menu_dv == $new_xoops_admin_menu_dv) {
         return;
@@ -84,24 +84,24 @@ 
     if ('altsys' != $dirname) {
         $blocksadmin_title = defined('_MD_A_MYMENU_MYBLOCKSADMIN') ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin';
 
-        $insert .= '<img src=\'' . XOOPS_URL . '/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\'' . XOOPS_URL . '/modules/' . $dirname . '/admin/index.php?mode=admin&amp;lib=altsys&amp;page=myblocksadmin\'>' . $blocksadmin_title . '</a><br />' . "\n";
+        $insert .= '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=myblocksadmin\'>'.$blocksadmin_title.'</a><br />'."\n";
     }
 
     // insert tplsadmin
 
     $db = XoopsDatabaseFactory::getDatabaseConnection();
 
-    [$count] = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_module='$dirname'"));
+    [$count] = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_module='$dirname'"));
 
     if ($count > 0) {
         $tplsadmin_title = defined('_MD_A_MYMENU_MYTPLSADMIN') ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin';
 
-        $insert = '<img src=\'' . XOOPS_URL . '/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\'' . XOOPS_URL . '/modules/' . $dirname . '/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin\'>' . $tplsadmin_title . '</a><br />' . "\n" . $insert;
+        $insert = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin\'>'.$tplsadmin_title.'</a><br />'."\n".$insert;
     }
 
     // do insertion
 
-    $xoops_admin_menu_dv = preg_replace('#' . preg_quote($anchor) . '#', $anchor . $insert, $xoops_admin_menu_dv);
+    $xoops_admin_menu_dv = preg_replace('#'.preg_quote($anchor).'#', $anchor.$insert, $xoops_admin_menu_dv);
 
     // write back
 
@@ -145,7 +145,7 @@ 
     // read
 
     if (!is_file(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL . '/admin.php', 1, 'Rebuild adminmenu');
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
 
         exit;
     }
@@ -165,7 +165,7 @@ 
 
         // rebuild adminmenu
 
-        require_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+        require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
         xoops_module_write_admin_menu(xoops_module_get_admin_menu());
 
@@ -197,11 +197,11 @@ 
     foreach ($mids as $mid) {
         $module = $module_handler->get($mid);
 
-        $new_menu_ft = preg_replace('#' . preg_quote($search) . '#', sprintf($replace_fmt, $module->getVar('name')), $xoops_admin_menu_ft[$mid]);
+        $new_menu_ft = preg_replace('#'.preg_quote($search).'#', sprintf($replace_fmt, $module->getVar('name')), $xoops_admin_menu_ft[$mid]);
 
         if ($is_left) {
             if ($mid == $last_mid) {
-                $xoops_admin_menu_ft[$mid] = $new_menu_ft . '</td><td>';
+                $xoops_admin_menu_ft[$mid] = $new_menu_ft.'</td><td>';
             } else {
                 $left_body = $new_menu_ft;
 
@@ -210,7 +210,7 @@ 
                 $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',85);', $xoops_admin_menu_ml[$mid]);
             }
         } else {
-            $xoops_admin_menu_ft[$mid] = $left_body . '</td><td>' . $new_menu_ft;
+            $xoops_admin_menu_ft[$mid] = $left_body.'</td><td>'.$new_menu_ft;
 
             unset($xoops_admin_menu_ft[$left_key]);
 
@@ -237,7 +237,7 @@ 
     // read
 
     if (!is_file(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL . '/admin.php', 1, 'Rebuild adminmenu');
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
 
         exit;
     }
@@ -257,7 +257,7 @@ 
 
         // rebuild adminmenu
 
-        require_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+        require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
         xoops_module_write_admin_menu(xoops_module_get_admin_menu());
 
@@ -281,9 +281,9 @@ 
     foreach ($mids as $mid) {
         $module = $module_handler->get($mid);
 
-        $xoops_admin_menu_ft[$mid] = preg_replace('/\<img src\=.*$/', $module->getVar('name') . '</a>', $xoops_admin_menu_ft[$mid]);
+        $xoops_admin_menu_ft[$mid] = preg_replace('/\<img src\=.*$/', $module->getVar('name').'</a>', $xoops_admin_menu_ft[$mid]);
 
-        $xoops_admin_menu_ft[$mid] = '<div style="text-align:' . _GLOBAL_LEFT . ';background-color:#CCC;" title="' . $module->getVar('dirname') . '">' . $xoops_admin_menu_ft[$mid] . '</div>';
+        $xoops_admin_menu_ft[$mid] = '<div style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'">'.$xoops_admin_menu_ft[$mid].'</div>';
 
         $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',45);', $xoops_admin_menu_ml[$mid]);
     }
@@ -305,7 +305,7 @@ 
     // read
 
     if (!is_file(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL . '/admin.php', 1, 'Rebuild adminmenu');
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
 
         exit;
     }
@@ -325,7 +325,7 @@ 
 
         // rebuild adminmenu
 
-        require_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+        require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
         $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb');
 
@@ -358,10 +358,10 @@ 
         if (preg_match('/popUpL\d+/', $xoops_admin_menu_ft[$mid], $regs)) {
             $popup = $regs[0];
 
-            preg_match_all('#\<a href.*' . $popup . '\(\).*\</a>#U', $xoops_admin_menu_dv, $regs);
+            preg_match_all('#\<a href.*'.$popup.'\(\).*\</a>#U', $xoops_admin_menu_dv, $regs);
 
             foreach ($regs[0] as $submenuitem) {
-                $submenuitems[] = str_replace($popup . '();', '', $submenuitem);
+                $submenuitems[] = str_replace($popup.'();', '', $submenuitem);
             }
         } else {
             return;
@@ -370,14 +370,14 @@ 
         // module icon
 
         if (preg_match('#\<img .*/\>#U', $xoops_admin_menu_ft[$mid], $regs)) {
-            $icon_img = str_replace("alt=''", 'alt="' . $module->getVar('name') . '"', $regs[0]);
+            $icon_img = str_replace("alt=''", 'alt="'.$module->getVar('name').'"', $regs[0]);
         } else {
             $icon_img = '';
         }
 
         // version number
 
-        $icon_img .= '<span class="version" style="">' . sprintf('%.2f', $module->getVar('version') / 100.0) . '</span>';
+        $icon_img .= '<span class="version" style="">'.sprintf('%.2f', $module->getVar('version') / 100.0).'</span>';
 
         $newline = preg_replace('/ onmouseover.*$/', '', $xoops_admin_menu_ft[$mid]);
 
@@ -403,10 +403,10 @@ 
                     . '" style="display:none;"><ul>';
 
         foreach ($submenuitems as $submenuitem) {
-            $newline .= '<li>' . $submenuitem . '</li>';
+            $newline .= '<li>'.$submenuitem.'</li>';
         }
 
-        $newline .= '</ul>' . $icon_img . '</div>';
+        $newline .= '</ul>'.$icon_img.'</div>';
 
         $xoops_admin_menu_ft[$mid] = $newline;
     }
@@ -451,7 +451,7 @@ 
     echo "<?php\n// modified by altsys\nif( ! defined('XOOPS_ROOT_PATH') ) exit ;\n";
 
     foreach ($xoops_admin_vars as $key => $val) {
-        echo '$' . $key . " = \n";
+        echo '$'.$key." = \n";
 
         @var_export($val);
 

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

Spacing +7 added lines, -7 removed lines

@@ -14,27 +14,27 @@
 foreach ($tplsadmin_autoupdate_mydirnames as $tplsadmin_mydirname) {
     $tplsadmin_mydirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $tplsadmin_mydirname);
 
-    require XOOPS_ROOT_PATH . '/modules/' . $tplsadmin_mydirname . '/mytrustdirname.php';
+    require XOOPS_ROOT_PATH.'/modules/'.$tplsadmin_mydirname.'/mytrustdirname.php';
 
     $altsys_mid_path = 'altsys' == $mytrustdirname ? '/libs/' : '/modules/';
 
-    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH . $altsys_mid_path . $mytrustdirname . '/templates';
+    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH.$altsys_mid_path.$mytrustdirname.'/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)) {
                 $mtime = (int)(@filemtime($file_path));
 
-                $tpl_file = $tplsadmin_mydirname . '_' . $file;
+                $tpl_file = $tplsadmin_mydirname.'_'.$file;
 
-                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($tpl_file) . "' AND tpl_lastmodified >= $mtime"));
+                list($count) = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($tpl_file)."' AND tpl_lastmodified >= $mtime"));
 
                 if ($count <= 0) {
-                    include_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                    include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                     tplsadmin_import_data($xoopsConfig['template_set'], $tpl_file, implode('', file($file_path)), $mtime);
                 }

xoops_trust_path/libs/altsys/include/tpls_functions.php

Spacing +26 added lines, -26 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once XOOPS_ROOT_PATH . '/class/template.php';
-include_once __DIR__ . '/altsys_functions.php';
+include_once XOOPS_ROOT_PATH.'/class/template.php';
+include_once __DIR__.'/altsys_functions.php';
 
 /**
  * @param     $tplset
@@ -16,7 +16,7 @@ 
 
     // check the file is valid template
 
-    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'"));
+    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'"));
 
     if (!$count) {
         return false;
@@ -25,12 +25,12 @@ 
     // check the template exists in the tplset
 
     if ('default' != $tplset) {
-        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'"));
+        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'"));
 
         if ($count <= 0) {
             // copy from 'default' to the tplset
 
-            $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'");
+            $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'");
 
             while (false !== ($row = $db->fetchArray($result))) {
                 $db->queryF('INSERT INTO '
@@ -51,19 +51,19 @@ 
 
                 $tpl_id = $db->getInsertId();
 
-                $db->queryF('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source=''");
+                $db->queryF('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source=''");
             }
         }
     }
 
     // UPDATE just tpl_lastmodified and tpl_source
 
-    $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'");
+    $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'");
 
     while (list($tpl_id) = $db->fetchRow($drs)) {
-        $db->queryF('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'");
+        $db->queryF('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'");
 
-        $db->queryF('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'");
+        $db->queryF('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
 
         altsys_template_touch($tpl_id);
     }
@@ -112,22 +112,22 @@ 
     while (false !== ($row = $db->fetchArray($result))) {
         $tpl_source = array_pop($row);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'");
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
         if (!$db->getRowsNum($drs)) {
             // INSERT mode
 
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . ' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
+            $sql = 'INSERT INTO '.$db->prefix('tplfile').' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
 
             foreach ($row as $colval) {
-                $sql .= "'" . addslashes($colval) . "',";
+                $sql .= "'".addslashes($colval)."',";
             }
 
-            $db->query(mb_substr($sql, 0, -1) . ')');
+            $db->query(mb_substr($sql, 0, -1).')');
 
             $tpl_id = $db->getInsertId();
 
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'");
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
 
             altsys_template_touch($tpl_id);
         } else {
@@ -148,7 +148,7 @@ 
                            . addslashes($row['tpl_type'])
                            . "' WHERE tpl_id='$tpl_id'");
 
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
 
                 altsys_template_touch($tpl_id);
             }
@@ -166,7 +166,7 @@ 
 
     // get tplsource
 
-    $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . "  WHERE tpl_tplset='default' AND ($whr_append)");
+    $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')."  WHERE tpl_tplset='default' AND ($whr_append)");
 
     while (false !== ($row = $db->fetchArray($result))) {
         $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']);
@@ -175,7 +175,7 @@ 
 
         $lastmodified = filemtime($basefilepath);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'");
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
         if (!$db->getRowsNum($drs)) {
             // INSERT mode
@@ -202,16 +202,16 @@ 
 
             $tpl_id = $db->getInsertId();
 
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'");
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
 
             altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
 
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."' WHERE tpl_id='$tpl_id'");
 
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
 
                 altsys_template_touch($tpl_id);
             }
@@ -229,7 +229,7 @@ 
 {
     // module instance
 
-    $path = $basefilepath = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates/' . ('block' == $type ? 'blocks/' : '') . $tpl_file;
+    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.('block' == $type ? 'blocks/' : '').$tpl_file;
 
     if (is_callable('Legacy_Utils::getTrustDirnameByDirname')) {
         $mytrustdirname = Legacy_Utils::getTrustDirnameByDirname($dirname);
@@ -240,19 +240,19 @@ 
     if (defined('ALTSYS_TPLSADMIN_BASEPATH')) {
         // Special hook
 
-        $path = ALTSYS_TPLSADMIN_BASEPATH . '/' . mb_substr($tpl_file, mb_strlen($dirname) + 1);
-    } elseif ($mytrustdirname || @include XOOPS_ROOT_PATH . '/modules/' . $dirname . '/mytrustdirname.php') {
+        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.mb_substr($tpl_file, mb_strlen($dirname) + 1);
+    } elseif ($mytrustdirname || @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/mytrustdirname.php') {
         // D3 module base
 
         if (!empty($mytrustdirname)) {
             $mid_path = 'altsys' == $mytrustdirname ? '/libs/' : '/modules/';
 
-            $path = XOOPS_TRUST_PATH . $mid_path . $mytrustdirname . '/templates/' . ('block' == $type ? 'blocks/' : '') . mb_substr($tpl_file, mb_strlen($dirname) + 1);
+            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.('block' == $type ? 'blocks/' : '').mb_substr($tpl_file, mb_strlen($dirname) + 1);
 
             //new for xcck etc.other trust_module
 
             if (!file_exists($path)) {
-                $path = XOOPS_TRUST_PATH . $mid_path . $mytrustdirname . '/templates/' . ('block' == $type ? 'blocks/' : '') . $tpl_file;
+                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.('block' == $type ? 'blocks/' : '').$tpl_file;
 
                 if (!file_exists($path)) {
                     $path = $basefilepath;
@@ -272,7 +272,7 @@ 
 function tplsadmin_die($msg, $target_dirname = '', $wait = 2)
 {
     if ('post' === mb_strtolower($_SERVER['REQUEST_METHOD'])) {
-        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname=' . $target_dirname, $wait, $msg);
+        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg);
 
         exit;
     }

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
     public function __construct($params = [])
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
 
             if (isset($this->$v)) {
                 $this->$v = $value;
@@ -141,7 +141,7 @@ 
             $output .= $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     /**
@@ -174,7 +174,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     /**
@@ -206,14 +206,14 @@ 
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
 
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     /**
@@ -223,7 +223,7 @@ 
 
     public function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     /**
@@ -243,7 +243,7 @@ 
 
     public function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     /**
@@ -284,6 +284,6 @@ 
 
     public function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 }

xoops_trust_path/libs/altsys/include/admin_in_theme_functions.php

Spacing +15 added lines, -15 removed lines

@@ -46,7 +46,7 @@ 
         return $s;
     }
 
-    list($tmp_s, $tmp_after) = explode("<td width='1%' background='" . XOOPS_URL . "/modules/system/images/bg_content.gif'>", $tmp_s);
+    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s);
 
     if (empty($tmp_after)) {
         define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
@@ -54,7 +54,7 @@ 
         return $s;
     }
 
-    $xoops_admin_contents = $former_outputs . mb_substr(strrev(mb_strstr(strrev($tmp_s), strrev('</div>'))), 0, -6);
+    $xoops_admin_contents = $former_outputs.mb_substr(strrev(mb_strstr(strrev($tmp_s), strrev('</div>'))), 0, -6);
 
     return '';
 }
@@ -88,10 +88,10 @@ 
 
     // language files
 
-    if (is_file(dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/admin_in_theme.php')) {
-        include_once dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/admin_in_theme.php';
+    if (is_file(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php')) {
+        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php';
     } else {
-        include_once dirname(__DIR__) . '/language/english/admin_in_theme.php';
+        include_once dirname(__DIR__).'/language/english/admin_in_theme.php';
     }
 
     // set the theme
@@ -104,15 +104,15 @@ 
 
     error_reporting($original_error_level & ~E_NOTICE);
 
-    if (is_file(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/' . $xoopsConfig['language'] . '.php')) {
-        include_once XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/' . $xoopsConfig['language'] . '.php';
-    } elseif (is_file(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/english.php')) {
-        include_once XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/language/english.php';
+    if (is_file(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php')) {
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php';
+    } elseif (is_file(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php')) {
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php';
     }
 
     error_reporting($original_error_level);
 
-    include __DIR__ . '/admin_in_theme_header.inc.php';
+    include __DIR__.'/admin_in_theme_header.inc.php';
 
     /*  // include adminmenu
         include XOOPS_CACHE_PATH.'/adminmenu.php' ;
@@ -152,10 +152,10 @@ 
     $xoops_module_header = '';
 
     if (ALTSYS_CORE_TYPE_XCL21 == altsys_get_core_type()) {
-        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/legacyRender/admin/css.php?file=style.css" />' . "\n";
+        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n";
 
         if (is_object(@$xoopsModule)) {
-            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/legacyRender/admin/css.php?file=module.css&amp;dirname=' . $xoopsModule->getVar('dirname') . '" />' . "\n";
+            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n";
         }
     }
 
@@ -163,13 +163,13 @@ 
 
     $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),
                           'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
                           'xoops_showlblock' => 1,
                           //        'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript" src="'.XOOPS_URL.'/include/layersmenu.js"></script><script type="text/javascript"><!--'."\n".$xoops_admin_menu_js ,
-                          'xoops_js' => '//--></script><script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script><script type="text/javascript"><!--' . "\n",
+                          'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript"><!--'."\n",
                           'xoops_runs_admin_side' => 1,
                           'xoops_breadcrumbs' => $xoops_breadcrumbs,
                           'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
@@ -179,7 +179,7 @@ 
 
     // rendering
 
-    $xoopsTpl->display($xoopsConfig['theme_set'] . '/theme.html');
+    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html');
 
     // for XOOPS 2.0.14/15/16 from xoops.org