mambax7 / altsys

xoops_trust_path/libs/altsys/mytplsform.php

Spacing +47 added lines, -47 removed lines

@@ -5,13 +5,13 @@ 
 //                       GIJOE <https://www.peak.ne.jp>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__ . '/class/AltsysBreadcrumbs.class.php';
-require_once __DIR__ . '/include/gtickets.php';
-require_once __DIR__ . '/include/altsys_functions.php';
-require_once __DIR__ . '/include/tpls_functions.php';
-require_once __DIR__ . '/include/Text_Diff.php';
-require_once __DIR__ . '/include/Text_Diff_Renderer.php';
-require_once __DIR__ . '/include/Text_Diff_Renderer_unified.php';
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/gtickets.php';
+require_once __DIR__.'/include/altsys_functions.php';
+require_once __DIR__.'/include/tpls_functions.php';
+require_once __DIR__.'/include/Text_Diff.php';
+require_once __DIR__.'/include/Text_Diff_Renderer.php';
+require_once __DIR__.'/include/Text_Diff_Renderer_unified.php';
 
 // only groups have 'module_admin' of 'altsys' can do that.
 $moduleHandler = 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 ([$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();
+    $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 | ENT_HTML5) . ' : ' . htmlspecialchars($tpl['tpl_file'], ENT_QUOTES | ENT_HTML5) . ' (' . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES | ENT_HTML5) . ")</h3>\n";
+echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MD_A_MYTPLSFORM_EDIT.' : '.htmlspecialchars($tpl['tpl_type'], ENT_QUOTES | ENT_HTML5).' : '.htmlspecialchars($tpl['tpl_file'], ENT_QUOTES | ENT_HTML5).' ('.htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES | ENT_HTML5).")</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);
 
-    [$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']) . "'"));
+    [$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 | ENT_HTML5) . '&amp;tpl_tplset=' . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES | ENT_HTML5) . '&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 | ENT_HTML5) . '</textarea>
+<form name='MainForm' id='altsys_tplsform' action='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=" . htmlspecialchars($tpl_file, ENT_QUOTES | ENT_HTML5).'&amp;tpl_tplset='.htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES | ENT_HTML5).'&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 | ENT_HTML5).'</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 | ENT_HTML5) . "' 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 | ENT_HTML5)."' 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/xoops_version.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/include/altsys_functions.php';
+require_once __DIR__.'/include/altsys_functions.php';
 
 // language file (modinfo.php)
 altsys_include_language_file('modinfo');
@@ -38,7 +38,7 @@ 
     'description' => '',
     'show_func'   => 'b_altsys_admin_menu_show',
     'edit_func'   => 'b_altsys_admin_menu_edit',
-    'options'     => (string) $mydirname,
+    'options'     => (string)$mydirname,
     'template'    => '', // use "module" template instead
 ];
 
@@ -112,5 +112,5 @@ 
 
 // keep block's options
 if (!defined('XOOPS_CUBE_LEGACY') && mb_substr(XOOPS_VERSION, 6, 3) < 2.1 && !empty($_POST['fct']) && !empty($_POST['op']) && 'modulesadmin' == $_POST['fct'] && 'update_ok' == $_POST['op'] && $_POST['dirname'] == $modversion['dirname']) {
-    require __DIR__ . '/include/x20_keepblockoptions.inc.php';
+    require __DIR__.'/include/x20_keepblockoptions.inc.php';
 }

xoops_trust_path/libs/altsys/get_templates.php

Spacing +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 
 error_reporting(0);
 
-require_once __DIR__ . '/include/gtickets.php';
-require_once __DIR__ . '/include/altsys_functions.php';
+require_once __DIR__.'/include/gtickets.php';
+require_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 ([$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/mymenu.php

Indentation +2 added lines, -2 removed lines

@@ -65,8 +65,8 @@
 require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
 $tpl = new D3Tpl();
 $tpl->assign([
-                 'adminmenu' => $adminmenu,
-             ]);
+                    'adminmenu' => $adminmenu,
+                ]);
 $tpl->display('db:altsys_inc_mymenu.tpl');
 //$tpl->display('db:inc_mymenu.tpl');
 

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 // language files (modinfo.php)
 altsys_include_language_file('modinfo');
 
-require __DIR__ . '/admin_menu.php';
+require __DIR__.'/admin_menu.php';
 
 $adminmenu = array_merge($adminmenu, $adminmenu4altsys);
 
@@ -57,12 +57,12 @@ 
 // link conversion from relative to absolute
 foreach (array_keys($adminmenu) as $i) {
     if (false === mb_stristr($adminmenu[$i]['link'], XOOPS_URL)) {
-        $adminmenu[$i]['link'] = XOOPS_URL . "/modules/$mydirname/" . $adminmenu[$i]['link'];
+        $adminmenu[$i]['link'] = XOOPS_URL."/modules/$mydirname/".$adminmenu[$i]['link'];
     }
 }
 
 // display
