mambax7 / altsys

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/adminmenu_functions.php

Indentation +29 added lines, -29 removed lines

@@ -106,14 +106,14 @@ 
     // write back
 
     altsys_adminmenu_save_x20([
-                                  'xoops_admin_menu_js' => $xoops_admin_menu_js,
-                                  'xoops_admin_menu_ml' => $xoops_admin_menu_ml,
-                                  'xoops_admin_menu_sd' => $xoops_admin_menu_sd,
-                                  'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
-                                  'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
-                                  'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked),
-                                  'altsys_adminmenu_dv_updated' => true,
-                              ]);
+                                    'xoops_admin_menu_js' => $xoops_admin_menu_js,
+                                    'xoops_admin_menu_ml' => $xoops_admin_menu_ml,
+                                    'xoops_admin_menu_sd' => $xoops_admin_menu_sd,
+                                    'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
+                                    'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
+                                    'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked),
+                                    'altsys_adminmenu_dv_updated' => true,
+                                ]);
 }
 
 //
@@ -223,13 +223,13 @@ 
     // write back
 
     altsys_adminmenu_save_x20([
-                                  'xoops_admin_menu_js' => $xoops_admin_menu_js,
-                                  'xoops_admin_menu_ml' => $xoops_admin_menu_ml,
-                                  'xoops_admin_menu_sd' => $xoops_admin_menu_sd,
-                                  'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
-                                  'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
-                                  'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL,
-                              ]);
+                                    'xoops_admin_menu_js' => $xoops_admin_menu_js,
+                                    'xoops_admin_menu_ml' => $xoops_admin_menu_ml,
+                                    'xoops_admin_menu_sd' => $xoops_admin_menu_sd,
+                                    'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
+                                    'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
+                                    'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL,
+                                ]);
 }
 
 function altsys_adminmenu_hack_ft_noimg_x20()
@@ -291,13 +291,13 @@ 
     // write back
 
     altsys_adminmenu_save_x20([
-                                  'xoops_admin_menu_js' => $xoops_admin_menu_js,
-                                  'xoops_admin_menu_ml' => $xoops_admin_menu_ml,
-                                  'xoops_admin_menu_sd' => $xoops_admin_menu_sd,
-                                  'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
-                                  'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
-                                  'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG,
-                              ]);
+                                    'xoops_admin_menu_js' => $xoops_admin_menu_js,
+                                    'xoops_admin_menu_ml' => $xoops_admin_menu_ml,
+                                    'xoops_admin_menu_sd' => $xoops_admin_menu_sd,
+                                    'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
+                                    'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
+                                    'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG,
+                                ]);
 }
 
 function altsys_adminmenu_hack_ft_xcsty_x20()
@@ -426,13 +426,13 @@ 
     // write back
 
     altsys_adminmenu_save_x20([
-                                  'xoops_admin_menu_js' => $xoops_admin_menu_js,
-                                  'xoops_admin_menu_ml' => [],
-                                  'xoops_admin_menu_sd' => [],
-                                  'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
-                                  'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
-                                  'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY,
-                              ]);
+                                    'xoops_admin_menu_js' => $xoops_admin_menu_js,
+                                    'xoops_admin_menu_ml' => [],
+                                    'xoops_admin_menu_sd' => [],
+                                    'xoops_admin_menu_ft' => $xoops_admin_menu_ft,
+                                    'xoops_admin_menu_dv' => $xoops_admin_menu_dv,
+                                    'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY,
+                                ]);
 }
 
 //

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

Indentation +36 added lines, -36 removed lines

@@ -100,14 +100,14 @@ 
     // get tplfile and tplsource
 
     $result = $db->query("SELECT tpl_refid,tpl_module,'"
-                         . addslashes($tplset_to)
-                         . "',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM "
-                         . $db->prefix('tplfile')
-                         . ' NATURAL LEFT JOIN '
-                         . $db->prefix('tplsource')
-                         . " WHERE tpl_tplset='"
-                         . addslashes($tplset_from)
-                         . "' AND ($whr_append)");
+                            . addslashes($tplset_to)
+                            . "',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM "
+                            . $db->prefix('tplfile')
+                            . ' NATURAL LEFT JOIN '
+                            . $db->prefix('tplsource')
+                            . " WHERE tpl_tplset='"
+                            . addslashes($tplset_from)
+                            . "' AND ($whr_append)");
 
     while (false !== ($row = $db->fetchArray($result))) {
         $tpl_source = array_pop($row);
@@ -135,18 +135,18 @@ 
                 // UPDATE mode
 
                 $db->query('UPDATE '
-                           . $db->prefix('tplfile')
-                           . " SET tpl_refid='"
-                           . addslashes($row['tpl_refid'])
-                           . "',tpl_desc='"
-                           . addslashes($row['tpl_desc'])
-                           . "',tpl_lastmodified='"
-                           . addslashes($row['tpl_lastmodified'])
-                           . "',tpl_lastimported='"
-                           . addslashes($row['tpl_lastimported'])
-                           . "',tpl_type='"
-                           . addslashes($row['tpl_type'])
-                           . "' WHERE tpl_id='$tpl_id'");
+                            . $db->prefix('tplfile')
+                            . " SET tpl_refid='"
+                            . addslashes($row['tpl_refid'])
+                            . "',tpl_desc='"
+                            . addslashes($row['tpl_desc'])
+                            . "',tpl_lastmodified='"
+                            . addslashes($row['tpl_lastmodified'])
+                            . "',tpl_lastimported='"
+                            . addslashes($row['tpl_lastimported'])
+                            . "',tpl_type='"
+                            . 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'");
 
@@ -181,22 +181,22 @@ 
             // INSERT mode
 
             $sql = 'INSERT INTO '
-                   . $db->prefix('tplfile')
-                   . " SET tpl_refid='"
-                   . addslashes($row['tpl_refid'])
-                   . "',tpl_desc='"
-                   . addslashes($row['tpl_desc'])
-                   . "',tpl_lastmodified='"
-                   . addslashes($lastmodified)
-                   . "',tpl_type='"
-                   . addslashes($row['tpl_type'])
-                   . "',tpl_tplset='"
-                   . addslashes($tplset_to)
-                   . "',tpl_file='"
-                   . addslashes($row['tpl_file'])
-                   . "',tpl_module='"
-                   . addslashes($row['tpl_module'])
-                   . "'";
+                    . $db->prefix('tplfile')
+                    . " SET tpl_refid='"
+                    . addslashes($row['tpl_refid'])
+                    . "',tpl_desc='"
+                    . addslashes($row['tpl_desc'])
+                    . "',tpl_lastmodified='"
+                    . addslashes($lastmodified)
+                    . "',tpl_type='"
+                    . addslashes($row['tpl_type'])
+                    . "',tpl_tplset='"
+                    . addslashes($tplset_to)
+                    . "',tpl_file='"
+                    . addslashes($row['tpl_file'])
+                    . "',tpl_module='"
+                    . addslashes($row['tpl_module'])
+                    . "'";
 
             $db->query($sql);
 

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/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),
-                      'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
-                      'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
-                  ]);
+                        '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),
+                        'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
+                        'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
+                    ]);
 // Meta tags
 $configHandler = xoops_getHandler('config');
 $criteria = new CriteriaCompo(new Criteria('conf_modid', 0));

