mambax7 / altsys

xoops_trust_path/libs/altsys/onupdate.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-eval(' function xoops_module_update_' . $mydirname . '( $module ) { return altsys_onupdate_base( $module , "' . $mydirname . '" ) ; } ');
+eval(' function xoops_module_update_'.$mydirname.'( $module ) { return altsys_onupdate_base( $module , "'.$mydirname.'" ) ; } ');
 
 if (!function_exists('altsys_onupdate_base')) {
     /**
@@ -20,7 +20,7 @@ 
         if (defined('XOOPS_CUBE_LEGACY')) {
             $root = XCube_Root::getSingleton();
 
-            $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_onupdate');
+            $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUpdate.'.ucfirst($mydirname).'.Success', 'altsys_message_append_onupdate');
 
             $msgs = [];
         } else {
@@ -37,33 +37,33 @@ 
 
         // configs (Though I know it is not a recommended way...)
 
-        $check_sql = 'SHOW COLUMNS FROM ' . $db->prefix('config') . " LIKE 'conf_title'";
+        $check_sql = 'SHOW COLUMNS FROM '.$db->prefix('config')." LIKE 'conf_title'";
 
         if (($result = $db->query($check_sql)) && ($myrow = $db->fetchArray($result)) && 'varchar(30)' == @$myrow['Type']) {
-            $db->queryF('ALTER TABLE ' . $db->prefix('config') . " MODIFY `conf_title` VARCHAR(255) NOT NULL DEFAULT '', MODIFY `conf_desc` VARCHAR(255) NOT NULL DEFAULT ''");
+            $db->queryF('ALTER TABLE '.$db->prefix('config')." MODIFY `conf_title` VARCHAR(255) NOT NULL DEFAULT '', MODIFY `conf_desc` VARCHAR(255) NOT NULL DEFAULT ''");
         }
 
         // 0.4 -> 0.5
 
-        $check_sql = 'SELECT COUNT(*) FROM ' . $db->prefix($mydirname . '_language_constants');
+        $check_sql = 'SELECT COUNT(*) FROM '.$db->prefix($mydirname.'_language_constants');
 
         if (!$db->query($check_sql)) {
-            $db->queryF('CREATE TABLE ' . $db->prefix($mydirname . '_language_constants') . " (mid SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,language VARCHAR(32) NOT NULL DEFAULT '',name VARCHAR(255) NOT NULL DEFAULT '',value TEXT,PRIMARY KEY (mid,language,name)) ENGINE=MyISAM");
+            $db->queryF('CREATE TABLE '.$db->prefix($mydirname.'_language_constants')." (mid SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0,language VARCHAR(32) NOT NULL DEFAULT '',name VARCHAR(255) NOT NULL DEFAULT '',value TEXT,PRIMARY KEY (mid,language,name)) ENGINE=MyISAM");
         }
 
         // TEMPLATES (all templates have been already removed by modulesadmin)
 
         $tplfile_handler = xoops_getHandler('tplfile');
 
-        $tpl_path = __DIR__ . '/templates';
+        $tpl_path = __DIR__.'/templates';
 
-        if ($handler = @opendir($tpl_path . '/')) {
+        if ($handler = @opendir($tpl_path.'/')) {
             while (false !== ($file = readdir($handler))) {
                 if ('.' == mb_substr($file, 0, 1)) {
                     continue;
                 }
 
-                $file_path = $tpl_path . '/' . $file;
+                $file_path = $tpl_path.'/'.$file;
 
                 if (is_file($file_path)) {
                     $mtime = (int)(@filemtime($file_path));
@@ -76,7 +76,7 @@ 
 
                     $tplfile->setVar('tpl_tplset', 'default');
 
-                    $tplfile->setVar('tpl_file', $mydirname . '_' . $file);
+                    $tplfile->setVar('tpl_file', $mydirname.'_'.$file);
 
                     $tplfile->setVar('tpl_desc', '', true);
 
@@ -89,15 +89,15 @@ 
                     $tplfile->setVar('tpl_type', 'module');
 
                     if (!$tplfile_handler->insert($tplfile)) {
-                        $msgs[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>' . htmlspecialchars($mydirname . '_' . $file, ENT_QUOTES | ENT_HTML5) . '</b> to the database.</span>';
+                        $msgs[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>'.htmlspecialchars($mydirname.'_'.$file, ENT_QUOTES | ENT_HTML5).'</b> to the database.</span>';
                     } else {
                         $tplid = $tplfile->getVar('tpl_id');
 
-                        $msgs[] = 'Template <b>' . htmlspecialchars($mydirname . '_' . $file, ENT_QUOTES | ENT_HTML5) . '</b> added to the database. (ID: <b>' . $tplid . '</b>)';
+                        $msgs[] = 'Template <b>'.htmlspecialchars($mydirname.'_'.$file, ENT_QUOTES | ENT_HTML5).'</b> added to the database. (ID: <b>'.$tplid.'</b>)';
 
                         // generate compiled file
 
-                        require_once XOOPS_TRUST_PATH . '/libs/altsys/include/altsys_functions.php';
+                        require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php';
 
                         altsys_clear_templates_c();
 
@@ -114,9 +114,9 @@ 
             closedir($handler);
         }
 
-        include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
 
         xoops_template_clear_module_cache($mid);
 

xoops_trust_path/libs/altsys/get_tplsvarsinfo.php

Spacing +15 added lines, -15 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')) {
@@ -44,7 +44,7 @@ 
                     continue;
                 }
 
-                convert_array2info_recursive($var_name . '.' . $key, $val, $sum_array_name);
+                convert_array2info_recursive($var_name.'.'.$key, $val, $sum_array_name);
             }
 
             return;
@@ -81,7 +81,7 @@ 
 {
     global $site_name;
 
-    return '<macromedia-extension name="XOOPS-' . $site_name . ' ' . $mxi_name . '" version="1.0" type="Suite" requires-restart="true">
+    return '<macromedia-extension name="XOOPS-'.$site_name.' '.$mxi_name.'" version="1.0" type="Suite" requires-restart="true">
     <products>
         <product name="Dreamweaver" version="6" primary="true" />
     </products>
@@ -96,7 +96,7 @@ 
     ]]></license-agreement>
     <description><![CDATA[
 
-Usable template variables in ' . $mxi_name . '
+Usable template variables in ' . $mxi_name.'
 
     ]]></description>
     <ui-access><![CDATA[
@@ -107,7 +107,7 @@ 
 
     ]]></ui-access>
     <files>
-' . $file_entries . '
+' . $file_entries.'
     </files>
     <configuration-changes>
     </configuration-changes>
@@ -121,7 +121,7 @@ 
 $tplsvarsinfo_mod_tpl = [];
 $tplsvarsinfo_total = [];
 
-if ($handler = opendir(XOOPS_COMPILE_PATH . '/')) {
+if ($handler = opendir(XOOPS_COMPILE_PATH.'/')) {
     while (false !== ($file = readdir($handler))) {
         // skip files other than tplsvars_* files
 
@@ -137,7 +137,7 @@ 
             continue;
         }
 
-        $file_path = XOOPS_COMPILE_PATH . '/' . $file;
+        $file_path = XOOPS_COMPILE_PATH.'/'.$file;
 
         $file_body = implode('', file($file_path));
 
@@ -183,13 +183,13 @@ 
 </snippet>';
 
 if (!empty($_POST['as_dw_extension_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['as_dw_extension_tgz'])) {
-    require_once XOOPS_ROOT_PATH . '/class/tardownloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/tardownloader.php';
 
     $downloader = new XoopsTarDownloader();
 
@@ -222,9 +222,9 @@ 
 
         $snippet_body = sprintf($snippet_format, $name, $description);
 
-        $file_name = strtr($key, '.', '_') . '.csn';
+        $file_name = strtr($key, '.', '_').'.csn';
 
-        $downloader->addFileData($snippet_body, $dw_snippets_dirname . '/' . $file_name);
+        $downloader->addFileData($snippet_body, $dw_snippets_dirname.'/'.$file_name);
     }
 
     // make a mxi file per module
@@ -236,15 +236,15 @@ 
             foreach ($tplsvarsinfo as $key => $val) {
                 $name = mb_substr($key, 1);
 
-                $file_name = strtr($key, '.', '_') . '.csn';
+                $file_name = strtr($key, '.', '_').'.csn';
 
-                $file_entries .= "\t\t" . '<file name="' . $dw_snippets_dirname . '/' . $file_name . '" destination="$Dreamweaver/Configuration/Snippets/XOOPS-' . $site_name . '/' . $tpl_name . '" />' . "\n";
+                $file_entries .= "\t\t".'<file name="'.$dw_snippets_dirname.'/'.$file_name.'" destination="$Dreamweaver/Configuration/Snippets/XOOPS-'.$site_name.'/'.$tpl_name.'" />'."\n";
             }
         }
 
         $mxi_body = get_mxi_body($mod_name, $file_entries);
 
-        $downloader->addFileData($mxi_body, $mod_name . '.mxi');
+        $downloader->addFileData($mxi_body, $mod_name.'.mxi');
     }
 
     //bugfix by nao-pon ,echo is not necessary for downloader

xoops_trust_path/libs/altsys/compilehookadmin.php

Spacing +30 added lines, -30 removed lines

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

xoops_trust_path/libs/altsys/mymenusub/mytplsadmin.php

Spacing +8 added lines, -8 removed lines

@@ -9,7 +9,7 @@ 
 $db = XoopsDatabaseFactory::getDatabaseConnection();
 
 // get custom templates
-list($count) = $db->fetchRow($db->query('SELECT COUNT(t.tpl_module) AS tpl_count FROM ' . $db->prefix('tplfile') . " t WHERE t.tpl_type='custom'"));
+list($count) = $db->fetchRow($db->query('SELECT COUNT(t.tpl_module) AS tpl_count FROM '.$db->prefix('tplfile')." t WHERE t.tpl_type='custom'"));
 if ('_custom' == $current_dirname) {
     //  $GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => _MYTPLSADMIN_CUSTOMTEMPLATE ) ;
 
@@ -21,35 +21,35 @@ 
 $adminmenu = [
     [
         'selected' => $custom_selected,
-        'title' => _MYTPLSADMIN_CUSTOMTEMPLATE . " ($count)",
+        'title' => _MYTPLSADMIN_CUSTOMTEMPLATE." ($count)",
         'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname=_custom',
     ],
 ];
 
 // get modules/templates
-$mrs = $db->query('SELECT m.name,m.dirname,COUNT(t.tpl_module) AS tpl_count FROM ' . $db->prefix('modules') . ' m LEFT JOIN ' . $db->prefix('tplfile') . ' t ON m.dirname=t.tpl_module WHERE m.isactive GROUP BY m.mid HAVING tpl_count>0 ORDER BY m.weight,m.mid');
+$mrs = $db->query('SELECT m.name,m.dirname,COUNT(t.tpl_module) AS tpl_count FROM '.$db->prefix('modules').' m LEFT JOIN '.$db->prefix('tplfile').' t ON m.dirname=t.tpl_module WHERE m.isactive GROUP BY m.mid HAVING tpl_count>0 ORDER BY m.weight,m.mid');
 
 // module loop
 while (list($name, $dirname, $count) = $db->fetchRow($mrs)) {
     if ($dirname == $current_dirname) {
         $adminmenu[] = [
             'selected' => true,
-            'title' => $name . " ($count)",
-            'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname=' . $dirname,
+            'title' => $name." ($count)",
+            'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$dirname,
         ];
 
     //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => htmlspecialchars( $name , ENT_QUOTES ) ) ;
     } else {
         $adminmenu[] = [
             'selected' => false,
-            'title' => $name . " ($count)",
-            'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname=' . $dirname,
+            'title' => $name." ($count)",
+            'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$dirname,
         ];
     }
 }
 
 // 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,

Indentation +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@
 require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
 $tpl = new D3Tpl();
 $tpl->assign([
-                 'adminmenu' => $adminmenu,
-                 'mypage' => 'mytplsadmin',
-             ]);
+                    'adminmenu' => $adminmenu,
+                    'mypage' => 'mytplsadmin',
+                ]);
 $tpl->display('db:altsys_inc_mymenusub.tpl');

xoops_trust_path/libs/altsys/mymenusub/myblocksadmin.php

Spacing +7 added lines, -7 removed lines

@@ -27,9 +27,9 @@ 
     // get block info
 
     if (ALTSYS_CORE_TYPE_X22 != $core_type) {
-        list($block_count_all) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $m4menu->getVar('mid')));
+        list($block_count_all) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('newblocks').' WHERE mid='.$m4menu->getVar('mid')));
 
-        list($block_count_visible) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $m4menu->getVar('mid') . ' AND visible>0'));
+        list($block_count_visible) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('newblocks').' WHERE mid='.$m4menu->getVar('mid').' AND visible>0'));
 
         // $block_desc = " $block_count_all($block_count_visible)" ;
 
@@ -41,22 +41,22 @@ 
     if ($m4menu->getVar('dirname') == $current_dirname) {
         $adminmenu[] = [
             'selected' => true,
-            'title' => $m4menu->getVar('name', 'n') . $block_desc,
-            'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname=' . $m4menu->getVar('dirname', 'n'),
+            'title' => $m4menu->getVar('name', 'n').$block_desc,
+            'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$m4menu->getVar('dirname', 'n'),
         ];
 
     //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => $m4menu->getVar('name') ) ;
     } else {
         $adminmenu[] = [
             'selected' => false,
-            'title' => $m4menu->getVar('name', 'n') . $block_desc,
-            'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname=' . $m4menu->getVar('dirname', 'n'),
+            'title' => $m4menu->getVar('name', 'n').$block_desc,
+            'link' => '?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$m4menu->getVar('dirname', 'n'),
         ];
     }
 }
 
 // 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,

Indentation +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@
 require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
 $tpl = new D3Tpl();
 $tpl->assign([
-                 'adminmenu' => $adminmenu,
-                 'mypage' => 'myblocksadmin',
-             ]);
+                    'adminmenu' => $adminmenu,
+                    'mypage' => 'myblocksadmin',
+                ]);
 $tpl->display('db:altsys_inc_mymenusub.tpl');

xoops_trust_path/libs/altsys/mymenusub/mylangadmin.php

Spacing +6 added lines, -6 removed lines

@@ -7,29 +7,29 @@
 $current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-$mrs = $db->query('SELECT m.name,m.dirname,COUNT(l.mid) FROM ' . $db->prefix('modules') . ' m LEFT JOIN ' . $db->prefix('altsys_language_constants') . ' l ON m.mid=l.mid WHERE m.isactive GROUP BY m.mid ORDER BY m.weight,m.mid');
+$mrs = $db->query('SELECT m.name,m.dirname,COUNT(l.mid) FROM '.$db->prefix('modules').' m LEFT JOIN '.$db->prefix('altsys_language_constants').' l ON m.mid=l.mid WHERE m.isactive GROUP BY m.mid ORDER BY m.weight,m.mid');
 
 $adminmenu = [];
 while (list($name, $dirname, $count) = $db->fetchRow($mrs)) {
     if ($dirname == $current_dirname) {
         $adminmenu[] = [
             'selected' => true,
-            'title' => $name . " ($count)",
-            'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname=' . $dirname,
+            'title' => $name." ($count)",
+            'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname='.$dirname,
         ];
 
     //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => htmlspecialchars( $name , ENT_QUOTES ) ) ;
     } else {
         $adminmenu[] = [
             'selected' => false,
-            'title' => $name . " ($count)",
-            'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname=' . $dirname,
+            'title' => $name." ($count)",
+            'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname='.$dirname,
         ];
     }
 }
 
 // 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,

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
 require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
 $tpl = new D3Tpl();
 $tpl->assign([
-                 'adminmenu' => $adminmenu,
-                 'mypage' => 'mylangadmin',
-             ]);
+                    'adminmenu' => $adminmenu,
+                    'mypage' => 'mylangadmin',
+                ]);
 $tpl->display('db:altsys_inc_mymenusub.tpl');

xoops_trust_path/libs/altsys/controllers.php

Spacing +4 added lines, -4 removed lines

@@ -4,10 +4,10 @@
 //$langman =& D3LanguageManager::getInstance() ;
 //$langman->read( 'modinfo.php' , 'altsys' , 'altsys' ) ;
 
-if (file_exists(__DIR__ . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php')) {
-    include_once __DIR__ . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php';
-} elseif (file_exists(__DIR__ . '/language/english/modinfo.php')) {
-    include_once __DIR__ . '/language/english/modinfo.php';
+if (file_exists(__DIR__.'/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php')) {
+    include_once __DIR__.'/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php';
+} elseif (file_exists(__DIR__.'/language/english/modinfo.php')) {
+    include_once __DIR__.'/language/english/modinfo.php';
 }
 
 $controllers = [

xoops_trust_path/libs/altsys/mylangadmin.php

Spacing +27 added lines, -27 removed lines

@@ -5,11 +5,11 @@ 
 //                       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/lang_functions.php';
-include_once __DIR__ . '/class/D3LanguageManager.class.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/lang_functions.php';
+include_once __DIR__.'/class/D3LanguageManager.class.php';
 
 // only groups have 'module_admin' of 'altsys' can do that.
 $module_handler = xoops_getHandler('module');
@@ -32,7 +32,7 @@ 
 
 // check $xoopsModule
 if (!is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // set target_module if specified by $_GET['dirname']
@@ -52,7 +52,7 @@ 
 
     $target_dirname4sql = addslashes($target_dirname);
 
-    $target_mname = $target_module->getVar('name') . '&nbsp;' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
+    $target_mname = $target_module->getVar('name').'&nbsp;'.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
 
 //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } else {
@@ -82,8 +82,8 @@ 
 
 // get $target_trustdirname
 $mytrustdirname = '';
-if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $target_dirname . '/mytrustdirname.php')) {
-    require XOOPS_ROOT_PATH . '/modules/' . $target_dirname . '/mytrustdirname.php';
+if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php')) {
+    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php';
 }
 $target_trustdirname = $mytrustdirname;
 
@@ -91,11 +91,11 @@ 
 if (empty($target_trustdirname)) {
     // conventinal module
 
-    $baseDir = XOOPS_ROOT_PATH . '/modules/' . $target_dirname . '/language';
+    $baseDir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language';
 } else {
     // D3 module
 
-    $baseDir = XOOPS_TRUST_PATH . '/modules/' . $target_trustdirname . '/language';
+    $baseDir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language';
 }
 
 // make list of language and check $target_lang
@@ -112,11 +112,11 @@ 
         }
 
         if (is_dir("$baseDir/$file")) {
-            list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='" . addslashes($file) . "'"));
+            list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='".addslashes($file)."'"));
 
             $languages[] = $file;
 
-            $languages4disp[] = $file . " ($count)";
+            $languages4disp[] = $file." ($count)";
         }
     }
 }
@@ -126,7 +126,7 @@ 
 }
 
 // get base directory seleced language
-$lang_base_dir = $baseDir . '/' . $target_lang;
+$lang_base_dir = $baseDir.'/'.$target_lang;
 if (!is_dir($lang_base_dir)) {
     altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE);
 }
@@ -170,14 +170,14 @@ 
 // get user_values should be overridden
 $langfile_constants = [];
 foreach ($langfile_names as $name) {
-    list($value) = $db->fetchRow($db->query('SELECT value FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='$target_lang4sql' AND name='" . addslashes($name) . "'"));
+    list($value) = $db->fetchRow($db->query('SELECT value FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'"));
 
     $langfile_constants[$name] = $value;
 }
 
 // constants defined in XOOPS_ROOT_PATH/my_language/(dirname)/...
 if ($langman->my_language) {
-    $mylang_unique_path = $langman->my_language . '/modules/' . $target_dirname . '/' . $target_lang . '/' . $target_file;
+    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file;
 
     $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path));
 
@@ -203,7 +203,7 @@ 
     // Ticket Check
 
     if (!$xoopsGTicket->check(true, 'altsys')) {
-        redirect_header(XOOPS_URL . '/', 3, $xoopsGTicket->getErrors());
+        redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     // read original file
@@ -212,7 +212,7 @@ 
 
     // insert fingerprint of langfile_unique_path
 
-    $langfile_fingerprint = '_MYLANGADMIN_' . md5($langfile_unique_path);
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
 
     $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents);
 
@@ -223,26 +223,26 @@ 
     foreach (array_reverse($langfile_names) as $name) {
         $user_value = (@$_POST[$name]);
 
-        $db->query('DELETE FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='$target_lang4sql' AND name='" . addslashes($name) . "'");
+        $db->query('DELETE FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'");
 
         if ('' !== $user_value) {
             $overrides_counter++;
 
             // Update table
 
-            $db->query('INSERT INTO ' . $db->prefix('altsys_language_constants') . " (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','" . addslashes($name) . "','" . addslashes($user_value) . "')");
+            $db->query('INSERT INTO '.$db->prefix('altsys_language_constants')." (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','".addslashes($name)."','".addslashes($user_value)."')");
 
             // rewrite script for cache
 
             // comment-out the line of define()
 
             if (empty($constpref)) {
-                $from = '/.*define\s?\(\s*(["\'])' . preg_quote($name) . '(\\1).*\;.*/';
+                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/';
             } else {
-                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])' . preg_quote(mb_substr($name, mb_strlen($constpref))) . '(\\1).*\;.*/';
+                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(mb_substr($name, mb_strlen($constpref))).'(\\1).*\;.*/';
             }
 