-require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
 $tpl = new D3Tpl();
 $tpl->assign([
                  'adminmenu' => $adminmenu,
@@ -72,6 +72,6 @@ 
 
 // submenu
 $page = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['page']);
-if (file_exists(__DIR__ . '/mymenusub/' . $page . '.php')) {
-    require __DIR__ . '/mymenusub/' . $page . '.php';
+if (file_exists(__DIR__.'/mymenusub/'.$page.'.php')) {
+    require __DIR__.'/mymenusub/'.$page.'.php';
 }

xoops_trust_path/libs/altsys/blocks/block_functions.php

Indentation +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
     $this_template = empty($options[1]) ? 'db:' . $mydirname . '_block_admin_menu.tpl' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-       exit('Invalid mydirname');
+        exit('Invalid mydirname');
     }
 
     if (!is_object(@$xoopsUser)) {
@@ -187,7 +187,7 @@ 
     $this_template = empty($options[1]) ? 'db:' . $mydirname . '_block_admin_menu.tpl' : trim((string) $options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', (string) $mydirname)) {
-       exit('Invalid mydirname');
+        exit('Invalid mydirname');
     }
 
     $form = "

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php declare(strict_types=1);
 
-require_once dirname(__DIR__) . '/include/altsys_functions.php';
+require_once dirname(__DIR__).'/include/altsys_functions.php';
 
 /**
  * @param $options
@@ -12,7 +12,7 @@ 
 
     $mydirname = empty($options[0]) ? 'altsys' : $options[0];
 
-    $this_template = empty($options[1]) ? 'db:' . $mydirname . '_block_admin_menu.tpl' : trim($options[1]);
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.tpl' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
        exit('Invalid mydirname');
@@ -56,17 +56,17 @@ 
 
     $admin_mids = $grouppermHandler->getItemIds('module_admin', $xoopsUser->getGroups());
 
-    $modules = $moduleHandler->getObjects(new \Criteria('mid', '(' . implode(',', $admin_mids) . ')', 'IN'), true);
+    $modules = $moduleHandler->getObjects(new \Criteria('mid', '('.implode(',', $admin_mids).')', 'IN'), true);
 
     $block = [
         'mydirname' => $mydirname,
-        'mod_url' => XOOPS_URL . '/modules/' . $mydirname,
-        'mod_imageurl' => XOOPS_URL . '/modules/' . $mydirname . '/' . $current_configs['images_dir'],
+        'mod_url' => XOOPS_URL.'/modules/'.$mydirname,
+        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'],
         'mod_config' => $current_configs,
     ];
 
     foreach ($modules as $mod) {
-        $mid = (int) $mod->getVar('mid');
+        $mid = (int)$mod->getVar('mid');
 
         $dirname = $mod->getVar('dirname');
 
@@ -80,7 +80,7 @@ 
 
         unset($adminmenu_use_altsys);
 
-        @require XOOPS_ROOT_PATH . '/modules/' . $dirname . '/' . @$modinfo['adminmenu'];
+        @require XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'];
 
         // from admin_menu.php etc.
 
@@ -95,7 +95,7 @@ 
 
             $submenus4assign[] = [
                 'title' => htmlspecialchars($sub['title']),
-                'url' => XOOPS_URL . '/modules/' . $dirname . '/' . htmlspecialchars($link, ENT_QUOTES | ENT_HTML5),
+                'url' => XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($link, ENT_QUOTES | ENT_HTML5),
             ];
         }
 
@@ -119,7 +119,7 @@ 
 
                 $submenus4assign[] = [
                     'title' => htmlspecialchars($sub['title']),
-                    'url' => 0 === strncmp((string) $sub['link'], 'http', 4) ? htmlspecialchars((string) $sub['link'], ENT_QUOTES | ENT_HTML5) : XOOPS_URL . '/modules/' . $dirname . '/' . htmlspecialchars((string) $sub['link'], ENT_QUOTES | ENT_HTML5),
+                    'url' => 0 === strncmp((string)$sub['link'], 'http', 4) ? htmlspecialchars((string)$sub['link'], ENT_QUOTES | ENT_HTML5) : XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars((string)$sub['link'], ENT_QUOTES | ENT_HTML5),
                 ];
             }
         } elseif (empty($adminmenu4altsys)) {
@@ -137,7 +137,7 @@ 
             if (defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['help'])) {
                 $submenus4assign[] = [
                     'title' => _HELP,
-                    'url' => XOOPS_URL . '/modules/legacy/admin/index.php?action=Help&amp;dirname=' . $dirname,
+                    'url' => XOOPS_URL.'/modules/legacy/admin/index.php?action=Help&amp;dirname='.$dirname,
                 ];
             }
         }
@@ -148,14 +148,14 @@ 
             'name' => $mod->getVar('name'),
             'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0),
             'version_in_file' => sprintf('%.2f', $modinfo['version']),
-            'description' => htmlspecialchars((string) @$modinfo['description'], ENT_QUOTES | ENT_HTML5),
-            'image' => htmlspecialchars((string) $modinfo['image'], ENT_QUOTES | ENT_HTML5),
+            'description' => htmlspecialchars((string)@$modinfo['description'], ENT_QUOTES | ENT_HTML5),
+            'image' => htmlspecialchars((string)$modinfo['image'], ENT_QUOTES | ENT_HTML5),
             'isactive' => $mod->getVar('isactive'),
             'hasmain' => $mod->getVar('hasmain'),
             'hasadmin' => $mod->getVar('hasadmin'),
             'hasconfig' => $mod->getVar('hasconfig'),
             'weight' => $mod->getVar('weight'),
-            'adminindex' => htmlspecialchars((string) @$modinfo['adminindex'], ENT_QUOTES | ENT_HTML5),
+            'adminindex' => htmlspecialchars((string)@$modinfo['adminindex'], ENT_QUOTES | ENT_HTML5),
             'adminindex_absolute' => @$modinfo['adminindex_absolute'],
             'submenu' => $submenus4assign,
             'selected' => $mid == $mid_selected ? true : false,
@@ -165,7 +165,7 @@ 
         $block['modules'][] = $module4assign;
     }
 
-    require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
 
     $tpl = new D3Tpl();
 
@@ -184,16 +184,16 @@ 
 {
     $mydirname = empty($options[0]) ? 'd3forum' : $options[0];
 
-    $this_template = empty($options[1]) ? 'db:' . $mydirname . '_block_admin_menu.tpl' : trim((string) $options[1]);
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.tpl' : trim((string)$options[1]);
 
-    if (preg_match('/[^0-9a-zA-Z_-]/', (string) $mydirname)) {
+    if (preg_match('/[^0-9a-zA-Z_-]/', (string)$mydirname)) {
        exit('Invalid mydirname');
     }
 
     $form = "
         <input type='hidden' name='options[0]' value='$mydirname'>
-        <label for='this_template'>" . _MB_ALTSYS_THISTEMPLATE . "</label>&nbsp;:
-        <input type='text' size='60' name='options[1]' id='this_template' value='" . htmlspecialchars($this_template, ENT_QUOTES | ENT_HTML5) . "'>
+        <label for='this_template'>"._MB_ALTSYS_THISTEMPLATE."</label>&nbsp;:
+        <input type='text' size='60' name='options[1]' id='this_template' value='" . htmlspecialchars($this_template, ENT_QUOTES | ENT_HTML5)."'>
         <br>
     \n";
 

xoops_trust_path/libs/altsys/class/MyBlocksAdminForXCL21.class.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php declare(strict_types=1);
 // $Id: MyBlocksAdminForXCL21.class.php ,ver 0.0.7.1 2011/01/27 16:10:00 domifara Exp $
 
-require_once __DIR__ . '/MyBlocksAdmin.class.php';
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 /**
  * Class MyBlocksAdminForXCL21
@@ -48,7 +48,7 @@ 
             $langman->read('admin.php', $this->target_dirname);
         }
 
-        $bid = (int) $block_data['bid'];
+        $bid = (int)$block_data['bid'];
 
         //HACK by domifara
 
@@ -70,6 +70,6 @@ 
      */
     public function checkFck()
     {
-        return (!altsysUtils::isInstalledXclHtmleditor() && file_exists(XOOPS_ROOT_PATH . '/common/fckeditor/fckeditor.js'));
+        return (!altsysUtils::isInstalledXclHtmleditor() && file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'));
     }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdmin.class.php

Indentation +28 added lines, -28 removed lines

@@ -288,11 +288,11 @@ 
         // get selected targets
 
         if (is_array(@$block_data['bmodule'])) {
-			// bmodule originated from request (preview etc.)
+            // bmodule originated from request (preview etc.)
 
             $selected_mids = $block_data['bmodule'];
         } else {
-			// originated from the table of `block_module_link`
+            // originated from the table of `block_module_link`
 
             $result = $this->db->query('SELECT module_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'");
 
@@ -549,12 +549,12 @@ 
             ];
 
             $blocks4assign[] = [
-                                   'name_raw' => $block_data['name'],
-                                   'title_raw' => $block_data['title'],
-                                   'cell_position' => $this->renderCell4BlockPosition($block_data),
-                                   'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
-                                   'cell_group_perm' => $this->renderCell4BlockReadGroupPerm($block_data),
-                               ] + $block_data;
+                                    'name_raw' => $block_data['name'],
+                                    'title_raw' => $block_data['title'],
+                                    'cell_position' => $this->renderCell4BlockPosition($block_data),
+                                    'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
+                                    'cell_group_perm' => $this->renderCell4BlockReadGroupPerm($block_data),
+                                ] + $block_data;
         }
 
         // display
@@ -564,14 +564,14 @@ 
         $tpl = new D3Tpl();
 
         $tpl->assign([
-                         'target_mid' => $this->target_mid,
-                         'target_dirname' => $this->target_dirname,
-                         'target_mname' => $this->target_mname,
-                         'language' => $this->lang,
-                         'cachetime_options' => $this->cachetime_options,
-                         'blocks' => $blocks4assign,
-                         'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin'),
-                     ]);
+                            'target_mid' => $this->target_mid,
+                            'target_dirname' => $this->target_dirname,
+                            'target_mname' => $this->target_mname,
+                            'language' => $this->lang,
+                            'cachetime_options' => $this->cachetime_options,
+                            'blocks' => $blocks4assign,
+                            'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin'),
+                        ]);
 
         $tpl->display('db:altsys_main_myblocksadmin_list.tpl');
     }
