mambax7 / altsys

xoops_trust_path/libs/altsys/put_templates.php

Spacing +5 added lines, -5 removed lines

@@ -5,9 +5,9 @@ 
 //                        GIJOE <http://www.peak.ne.jp/>                     //
 // ------------------------------------------------------------------------- //
 
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__ . '/include/altsys_functions.php';
-include_once __DIR__ . '/include/tpls_functions.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
 
 // this page can be called only from altsys
 if ('altsys' != $xoopsModule->getVar('dirname')) {
@@ -42,7 +42,7 @@ 
 if ('.zip' == mb_strtolower(mb_substr($orig_filename4check, -4))) {
     // zip
 
-    require_once __DIR__ . '/include/Archive_Zip.php';
+    require_once __DIR__.'/include/Archive_Zip.php';
 
     $reader = new Archive_Zip($_FILES['tplset_archive']['tmp_name']);
 
@@ -56,7 +56,7 @@ 
 } elseif ('.tgz' == mb_substr($orig_filename4check, -4) || '.tar.gz' == mb_substr($orig_filename4check, -7)) {
     // tar.gz
 
-    require_once XOOPS_ROOT_PATH . '/class/class.tar.php';
+    require_once XOOPS_ROOT_PATH.'/class/class.tar.php';
 
     $tar = new tar();
 

xoops_trust_path/libs/altsys/mytplsform.php

Indentation +10 added lines, -10 removed lines

@@ -184,16 +184,16 @@
     }
 
     $sql = 'INSERT INTO '
-           . $db->prefix('tplfile')
-           . " SET tpl_file='"
-           . addslashes(($_POST['tpl_file']))
-           . "',tpl_refid=0,tpl_module='"
-           . addslashes($tpl['tpl_module'])
-           . "',tpl_tplset='"
-           . addslashes($tpl['tpl_tplset'])
-           . "',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='"
-           . addslashes($tpl['tpl_type'])
-           . "'";
+            . $db->prefix('tplfile')
+            . " SET tpl_file='"
+            . addslashes(($_POST['tpl_file']))
+            . "',tpl_refid=0,tpl_module='"
+            . addslashes($tpl['tpl_module'])
+            . "',tpl_tplset='"
+            . addslashes($tpl['tpl_tplset'])
+            . "',tpl_lastmodified=UNIX_TIMESTAMP(),tpl_type='"
+            . addslashes($tpl['tpl_type'])
+            . "'";
 
     if (!$db->query($sql)) {
         die('SQL Error' . __LINE__);

Spacing +46 added lines, -46 removed lines

@@ -5,13 +5,13 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__ . '/class/AltsysBreadcrumbs.class.php';
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__ . '/include/altsys_functions.php';
-include_once __DIR__ . '/include/tpls_functions.php';
-include_once __DIR__ . '/include/Text_Diff.php';
-include_once __DIR__ . '/include/Text_Diff_Renderer.php';
-include_once __DIR__ . '/include/Text_Diff_Renderer_unified.php';
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
+include_once __DIR__.'/include/Text_Diff.php';
+include_once __DIR__.'/include/Text_Diff_Renderer.php';
+include_once __DIR__.'/include/Text_Diff_Renderer_unified.php';
 
 // only groups have 'module_admin' of 'altsys' can do that.
 $module_handler = xoops_getHandler('module');
@@ -33,7 +33,7 @@ 
 
 // check $xoopsModule
 if (!is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // check access right (needs system_admin of tplset)
@@ -57,7 +57,7 @@ 
         'tpl_refid' => 0,
         'tpl_module' => '_custom',
         'tpl_tplset' => $tpl_tplset,
-        'tpl_file' => '_custom_' . mb_substr(date('YmdHis'), 2, -2) . '.html',
+        'tpl_file' => '_custom_'.mb_substr(date('YmdHis'), 2, -2).'.html',
         'tpl_desc' => '',
         'tpl_lastmodified' => 0,
         'tpl_lastimported' => 0,
@@ -69,9 +69,9 @@ 
 
     $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
 
-    $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
 
-    $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=_custom', _MYTPLSADMIN_CUSTOMTEMPLATE);
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=_custom', _MYTPLSADMIN_CUSTOMTEMPLATE);
 
     $breadcrumbsObj->appendPath('', '_MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE');
 
@@ -89,7 +89,7 @@ 
 
     // get information from tplfile table
 
-    $sql = 'SELECT * FROM ' . $db->prefix('tplfile') . ' f NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " s WHERE f.tpl_file='$tpl_file4sql' ORDER BY f.tpl_tplset='$tpl_tplset4sql' DESC,f.tpl_tplset='default' DESC";
+    $sql = 'SELECT * FROM '.$db->prefix('tplfile').' f NATURAL LEFT JOIN '.$db->prefix('tplsource')." s WHERE f.tpl_file='$tpl_file4sql' ORDER BY f.tpl_tplset='$tpl_tplset4sql' DESC,f.tpl_tplset='default' DESC";
 
     $tpl = $db->fetchArray($db->query($sql));
 
@@ -114,19 +114,19 @@ 
     if ('altsys' != $mydirname && is_object($target_module)) {
         // mytplsform in each modules
 
-        $mod_url = XOOPS_URL . '/modules/' . $target_module->getVar('dirname');
+        $mod_url = XOOPS_URL.'/modules/'.$target_module->getVar('dirname');
 
         $modinfo = $target_module->getInfo();
 
-        $breadcrumbsObj->appendPath($mod_url . '/' . @$modinfo['adminindex'], $target_mname);
+        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $target_mname);
 
-        $breadcrumbsObj->appendPath($mod_url . '/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MD_A_MYTPLSFORM_TPLSADMIN);
+        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MD_A_MYTPLSFORM_TPLSADMIN);
     } else {
         // mytplsform in altsys
 
-        $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', '_MI_ALTSYS_MENU_MYTPLSADMIN');
 
-        $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname=' . htmlspecialchars($tpl['tpl_module'], ENT_QUOTES | ENT_HTML5), $target_mname);
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin&amp;dirname='.htmlspecialchars($tpl['tpl_module'], ENT_QUOTES | ENT_HTML5), $target_mname);
     }
 
     $breadcrumbsObj->appendPath('', _MD_A_MYTPLSFORM_EDIT);
@@ -148,19 +148,19 @@ 
     // Ticket Check
 
     if (!$xoopsGTicket->check(true, 'altsys_tplsform')) {
-        redirect_header(XOOPS_URL . '/', 3, $xoopsGTicket->getErrors());
+        redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $result = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_file='$tpl_file4sql' AND tpl_tplset='" . addslashes($tpl['tpl_tplset']) . "'");
+    $result = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_file='$tpl_file4sql' AND tpl_tplset='".addslashes($tpl['tpl_tplset'])."'");
 
     while (list($tpl_id) = $db->fetchRow($result)) {
-        $sql = 'UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes(($_POST['tpl_source'])) . "' WHERE tpl_id=$tpl_id";
+        $sql = 'UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes(($_POST['tpl_source']))."' WHERE tpl_id=$tpl_id";
 
         if (!$db->query($sql)) {
             die('SQL Error');
         }
 
-        $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified=UNIX_TIMESTAMP() WHERE tpl_id=$tpl_id");
+        $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified=UNIX_TIMESTAMP() WHERE tpl_id=$tpl_id");
 
         altsys_template_touch($tpl_id);
     }
@@ -168,9 +168,9 @@ 
     // continue or end ?
 
     if (!empty($_POST['do_modifycont'])) {
-        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsform&tpl_file=' . $tpl_file . '&tpl_tplset=' . $tpl_tplset . '&dirname=' . $tpl['tpl_module'] . '#altsys_tplsform_top', 1, _MD_A_MYTPLSFORM_UPDATED);
+        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsform&tpl_file='.$tpl_file.'&tpl_tplset='.$tpl_tplset.'&dirname='.$tpl['tpl_module'].'#altsys_tplsform_top', 1, _MD_A_MYTPLSFORM_UPDATED);
     } else {
-        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname=' . $tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_UPDATED);
+        redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_UPDATED);
     }
 
     exit;
@@ -180,7 +180,7 @@ 
     // Ticket Check
 
     if (!$xoopsGTicket->check(true, 'altsys_tplsform')) {
-        redirect_header(XOOPS_URL . '/', 3, $xoopsGTicket->getErrors());
+        redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     $sql = 'INSERT INTO '
@@ -196,22 +196,22 @@ 
            . "'";
 
     if (!$db->query($sql)) {
-        die('SQL Error' . __LINE__);
+        die('SQL Error'.__LINE__);
     }
 
     $tpl_id = (int)$db->getInsertId();
 
-    $sql = 'INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id=$tpl_id,tpl_source='" . addslashes(($_POST['tpl_source'])) . "'";
+    $sql = 'INSERT INTO '.$db->prefix('tplsource')." SET tpl_id=$tpl_id,tpl_source='".addslashes(($_POST['tpl_source']))."'";
 
     if (!$db->query($sql)) {
-        die('SQL Error' . __LINE__);
+        die('SQL Error'.__LINE__);
     }
 
     altsys_template_touch($tpl_id);
 
     // continue or end ?
 
-    redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname=' . $tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_CREATED);
+    redirect_header('index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$tpl['tpl_module'], 1, _MD_A_MYTPLSFORM_CREATED);
 
     exit;
 }
@@ -220,12 +220,12 @@ 
 //   FORM stage   //
 //****************//
 xoops_cp_header();
-$mymenu_fake_uri = 'index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname=' . $mydirname;
+$mymenu_fake_uri = 'index.php?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$mydirname;
 
 // mymenu
 altsys_include_mymenu();
 
-echo "<h3 style='text-align:" . _GLOBAL_LEFT . ";'>" . _MD_A_MYTPLSFORM_EDIT . ' : ' . htmlspecialchars($tpl['tpl_type'], ENT_QUOTES) . ' : ' . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . ' (' . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . ")</h3>\n";
+echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT.' : '.htmlspecialchars($tpl['tpl_type'], ENT_QUOTES).' : '.htmlspecialchars($tpl['tpl_file'], ENT_QUOTES).' ('.htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).")</h3>\n";
 
 // diff from file to selected DB template
 $basefilepath = tplsadmin_get_basefilepath($tpl['tpl_module'], $tpl['tpl_type'], $tpl['tpl_file']);
@@ -243,11 +243,11 @@ 
 
     foreach (explode("\n", $diff_str) as $line) {
         if (0x2d == ord($line)) {
-            $diff_from_file4disp .= "<span style='color:red;'>" . $line . "</span>\n";
+            $diff_from_file4disp .= "<span style='color:red;'>".$line."</span>\n";
         } elseif (0x2b == ord($line)) {
-            $diff_from_file4disp .= "<span style='color:blue;'>" . $line . "</span>\n";
+            $diff_from_file4disp .= "<span style='color:blue;'>".$line."</span>\n";
         } else {
-            $diff_from_file4disp .= $line . "\n";
+            $diff_from_file4disp .= $line."\n";
         }
     }
 
@@ -261,7 +261,7 @@ 
 
     error_reporting($original_error_level & ~E_NOTICE & ~E_WARNING);
 
-    list($default_source) = $db->fetchRow($db->query('SELECT tpl_source FROM ' . $db->prefix('tplfile') . ' NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl['tpl_file']) . "' AND tpl_module='" . addslashes($tpl['tpl_module']) . "'"));
+    list($default_source) = $db->fetchRow($db->query('SELECT tpl_source FROM '.$db->prefix('tplfile').' NATURAL LEFT JOIN '.$db->prefix('tplsource')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl['tpl_file'])."' AND tpl_module='".addslashes($tpl['tpl_module'])."'"));
 
     $diff = new Text_Diff(explode("\n", $default_source), explode("\n", $tpl['tpl_source']));
 
@@ -271,11 +271,11 @@ 
 
     foreach (explode("\n", $diff_str) as $line) {
         if (0x2d == ord($line)) {
-            $diff_from_default4disp .= "<span style='color:red;'>" . $line . "</span>\n";
+            $diff_from_default4disp .= "<span style='color:red;'>".$line."</span>\n";
         } elseif (0x2b == ord($line)) {
-            $diff_from_default4disp .= "<span style='color:blue;'>" . $line . "</span>\n";
+            $diff_from_default4disp .= "<span style='color:blue;'>".$line."</span>\n";
         } else {
-            $diff_from_default4disp .= $line . "\n";
+            $diff_from_default4disp .= $line."\n";
         }
     }
 
@@ -297,25 +297,25 @@ 
 
 echo "
 <a name='altsys_tplsform_top' id='altsys_tplsform_top'></a>
-<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=" . htmlspecialchars($tpl_file, ENT_QUOTES) . '&amp;tpl_tplset=' . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . $target_mname . "' method='post'>
-    " . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys_tplsform') . "
-    <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>" . htmlspecialchars($tpl['tpl_source'], ENT_QUOTES) . '</textarea>
+<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=" . htmlspecialchars($tpl_file, ENT_QUOTES).'&amp;tpl_tplset='.htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).'&amp;dirname='.$target_mname."' method='post'>
+    " . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys_tplsform')."
+    <textarea name='tpl_source' id='altsys_tpl_source' wrap='off' style='width:600px;height:400px;'>" . htmlspecialchars($tpl['tpl_source'], ENT_QUOTES).'</textarea>
     <br />
 ';
 if ('create' == $edit_mode) {
     // create form
 
     echo "
-    <label for='tpl_file'>" . _MD_A_MYTPLSFORM_LABEL_TPLFILE . "</label>
-    <input type='text' name='tpl_file' id='tpl_file' value='" . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . "' size='64' /><br />
-    <input type='submit' name='do_create' id='do_create' value='" . _MD_A_MYTPLSFORM_BTN_CREATE . "' />\n";
+    <label for='tpl_file'>" . _MD_A_MYTPLSFORM_LABEL_TPLFILE."</label>
+    <input type='text' name='tpl_file' id='tpl_file' value='" . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES)."' size='64' /><br />
+    <input type='submit' name='do_create' id='do_create' value='" . _MD_A_MYTPLSFORM_BTN_CREATE."' />\n";
 } else {
     // modify form
 
     echo "
-    <input type='submit' name='do_modifycont' id='do_modifycont' value='" . _MD_A_MYTPLSFORM_BTN_MODIFYCONT . "' />
-    <input type='submit' name='do_modify' id='do_modify' value='" . _MD_A_MYTPLSFORM_BTN_MODIFYEND . "' />
-    <input type='reset' name='reset' value='" . _MD_A_MYTPLSFORM_BTN_RESET . "' />
+    <input type='submit' name='do_modifycont' id='do_modifycont' value='" . _MD_A_MYTPLSFORM_BTN_MODIFYCONT."' />
+    <input type='submit' name='do_modify' id='do_modify' value='" . _MD_A_MYTPLSFORM_BTN_MODIFYEND."' />
+    <input type='reset' name='reset' value='" . _MD_A_MYTPLSFORM_BTN_RESET."' />
 </form>\n";
 }
 

xoops_trust_path/libs/altsys/get_templates.php

Spacing +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 
 error_reporting(0);
 
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__ . '/include/altsys_functions.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 // this page can be called only from altsys
 if ('altsys' != $xoopsModule->getVar('dirname')) {
@@ -19,13 +19,13 @@ 
 altsys_include_language_file('compilehookadmin');
 
 if (!empty($_POST['download_zip'])) {
-    require_once XOOPS_ROOT_PATH . '/class/zipdownloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/zipdownloader.php';
 
     $downloader = new XoopsZipDownloader();
 
     $do_download = true;
 } elseif (!empty($_POST['download_tgz'])) {
-    require_once XOOPS_ROOT_PATH . '/class/tardownloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/tardownloader.php';
 
     $downloader = new XoopsTarDownloader();
 
@@ -51,13 +51,13 @@ 
         break;
     }
 }
-$trs = $xoopsDB->query('SELECT DISTINCT tpl_file,tpl_source,tpl_lastmodified FROM ' . $xoopsDB->prefix('tplfile') . ' NATURAL LEFT JOIN ' . $xoopsDB->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset) . "' ORDER BY tpl_file");
+$trs = $xoopsDB->query('SELECT DISTINCT tpl_file,tpl_source,tpl_lastmodified FROM '.$xoopsDB->prefix('tplfile').' NATURAL LEFT JOIN '.$xoopsDB->prefix('tplsource')." WHERE tpl_tplset='".addslashes($tplset)."' ORDER BY tpl_file");
 if ($xoopsDB->getRowsNum($trs) <= 0) {
     die(_TPLSADMIN_ERR_INVALIDTPLSET);
 }
 
 while (list($tpl_file, $tpl_source, $tpl_lastmodified) = $xoopsDB->fetchRow($trs)) {
-    $downloader->addFileData($tpl_source, $tplset . '/' . $tpl_file, $tpl_lastmodified);
+    $downloader->addFileData($tpl_source, $tplset.'/'.$tpl_file, $tpl_lastmodified);
 }
 //bugfix by nao-pon ,echo is not necessary for downloader
-$downloader->download('template_' . $tplset, true);
+$downloader->download('template_'.$tplset, true);

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/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;
     }