Spacing +20 added lines, -20 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';
-include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+require_once dirname(__DIR__).'/class/AltsysBreadcrumbs.class.php';
+include_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),
                       'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES),
@@ -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)];
             } 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,7 +141,7 @@ 
 
 // 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 = [];
@@ -152,7 +152,7 @@ 
 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->is_cached('db:' . $btpl, 'blk_' . $block_arr[$i]->getVar('bid'))) {
+        if (empty($bcachetime) || !$xoopsTpl->is_cached('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->assign_by_ref('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->clear_assign('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->is_cached('db:system_dummy.html', 'blk_' . $bid)) {
+        if (empty($bcachetime) || !$xoopsTpl->is_cached('db:system_dummy.html', 'blk_'.$bid)) {
             $xoopsLogger->addBlock($block_arr[$i]->getVar('name'));
 
             $bresult = $block_arr[$i]->buildBlock();
@@ -223,13 +223,13 @@ 
 
             $xoopsTpl->assign_by_ref('dummy_content', $bresult['content']);
 
-            $bcontent = $xoopsTpl->fetch('db:system_dummy.html', 'blk_' . $bid);
+            $bcontent = $xoopsTpl->fetch('db:system_dummy.html', 'blk_'.$bid);
 
             $xoopsTpl->clear_assign('block');
         } else {
             $xoopsLogger->addBlock($block_arr[$i]->getVar('name'), true, $bcachetime);
 
-            $bcontent = $xoopsTpl->fetch('db:system_dummy.html', 'blk_' . $bid);
+            $bcontent = $xoopsTpl->fetch('db:system_dummy.html', '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/admin_in_theme_functions.php

Indentation +14 added lines, -14 removed lines

@@ -162,20 +162,20 @@
     // assignment
 
     $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),
-                          '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_runs_admin_side' => 1,
-                          'xoops_breadcrumbs' => $xoops_breadcrumbs,
-                          'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
-                          'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' ,
-                          'xoops_module_header' => $xoops_module_header,
-                      ]);
+                            '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),
+                            '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_runs_admin_side' => 1,
+                            'xoops_breadcrumbs' => $xoops_breadcrumbs,
+                            'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
+                            'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' ,
+                            'xoops_module_header' => $xoops_module_header,
+                        ]);
 
     // rendering
 

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
 

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

Spacing +5 added lines, -5 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) && '.html' == mb_substr($file, -5)) {
             $mtime = (int)(@filemtime($file_path));
 
-            list($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"));
+            list($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) {
-                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'], $file, implode('', file($file_path)), $mtime);
             }

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

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
     if (preg_match('#(^/admin.php|^/modules/system/|^/modules/[a-zA-Z0-9_.-]+/admin/)#', $xoops_subpath)) {
         // The request looks like admin
 
-        require_once __DIR__ . '/altsys_functions.php';
+        require_once __DIR__.'/altsys_functions.php';
 
-        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH . '/' . $GLOBALS['altsysModuleConfig']['admin_in_theme'] . '/theme.html')) {
+        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
             // configs OK
 
-            require_once __DIR__ . '/admin_in_theme_functions.php';
+            require_once __DIR__.'/admin_in_theme_functions.php';
 
             // for security with register_globals=1
 

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_unified.php

Spacing +3 added lines, -3 removed lines

@@ -34,11 +34,11 @@ 
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if (1 != $xlen) {
-            $xbeg .= ',' . $xlen;
+            $xbeg .= ','.$xlen;
         }
 
         if (1 != $ylen) {
-            $ybeg .= ',' . $ylen;
+            $ybeg .= ','.$ylen;
         }
 
         return "@@ -$xbeg +$ybeg @@";
@@ -72,6 +72,6 @@ 
 
     public function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . $this->_added($final);
+        return $this->_deleted($orig).$this->_added($final);
     }
 }