@@ -1250,18 +1250,18 @@ 
         }
 
         $tpl->assign([
-                         'target_dirname' => $this->target_dirname,
-                         'target_mname' => $this->target_mname,
-                         'language' => $this->lang,
-                         'cachetime_options' => $this->cachetime_options,
-                         'ctype_options' => $this->ctype_options,
-                         'block' => $block4assign,
-                         'op' => $next_op,
-                         'form_title' => $form_title,
-                         'submit_button' => $button_value,
-                         'common_fck_installed' => $this->checkFck(),
-                         'gticket_hidden' => $GLOBALS['xoopsSecurity']->getTokenHTML('myblocksadmin'),
-                     ]);
+                            'target_dirname' => $this->target_dirname,
+                            'target_mname' => $this->target_mname,
+                            'language' => $this->lang,
+                            'cachetime_options' => $this->cachetime_options,
+                            'ctype_options' => $this->ctype_options,
+                            'block' => $block4assign,
+                            'op' => $next_op,
+                            'form_title' => $form_title,
+                            'submit_button' => $button_value,
+                            'common_fck_installed' => $this->checkFck(),
+                            'gticket_hidden' => $GLOBALS['xoopsSecurity']->getTokenHTML('myblocksadmin'),
+                        ]);
 
         if (defined('XOOPS_CUBE_LEGACY')) {
             $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.tpl');

Spacing +77 added lines, -77 removed lines

@@ -126,7 +126,7 @@ 
 
                 $this->target_mid = $target_module->getVar('mid');
 
-                $this->target_mname = $target_module->getVar('name') . ' ' . sprintf('(%2.2f)', (int)$target_module->getVar('version') / 100.0);
+                $this->target_mname = $target_module->getVar('name').' '.sprintf('(%2.2f)', (int)$target_module->getVar('version') / 100.0);
 
                 $this->target_dirname = $target_module->getVar('dirname');
 
@@ -136,9 +136,9 @@ 
 
                 $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
 
-                $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+                $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
 
-                $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=' . $this->target_dirname, $this->target_mname);
+                $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname);
             } else {
                 // custom blocks
 
@@ -152,28 +152,28 @@ 
 
                 $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
 
-                $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+                $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
 
-                $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=' . $this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS');
+                $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS');
             }
         } else {
             // myblocksadmin as a library
 
             $this->target_mid = $xoopsModule->getVar('mid');
 
-            $this->target_mname = $xoopsModule->getVar('name') . ' ' . sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0);
+            $this->target_mname = $xoopsModule->getVar('name').' '.sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0);
 
             $this->target_dirname = $xoopsModule->getVar('dirname');
 