-            $to = '//$0' . "\ndefine('" . addslashes($name) . "','" . addslashes($user_value) . "');";
+            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');";
 
             $file_contents = preg_replace($from, $to, $file_contents);
         }
@@ -268,7 +268,7 @@ 
         unlink($cache_file_name);
     }
 
-    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname=' . $target_dirname . '&target_lang=' . rawurlencode($target_lang) . '&target_file=' . rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED);
+    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED);
 
     exit;
 }
@@ -297,7 +297,7 @@ 
 } else {
     // X2 core etc.
 
-    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2 . '<br />';
+    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />';
 
     $notice4disp .= '
         <h4>include/common.php</h4>
@@ -328,12 +328,12 @@ 
 // breadcrumbs
 $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
 if ($breadcrumbsObj->hasPaths()) {
-    $breadcrumbsObj->appendPath(XOOPS_URL . '/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
 
     $breadcrumbsObj->appendPath('', $target_mname);
 }
 
-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([
                  'target_dirname' => $target_dirname,

Indentation +18 added lines, -18 removed lines

@@ -336,24 +336,24 @@
 require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3Tpl.class.php';
 $tpl = new D3Tpl();
 $tpl->assign([
-                 'target_dirname' => $target_dirname,
-                 'target_mname' => $target_mname,
-                 'target_lang' => $target_lang,
-                 'languages' => $languages,
-                 'languages4disp' => $languages4disp,
-                 'target_file' => $target_file,
-                 'lang_files' => $lang_files,
-                 'langfile_constants' => $langfile_constants,
-                 'mylang_constants' => $mylang_constants,
-                 'use_my_language' => mb_strlen($langman->my_language) > 0,
-                 'mylang_file_name' => htmlspecialchars($mylang_unique_path, ENT_QUOTES),
-                 'cache_file_name' => htmlspecialchars($cache_file_name, ENT_QUOTES),
-                 'cache_file_mtime' => (int)$cache_file_mtime,
-                 'timezone_offset' => xoops_getUserTimestamp(0),
-                 'notice' => $notice4disp,
-                 'already_read' => $already_read,
-                 'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys'),
-             ]);
+                    'target_dirname' => $target_dirname,
+                    'target_mname' => $target_mname,
+                    'target_lang' => $target_lang,
+                    'languages' => $languages,
+                    'languages4disp' => $languages4disp,
+                    'target_file' => $target_file,
+                    'lang_files' => $lang_files,
+                    'langfile_constants' => $langfile_constants,
+                    'mylang_constants' => $mylang_constants,
+                    'use_my_language' => mb_strlen($langman->my_language) > 0,
+                    'mylang_file_name' => htmlspecialchars($mylang_unique_path, ENT_QUOTES),
+                    'cache_file_name' => htmlspecialchars($cache_file_name, ENT_QUOTES),
+                    'cache_file_mtime' => (int)$cache_file_mtime,
+                    'timezone_offset' => xoops_getUserTimestamp(0),
+                    'notice' => $notice4disp,
+                    'already_read' => $already_read,
+                    'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys'),
+                ]);
 $tpl->display('db:altsys_main_mylangadmin.tpl');
 
 xoops_cp_footer();

xoops_trust_path/libs/altsys/xoops_version.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/include/altsys_functions.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 // language file (modinfo.php)
 altsys_include_language_file('modinfo');
@@ -109,5 +109,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']) {
-    include __DIR__ . '/include/x20_keepblockoptions.inc.php';
+    include __DIR__.'/include/x20_keepblockoptions.inc.php';
 }