-            $mod_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname');
+            $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname');
 
             $modinfo = $xoopsModule->getInfo();
 
             $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
 
-            $breadcrumbsObj->appendPath($mod_url . '/' . @$modinfo['adminindex'], $this->target_mname);
+            $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname);
 
-            $breadcrumbsObj->appendPath($mod_url . '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN);
+            $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN);
         }
 
         // read xoops_version.php of the target
@@ -256,7 +256,7 @@ 
      */
     public function renderCell4BlockOptions($block_data)
     {
-        $bid = (int) $block_data['bid'];
+        $bid = (int)$block_data['bid'];
 
         //HACK by domifara
 
@@ -283,7 +283,7 @@ 
      */
     public function renderCell4BlockModuleLink($block_data)
     {
-        $bid = (int) $block_data['bid'];
+        $bid = (int)$block_data['bid'];
 
         // get selected targets
 
@@ -294,12 +294,12 @@ 
         } else {
 			// originated from the table of `block_module_link`
 
-            $result = $this->db->query('SELECT module_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'");
+            $result = $this->db->query('SELECT module_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
 
             $selected_mids = [];
 
             while ([$selected_mid] = $this->db->fetchRow($result)) {
-                $selected_mids[] = (int) $selected_mid;
+                $selected_mids[] = (int)$selected_mid;
             }
 
             if (empty($selected_mids)) {
@@ -351,7 +351,7 @@ 
      */
     public function renderCell4BlockReadGroupPerm($block_data)
     {
-        $bid = (int) $block_data['bid'];
+        $bid = (int)$block_data['bid'];
 
         // get selected targets
 
@@ -362,12 +362,12 @@ 
         } else {
             // origined from the table of `group_perm`
 
-            $result = $this->db->query('SELECT gperm_groupid FROM ' . $this->db->prefix('group_permission') . " WHERE gperm_itemid='$bid' AND gperm_name='block_read'");
+            $result = $this->db->query('SELECT gperm_groupid FROM '.$this->db->prefix('group_permission')." WHERE gperm_itemid='$bid' AND gperm_name='block_read'");
 
             $selected_gids = [];
 
             while ([$selected_gid] = $this->db->fetchRow($result)) {
-                $selected_gids[] = (int) $selected_gid;
+                $selected_gids[] = (int)$selected_gid;
             }
 
             if (0 == $bid && empty($selected_gids)) {
@@ -415,11 +415,11 @@ 
      */
     public function renderCell4BlockPosition($block_data)
     {
-        $bid = (int) $block_data['bid'];
+        $bid = (int)$block_data['bid'];
 
-        $side = (int) $block_data['side'];
+        $side = (int)$block_data['side'];
 
-        $visible = (int) $block_data['visible'];
+        $visible = (int)$block_data['visible'];
 
         $sseln = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = '';
 
@@ -464,31 +464,31 @@ 
 
         return "
                 <div class='blockposition $scol0'>
-                    <input type='radio' name='sides[$bid]' value='" . XOOPS_SIDEBLOCK_LEFT . "' class='blockposition' $ssel0 onclick='document.getElementById(\"extra_side_$bid\").value=" . XOOPS_SIDEBLOCK_LEFT . ";'>
+                    <input type='radio' name='sides[$bid]' value='".XOOPS_SIDEBLOCK_LEFT."' class='blockposition' $ssel0 onclick='document.getElementById(\"extra_side_$bid\").value=".XOOPS_SIDEBLOCK_LEFT.";'>
                 </div>
-                <div style='float:" . _GLOBAL_LEFT . ";'>-</div>
+                <div style='float:" . _GLOBAL_LEFT.";'>-</div>
                 <div class='blockposition $scol2'>
-                    <input type='radio' name='sides[$bid]' value='" . XOOPS_CENTERBLOCK_LEFT . "' class='blockposition' $ssel2 onclick='document.getElementById(\"extra_side_$bid\").value=" . XOOPS_CENTERBLOCK_LEFT . ";'>
+                    <input type='radio' name='sides[$bid]' value='".XOOPS_CENTERBLOCK_LEFT."' class='blockposition' $ssel2 onclick='document.getElementById(\"extra_side_$bid\").value=".XOOPS_CENTERBLOCK_LEFT.";'>
                 </div>
                 <div class='blockposition $scol3'>
-                    <input type='radio' name='sides[$bid]' value='" . XOOPS_CENTERBLOCK_CENTER . "' class='blockposition' $ssel3 onclick='document.getElementById(\"extra_side_$bid\").value=" . XOOPS_CENTERBLOCK_CENTER . ";'>
+                    <input type='radio' name='sides[$bid]' value='".XOOPS_CENTERBLOCK_CENTER."' class='blockposition' $ssel3 onclick='document.getElementById(\"extra_side_$bid\").value=".XOOPS_CENTERBLOCK_CENTER.";'>
                 </div>
                 <div class='blockposition $scol4'>
-                    <input type='radio' name='sides[$bid]' value='" . XOOPS_CENTERBLOCK_RIGHT . "' class='blockposition' $ssel4 onclick='document.getElementById(\"extra_side_$bid\").value=" . XOOPS_CENTERBLOCK_RIGHT . ";'>
+                    <input type='radio' name='sides[$bid]' value='".XOOPS_CENTERBLOCK_RIGHT."' class='blockposition' $ssel4 onclick='document.getElementById(\"extra_side_$bid\").value=".XOOPS_CENTERBLOCK_RIGHT.";'>
                 </div>
-                <div style='float:" . _GLOBAL_LEFT . ";'>-</div>
+                <div style='float:" . _GLOBAL_LEFT.";'>-</div>
                 <div class='blockposition $scol1'>
-                    <input type='radio' name='sides[$bid]' value='" . XOOPS_SIDEBLOCK_RIGHT . "' class='blockposition' $ssel1 onclick='document.getElementById(\"extra_side_$bid\").value=" . XOOPS_SIDEBLOCK_RIGHT . ";'>
+                    <input type='radio' name='sides[$bid]' value='".XOOPS_SIDEBLOCK_RIGHT."' class='blockposition' $ssel1 onclick='document.getElementById(\"extra_side_$bid\").value=".XOOPS_SIDEBLOCK_RIGHT.";'>
                 </div>
                 <br>
                 <br>
-                <div style='float:" . _GLOBAL_LEFT . ";width:50px;' class='$stextbox'>
-                    <input type='text' name='extra_sides[$bid]' value='" . $value4extra_side . "' style='width:20px;' id='extra_side_$bid'>
+                <div style='float:" . _GLOBAL_LEFT.";width:50px;' class='$stextbox'>
+                    <input type='text' name='extra_sides[$bid]' value='".$value4extra_side."' style='width:20px;' id='extra_side_$bid'>
                 </div>
                 <div class='blockposition $scoln'>
                     <input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;'>
                 </div>
-                <div style='float:" . _GLOBAL_LEFT . ";'>" . _NONE . '</div>
+                <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div>
     ';
     }
 
@@ -500,7 +500,7 @@ 
 
         // main query
 
-        $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+        $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
 
         $result = $this->db->query($sql);
 
@@ -536,13 +536,13 @@ 
 
         foreach ($block_arr as $i => $block) {
             $block_data = [
-                'bid' => (int) $block->getVar('bid'),
+                'bid' => (int)$block->getVar('bid'),
                 'name' => $block->getVar('name', 'n'),
                 'title' => $block->getVar('title', 'n'),
-                'weight' => (int) $block->getVar('weight'),
-                'bcachetime' => (int) $block->getVar('bcachetime'),
-                'side' => (int) $block->getVar('side'),
-                'visible' => (int) $block->getVar('visible'),
+                'weight' => (int)$block->getVar('weight'),
+                'bcachetime' => (int)$block->getVar('bcachetime'),
+                'side' => (int)$block->getVar('side'),
+                'visible' => (int)$block->getVar('visible'),
                 'can_edit' => $this->canEdit($block),
                 'can_delete' => $this->canDelete($block),
                 'can_clone' => $this->canClone($block),
@@ -559,7 +559,7 @@ 
 
         // display
 
-        require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
+        require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
 
         $tpl = new D3Tpl();
 
@@ -585,7 +585,7 @@ 
             return [];
         }
 
-        require XOOPS_ROOT_PATH . '/modules/' . $this->target_dirname . '/xoops_version.php';
+        require XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php';
 
         if (empty($modversion['blocks'])) {
             return [];
@@ -598,7 +598,7 @@ 
     {
         // query for getting blocks
 
-        $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+        $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
 
         $result = $this->db->query($sql);
 
@@ -635,9 +635,9 @@ 
         // skip system (TODO)
 
         if ($this->target_mid > 1) {
-            $form->addAppendix('module_admin', $this->target_mid, $this->target_mname . ' ' . _MD_A_MYBLOCKSADMIN_PERM_MADMIN);
+            $form->addAppendix('module_admin', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MADMIN);
 
-            $form->addAppendix('module_read', $this->target_mid, $this->target_mname . ' ' . _MD_A_MYBLOCKSADMIN_PERM_MREAD);
+            $form->addAppendix('module_read', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MREAD);
         }
 
         foreach ($item_list as $item_id => $item_name) {
@@ -708,25 +708,25 @@ 
         $msg = _MD_A_MYBLOCKSADMIN_DBUPDATED;
 
         if (false !== $block->store()) {
-            require_once XOOPS_ROOT_PATH . '/class/template.php';
+            require_once XOOPS_ROOT_PATH.'/class/template.php';
 
             $xoopsTpl = new \XoopsTpl();
 
             $xoopsTpl->xoops_setCaching(2);
 
             if ('' != $block->getVar('template')) {
-                if ($xoopsTpl->isCached('db:' . $block->getVar('template'))) {
-                    if (!$xoopsTpl->clearCache('db:' . $block->getVar('template'))) {
-                        $msg = 'Unable to clear cache for block ID' . $bid;
+                if ($xoopsTpl->isCached('db:'.$block->getVar('template'))) {
+                    if (!$xoopsTpl->clearCache('db:'.$block->getVar('template'))) {
+                        $msg = 'Unable to clear cache for block ID'.$bid;
                     }
                 }
-            } elseif ($xoopsTpl->isCached('db:system_dummy.tpl', 'blk_' . $bid)) {
-                if (!$xoopsTpl->clearCache('db:system_dummy.tpl', 'blk_' . $bid)) {
-                    $msg = 'Unable to clear cache for block ID' . $bid;
+            } elseif ($xoopsTpl->isCached('db:system_dummy.tpl', 'blk_'.$bid)) {
+                if (!$xoopsTpl->clearCache('db:system_dummy.tpl', 'blk_'.$bid)) {
+                    $msg = 'Unable to clear cache for block ID'.$bid;
                 }
             }
         } else {
-            $msg = 'Failed update of block. ID:' . $bid;
+            $msg = 'Failed update of block. ID:'.$bid;
         }
 
         return $msg;
@@ -740,7 +740,7 @@ 
      */
     public function updateBlockModuleLink($bid, $bmodules): void
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         $table = $this->db->prefix('block_module_link');
 
@@ -749,7 +749,7 @@ 
         $this->db->query($sql);
 
         foreach ($bmodules as $mid) {
-            $mid = (int) $mid;
+            $mid = (int)$mid;
 
             $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)";
 
@@ -765,7 +765,7 @@ 
      */
     public function updateBlockReadGroupPerm($bid, $req_gids): void
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         $table = $this->db->prefix('group_permission');
 
@@ -800,7 +800,7 @@ 
         $this->db->query($sql);
 
         foreach ($req_gids as $gid) {
-            $gid = (int) $gid;
+            $gid = (int)$gid;
 
             $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')";
 
@@ -840,7 +840,7 @@ 
      */
     public function fetchRequest4Block($bid)
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
@@ -858,13 +858,13 @@ 
 
         return [
             'bid' => $bid,
-            'side' => (int) (@$_POST['sides'][$bid]),
-            'weight' => (int) (@$_POST['weights'][$bid]),
+            'side' => (int)(@$_POST['sides'][$bid]),
+            'weight' => (int)(@$_POST['weights'][$bid]),
             'visible' => $visible,
             'title' => (@$_POST['titles'][$bid]),
             'content' => (@$_POST['contents'][$bid]),
             'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]),
-            'bcachetime' => (int) (@$_POST['bcachetimes'][$bid]),
+            'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]),
             'bmodule' => \is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : [0],
             'bgroup' => \is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : [],
             'options' => \is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : [],
@@ -877,7 +877,7 @@ 
      */
     public function do_delete($bid)
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         //HACK by domifara
 
@@ -913,7 +913,7 @@ 
      */
     public function do_deleteBlockReadGroupPerm($bid): void
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         $table = $this->db->prefix('group_permission');
 
@@ -927,7 +927,7 @@ 
      */
     public function form_delete($bid): void
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         //HACK by domifara
 
@@ -966,7 +966,7 @@ 
      */
     public function do_clone($bid)
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         $request = $this->fetchRequest4Block($bid);
 
@@ -1056,7 +1056,7 @@ 
         do {
             $func_num--;
 
-            [$count] = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM ' . $this->db->prefix('newblocks') . ' WHERE mid=' . (int) $mid . ' AND func_num=' . $func_num));
+            [$count] = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM '.$this->db->prefix('newblocks').' WHERE mid='.(int)$mid.' AND func_num='.$func_num));
         } while ($count > 0);
 
         return $func_num > 128 ? $func_num : 255;
@@ -1068,7 +1068,7 @@ 
      */
     public function do_edit($bid)
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         if ($bid <= 0) {
             // new custom block
@@ -1098,7 +1098,7 @@ 
             // permission copy
 
             foreach ($GLOBALS['xoopsUser']->getGroups() as $gid) {
-                $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
+                $sql = 'INSERT INTO '.$this->db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
 
                 $this->db->query($sql);
             }
@@ -1127,7 +1127,7 @@ 
      */
     public function form_edit($bid, $mode = 'edit'): void
     {
-        $bid = (int) $bid;
+        $bid = (int)$bid;
 
         //HACK by domifara
 
@@ -1209,10 +1209,10 @@ 
                 'bid' => $bid,
                 'name' => $block->getVar('name', 'n'),
                 'title' => $block->getVar('title', 'n'),
-                'weight' => (int) $block->getVar('weight'),
-                'bcachetime' => (int) $block->getVar('bcachetime'),
-                'side' => (int) $block->getVar('side'),
-                'visible' => (int) $block->getVar('visible'),
+                'weight' => (int)$block->getVar('weight'),
+                'bcachetime' => (int)$block->getVar('bcachetime'),
+                'side' => (int)$block->getVar('side'),
+                'visible' => (int)$block->getVar('visible'),
                 'template' => $block_template,
                 'template_tplset' => $block_template_tplset,
                 'options' => $block->getVar('options'),
@@ -1235,7 +1235,7 @@ 
 
         // display
 
-        require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
+        require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
 
         $tpl = new D3Tpl();
 
@@ -1244,7 +1244,7 @@ 
         if (defined('XOOPS_CUBE_LEGACY')) {
             $tpl->assign('xoops_cube_legacy', true);
 
-            require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+            require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         } else {
             $tpl->assign('xoops_cube_legacy', false);
         }
@@ -1275,7 +1275,7 @@ 
      */
     public function checkFck()
     {
-        return file_exists(XOOPS_ROOT_PATH . '/common/fckeditor/fckeditor.js');
+        return file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js');
     }
 
     /**
@@ -1284,7 +1284,7 @@ 
      */
     public function previewContent($block_data)
     {
-        $bid = (int) $block_data['bid'];
+        $bid = (int)$block_data['bid'];
 
         if (!$block_data['is_custom']) {
             return '';
@@ -1346,12 +1346,12 @@ 
         // Ticket Check
 
         if (!$GLOBALS['xoopsSecurity']->check(true, 'myblocksadmin')) {
-            redirect_header(XOOPS_URL . '/', 3, $GLOBALS['xoopsSecurity']->getErrors());
+            redirect_header(XOOPS_URL.'/', 3, $GLOBALS['xoopsSecurity']->getErrors());
         }
 
         $msg = '';
 
-        $bid = (int) (@$_GET['bid']);
+        $bid = (int)(@$_GET['bid']);
 
         if (!empty($_POST['preview'])) {
             // preview
@@ -1380,19 +1380,19 @@ 
         } elseif (!empty($_POST['submit'])) {
             // update module_admin,module_read,block_read
 
-            include dirname(__DIR__) . '/include/mygroupperm.php';
+            include dirname(__DIR__).'/include/mygroupperm.php';
 
             $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED;
         }
 
-        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname=' . $this->target_dirname, 1, $msg);
+        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg);
 
         exit;
     }
 
     public function processGet(): void
     {
-        $bid = (int) (@$_GET['bid']);
+        $bid = (int)(@$_GET['bid']);
 
         switch (@$_GET['op']) {
             case 'clone':

xoops_trust_path/libs/altsys/class/SetupAltsysLangMgr.class.php

Spacing +10 added lines, -10 removed lines

@@ -5,12 +5,12 @@ 
 }
 
 if (!defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
-    header('Location: ' . XOOPS_URL . '/modules/altsys/setup_xoops_trust_path.php');
+    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php');
 
     exit;
 }
 
-define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH . '/my_language');
+define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH.'/my_language');
 
 /**
  * Class SetupAltsysLangMgr
@@ -32,8 +32,8 @@ 
     }
 }
 
-require_once XOOPS_ROOT_PATH . '/core/XCube_LanguageManager.class.php';
-require_once XOOPS_ROOT_PATH . '/modules/legacy/kernel/Legacy_LanguageManager.class.php';
+require_once XOOPS_ROOT_PATH.'/core/XCube_LanguageManager.class.php';
+require_once XOOPS_ROOT_PATH.'/modules/legacy/kernel/Legacy_LanguageManager.class.php';
 
 /**
  * Class AltsysLangMgr_LanguageManager
@@ -46,7 +46,7 @@ 
 
     public function prepare(): void
     {
-        $langmanpath = XOOPS_TRUST_PATH . '/libs/altsys/class/D3LanguageManager.class.php';
+        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php';
 
         if (!is_file($langmanpath)) {
             die('install the latest altsys');
@@ -73,12 +73,12 @@ 
             $root = XCube_Root::getSingleton();
 
             if (!empty($root->mContext->mXoopsConfig['theme_set'])) {
-                $langdir = XOOPS_THEME_PATH . '/' . $root->mContext->mXoopsConfig['theme_set'] . '/language';
+                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language';
 
                 if (file_exists($langdir)) {
-                    $langfile = $langdir . '/' . $this->mLanguageName . '.php';
+                    $langfile = $langdir.'/'.$this->mLanguageName.'.php';
 
-                    $engfile = $langdir . '/english.php';
+                    $engfile = $langdir.'/english.php';
 
                     if (is_file($langfile)) {
                         require_once $langfile;
@@ -93,7 +93,7 @@ 
 
         // read normal
 
-        $this->langman->read($fileBodyName . '.php', $dirname);
+        $this->langman->read($fileBodyName.'.php', $dirname);
     }
 
     /**
@@ -104,7 +104,7 @@ 
         // I dare not to use langman...
 
         if (false === mb_strpos($type, '.') && $this->langman->my_language) {
-            $mylang_file = $this->langman->my_language . '/' . $this->mLanguageName . '/' . $type . '.php';
+            $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php';
 
             if (is_file($mylang_file)) {
                 require_once $mylang_file;

xoops_trust_path/libs/altsys/class/D3Tpl.class.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php declare(strict_types=1);
 
-require_once XOOPS_ROOT_PATH . '/class/template.php';
-require_once XOOPS_TRUST_PATH . '/libs/altsys/include/altsys_functions.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
+require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php';
 
 /**
  * Class D3Tpl
@@ -20,7 +20,7 @@ 
         parent::__construct();
 
         if (in_array(altsys_get_core_type(), [ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P], true)) {
-            array_unshift($this->plugins_dir, XOOPS_TRUST_PATH . '/libs/altsys/smarty_plugins');
+            array_unshift($this->plugins_dir, XOOPS_TRUST_PATH.'/libs/altsys/smarty_plugins');
         }
 
         // for RTL users