mambax7 / altsys

xoops_trust_path/libs/altsys/class/altsysUtils.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 class altsysUtils
 {
     /**
-     * @param      $name
+     * @param      string $name
      * @param bool $doRegist
      * @return array
      */
@@ -80,7 +80,7 @@ 
      * @param int  $flags
      * @param null $encoding
      * @param bool $double_encode
-     * @return mixed|string
+     * @return string
      */
 
     public static function htmlSpecialChars($str, $flags = ENT_COMPAT, $encoding = null, $double_encode = true)

xoops_trust_path/libs/altsys/class/D3LanguageManager.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     }
 
     /**
-     * @param      $resource
+     * @param      string $resource
      * @param      $mydirname
      * @param null $mytrustdirname
      * @param bool $read_once

Spacing +9 added lines, -9 removed lines

@@ -29,9 +29,9 @@ 
     {
         $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']);
 
-        $this->salt = mb_substr(md5(XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX), 0, 6);
+        $this->salt = mb_substr(md5(XOOPS_ROOT_PATH.XOOPS_DB_USER.XOOPS_DB_PREFIX), 0, 6);
 
-        $this->cache_path = XOOPS_TRUST_PATH . '/cache';
+        $this->cache_path = XOOPS_TRUST_PATH.'/cache';
 
         if (defined('ALTSYS_MYLANGUAGE_ROOT_PATH') && file_exists(ALTSYS_MYLANGUAGE_ROOT_PATH)) {
             $this->my_language = ALTSYS_MYLANGUAGE_ROOT_PATH;
@@ -67,7 +67,7 @@ 
 
     public function read($resource, $mydirname, $mytrustdirname = null, $read_once = true)
     {
-        $d3file = XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/mytrustdirname.php';
+        $d3file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php';
 
         if (empty($mytrustdirname) && is_file($d3file)) {
             require $d3file;
@@ -79,12 +79,12 @@ 
 
         $cache_file = $this->getCacheFileName($resource, $mydirname);
 
-        $root_file = XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/language/' . $this->language . '/' . $resource;
+        $root_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->language.'/'.$resource;
 
         // language overriding by XOOPS_ROOT_PATH/my_language
 
         if ($this->my_language) {
-            $mylang_file = $this->my_language . '/modules/' . $mydirname . '/' . $this->language . '/' . $resource;
+            $mylang_file = $this->my_language.'/modules/'.$mydirname.'/'.$this->language.'/'.$resource;
 
             if (is_file($mylang_file)) {
                 require_once $mylang_file;
@@ -98,7 +98,7 @@ 
         if (empty($mytrustdirname)) {
             // conventional module
 
-            $default_file = XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/language/' . $this->default_language . '/' . $resource;
+            $default_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->default_language.'/'.$resource;
 
             if (is_file($cache_file)) {
                 require_once $cache_file;
@@ -112,9 +112,9 @@ 
         } else {
             // D3 modules
 
-            $trust_file = XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/language/' . $this->language . '/' . $resource;
+            $trust_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->language.'/'.$resource;
 
-            $default_file = XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/language/' . $this->default_language . '/' . $resource;
+            $default_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->default_language.'/'.$resource;
 
             if (is_file($cache_file)) {
                 require_once $cache_file;
@@ -155,6 +155,6 @@ 
             $language = $this->language;
         }
 
-        return $this->cache_path . '/' . $this->cache_prefix . '_' . $this->salt . '_' . $mydirname . '_' . $language . '_' . $resource;
+        return $this->cache_path.'/'.$this->cache_prefix.'_'.$this->salt.'_'.$mydirname.'_'.$language.'_'.$resource;
     }
 }

xoops_trust_path/libs/altsys/class/D3NotificationHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      * @param array $extra_tags
      * @param array $user_list
      * @param null  $omit_user_id
-     * @return bool|void
+     * @return null|false
      */
 
     public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags = [], $user_list = [], $omit_user_id = null)

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 
 // notification handler for D3 modules
 
-require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+require_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
 
 /**
  * Class D3NotificationHandler
@@ -39,9 +39,9 @@ 
     {
         global $xoopsConfig;
 
-        $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+        $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname;
 
-        $mytrustdirpath = XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname;
+        $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname;
 
         $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
@@ -177,13 +177,13 @@ 
 
         $tags['X_MODULE'] = $module->getVar('name', 'n');
 
-        $tags['X_MODULE_URL'] = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/';
+        $tags['X_MODULE_URL'] = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/';
 
         $tags['X_NOTIFY_CATEGORY'] = $category;
 
         $tags['X_NOTIFY_EVENT'] = $event;
 
-        $template = $event_info['mail_template'] . '.tpl';
+        $template = $event_info['mail_template'].'.tpl';
 
         $subject = $event_info['mail_subject'];
 
@@ -202,7 +202,7 @@ 
 
                 // TODO: don't show unsubscribe link if it is 'one-time' ??
 
-                $tags['X_UNSUBSCRIBE_URL'] = XOOPS_URL . '/notifications.php';
+                $tags['X_UNSUBSCRIBE_URL'] = XOOPS_URL.'/notifications.php';
 
                 $tags = array_merge($tags, $extra_tags);
 

xoops_trust_path/libs/altsys/class/d3utilities.php

Doc Comments +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param $options
      * @param $current_value
      * @return string

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 
         $this->mydirname = $mydirname;
 
-        $this->table = $db->prefix($mydirname ? $mydirname . '_' . $table_body : $table_body);
+        $this->table = $db->prefix($mydirname ? $mydirname.'_'.$table_body : $table_body);
 
         $this->primary_key = $primary_key;
 
@@ -63,7 +63,7 @@ 
 
     public function get_language_constant($name)
     {
-        return constant(mb_strtoupper('_MD_A_' . $this->dirname . '_' . $this->page_name . '_' . $name));
+        return constant(mb_strtoupper('_MD_A_'.$this->dirname.'_'.$this->page_name.'_'.$name));
     }
 
     /**
@@ -79,13 +79,13 @@ 
             case 'blob':
                 $length = empty($col['length']) ? 65535 : (int)$col['length'];
 
-                return "`{$col['name']}`='" . addslashes(xoops_substr($value, 0, $length)) . "'";
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'char':
             case 'varchar':
             case 'string':
                 $length = empty($col['length']) ? 255 : (int)$col['length'];
 
-                return "`{$col['name']}`='" . addslashes(xoops_substr($value, 0, $length)) . "'";
+                return "`{$col['name']}`='".addslashes(xoops_substr($value, 0, $length))."'";
             case 'int':
             case 'integer':
                 $value = (int)$value;
@@ -123,21 +123,21 @@ 
                 continue;
             }
 
-            $set4sql .= $this->get_set4sql(@$_POST[$col['name']], $col) . ',';
+            $set4sql .= $this->get_set4sql(@$_POST[$col['name']], $col).',';
         }
 
         if (!empty($set4sql)) {
             if ($id > 0) {
                 // UPDATE
 
-                $db->queryF("UPDATE $this->table SET " . mb_substr($set4sql, 0, -1) . " WHERE $this->primary_key='" . addslashes($id) . "'");
+                $db->queryF("UPDATE $this->table SET ".mb_substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'");
 
                 return [$id, 'update'];
             }
 
             // INSERT
 
-            $db->queryF("INSERT INTO $this->table SET " . mb_substr($set4sql, 0, -1));
+            $db->queryF("INSERT INTO $this->table SET ".mb_substr($set4sql, 0, -1));
 
             return [$db->getInsertId(), 'insert'];
         }
@@ -170,7 +170,7 @@ 
         $ret = [];
 
         foreach (array_keys($_POST[$column4key]) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
+            $id = (int)$id; // primary_key should be 'integer'
 
             $set4sql = '';
 
@@ -183,14 +183,14 @@ 
                     continue;
                 }
 
-                $set4sql .= $this->get_set4sql(@$_POST[$col['name']][$id], $col) . ',';
+                $set4sql .= $this->get_set4sql(@$_POST[$col['name']][$id], $col).',';
             }
 
             if (!empty($set4sql)) {
                 $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
 
                 if (1 == $db->getRowsNum($result)) {
-                    $db->queryF("UPDATE $this->table SET " . mb_substr($set4sql, 0, -1) . " WHERE $this->primary_key=$id");
+                    $db->queryF("UPDATE $this->table SET ".mb_substr($set4sql, 0, -1)." WHERE $this->primary_key=$id");
 
                     if (1 == $db->getAffectedRows()) {
                         $ret[$id] = $db->fetchArray($result);
@@ -215,7 +215,7 @@ 
         $ret = [];
 
         foreach (array_keys($_POST['admin_main_checkboxes']) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
+            $id = (int)$id; // primary_key should be 'integer'
 
             $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
 
@@ -227,13 +227,13 @@ 
                 if ($delete_comments) {
                     // remove comments
 
-                    $db->queryF('DELETE FROM ' . $db->prefix('xoopscomments') . " WHERE com_modid=$this->mid AND com_itemid=$id");
+                    $db->queryF('DELETE FROM '.$db->prefix('xoopscomments')." WHERE com_modid=$this->mid AND com_itemid=$id");
                 }
 
                 if ($delete_notifications) {
                     // remove notifications
 
-                    $db->queryF('DELETE FROM ' . $db->prefix('xoopsnotifications') . " WHERE not_modid=$this->mid AND not_itemid=$id");
+                    $db->queryF('DELETE FROM '.$db->prefix('xoopsnotifications')." WHERE not_modid=$this->mid AND not_itemid=$id");
                 }
             }
         }
@@ -314,7 +314,7 @@ 
                 default:
                     $size = empty($col['edit_size']) ? 32 : (int)$col['edit_size'];
                     $length = empty($col['length']) ? 255 : (int)$col['length'];
-                    $lines[$col['name']] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='" . htmlspecialchars($col['default_value'], ENT_QUOTES) . "' />";
+                    $lines[$col['name']] = "<input type='text' name='{$col['name']}' size='$size' maxlength='$length' value='".htmlspecialchars($col['default_value'], ENT_QUOTES)."' />";
                     break;
                 case false:
                     $lines[$col['name']] = htmlspecialchars($col['default_value'], ENT_QUOTES);
@@ -354,7 +354,7 @@ 
             <form action='' method='get' name='admin_control' id='admin_control'>
                 $hiddens
                 $controllers_html
-                <input type='submit' value='" . _SUBMIT . "' />
+                <input type='submit' value='"._SUBMIT."' />
             </form>\n";
     }
 
@@ -367,12 +367,12 @@ 
 
     public function get_select($name, $options, $current_value)
     {
-        $ret = "<select name='" . htmlspecialchars($name, ENT_QUOTES) . "'>\n";
+        $ret = "<select name='".htmlspecialchars($name, ENT_QUOTES)."'>\n";
 
         foreach ($options as $key => $val) {
             $selected = $val == $current_value ? "selected='selected'" : '';
 
-            $ret .= "<option value='" . htmlspecialchars($key, ENT_QUOTES) . "' $selected>" . htmlspecialchars($val, ENT_QUOTES) . "</option>\n";
+            $ret .= "<option value='".htmlspecialchars($key, ENT_QUOTES)."' $selected>".htmlspecialchars($val, ENT_QUOTES)."</option>\n";
         }
 
         $ret .= "</select>\n";

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

Doc Comments +2 added lines, -2 removed lines

@@ -1145,7 +1145,7 @@ 
     }
 
     /**
-     * @param        $bid
+     * @param        integer $bid
      * @param string $mode
      */
 
@@ -1353,7 +1353,7 @@ 
 
     /**
      * @param $bctype
-     * @return mixed|string
+     * @return string
      */
 
     public function get_blockname_from_ctype($bctype)

Indentation +27 added lines, -27 removed lines

@@ -117,7 +117,7 @@ 
 
             $moduleHandler = xoops_getHandler('module');
 
-         if (! empty($_GET['dirname'])) {
+            if (! empty($_GET['dirname'])) {
                 $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', \Xmf\Request::getString('dirname', '', 'GET'));
 
                 $target_module = $moduleHandler->getByDirname($dirname);
@@ -558,12 +558,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
@@ -573,14 +573,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.html');
     }
@@ -1274,18 +1274,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.html');

Spacing +45 added lines, -45 removed lines

@@ -117,7 +117,7 @@ 
 
             $moduleHandler = xoops_getHandler('module');
 
-         if (! empty($_GET['dirname'])) {
+         if (!empty($_GET['dirname'])) {
                 $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', \Xmf\Request::getString('dirname', '', 'GET'));
 
                 $target_module = $moduleHandler->getByDirname($dirname);
@@ -128,7 +128,7 @@ 
 
                 $this->target_mid = $target_module->getVar('mid');
 
-                $this->target_mname = $target_module->getVar('name') . ' ' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
+                $this->target_mname = $target_module->getVar('name').' '.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
 
                 $this->target_dirname = $target_module->getVar('dirname');
 
@@ -138,9 +138,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
 
@@ -154,28 +154,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
@@ -301,7 +301,7 @@ 
         } else {
             // origined 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 = [];
 
@@ -370,7 +370,7 @@ 
         } 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 = [];
 
@@ -473,31 +473,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>
     ';
     }
 
@@ -509,7 +509,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);
 
@@ -568,7 +568,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();
 
@@ -595,7 +595,7 @@ 
             return [];
         }
 
-        include XOOPS_ROOT_PATH . '/modules/' . $this->target_dirname . '/xoops_version.php';
+        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php';
 
         if (empty($modversion['blocks'])) {
             return [];
@@ -608,7 +608,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);
 
@@ -645,9 +645,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) {
@@ -719,27 +719,27 @@ 
         $msg = _MD_A_MYBLOCKSADMIN_DBUPDATED;
 
         if (false != $block->store()) {
-            include_once XOOPS_ROOT_PATH . '/class/template.php';
+            include_once XOOPS_ROOT_PATH.'/class/template.php';
 
             $xoopsTpl = new XoopsTpl();
 
             $xoopsTpl->xoops_setCaching(2);
 
             if ('' != $block->getVar('template')) {
-                if ($xoopsTpl->is_cached('db:' . $block->getVar('template'))) {
-                    if (!$xoopsTpl->clear_cache('db:' . $block->getVar('template'))) {
-                        $msg = 'Unable to clear cache for block ID' . $bid;
+                if ($xoopsTpl->is_cached('db:'.$block->getVar('template'))) {
+                    if (!$xoopsTpl->clear_cache('db:'.$block->getVar('template'))) {
+                        $msg = 'Unable to clear cache for block ID'.$bid;
                     }
                 }
             } else {
-                if ($xoopsTpl->is_cached('db:system_dummy.html', 'blk_' . $bid)) {
-                    if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'blk_' . $bid)) {
-                        $msg = 'Unable to clear cache for block ID' . $bid;
+                if ($xoopsTpl->is_cached('db:system_dummy.html', 'blk_'.$bid)) {
+                    if (!$xoopsTpl->clear_cache('db:system_dummy.html', '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;
@@ -1078,7 +1078,7 @@ 
         do {
             $func_num--;
 
-            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM ' . $this->db->prefix('newblocks') . ' WHERE mid=' . (int)$mid . ' AND func_num=' . $func_num));
+            list($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;
@@ -1121,7 +1121,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);
             }
@@ -1259,7 +1259,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();
 
@@ -1268,7 +1268,7 @@ 
         if (defined('XOOPS_CUBE_LEGACY')) {
             $tpl->assign('xoops_cube_legacy', true);
 
-            include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+            include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         } else {
             $tpl->assign('xoops_cube_legacy', false);
         }
@@ -1300,7 +1300,7 @@ 
 
     public function checkFck()
     {
-        return file_exists(XOOPS_ROOT_PATH . '/common/fckeditor/fckeditor.js');
+        return file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js');
     }
 
     /**
@@ -1373,14 +1373,14 @@ 
         // 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']);
 
-        if (! empty($_POST['preview'])) {
+        if (!empty($_POST['preview'])) {
             // preview
 
             $this->preview_request = $this->fetchRequest4Block($bid);
@@ -1407,12 +1407,12 @@ 
         } 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;
     }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForICMS.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
     // private
 
     /**
-     * @param $target_side
+     * @param integer $target_side
      * @param $block_data
      * @return string
      */
@@ -156,7 +156,7 @@ 
 
     /**
      * @param       $block_data
-     * @param array $skip_sides
+     * @param integer[] $skip_sides
      * @return string
      */
 

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__ . '/MyBlocksAdmin.class.php';
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 /**
  * Class MyBlocksAdminForICMS
@@ -17,9 +17,9 @@ 
     {
         parent::construct();
 
-        @include_once XOOPS_ROOT_PATH . '/modules/system/language/' . $this->lang . '/admin/blocksadmin.php';
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
 
-        $result = $this->db->query('SELECT id,pname,title FROM ' . $this->db->prefix('block_positions'));
+        $result = $this->db->query('SELECT id,pname,title FROM '.$this->db->prefix('block_positions'));
 
         while (list($id, $pname, $title) = $this->db->fetchRow($result)) {
             $this->block_positions[$id] = defined($title) ? constant($title) : $title;
@@ -71,12 +71,12 @@ 
         } else {
             // origined from the table of `block_module_link`
 
-            $result = $this->db->query('SELECT module_id,page_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'");
+            $result = $this->db->query('SELECT module_id,page_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
 
             $selected_pages = [];
 
             while (list($mid, $pid) = $this->db->fetchRow($result)) {
-                $selected_pages[] = (int)$mid . '-' . (int)$pid;
+                $selected_pages[] = (int)$mid.'-'.(int)$pid;
             }
         }
 
@@ -84,7 +84,7 @@ 
 
         $ret = "
                 <select name='bmodules[$bid][]' size='5' multiple='multiple'>
-                    " . $page_handler->getPageSelOptions($selected_pages) . '
+                    ".$page_handler->getPageSelOptions($selected_pages).'
                 </select>';
 
         return $ret;
@@ -104,19 +104,19 @@ 
         return "
     <table>
         <tr>
-            <td rowspan='2'>" . $this->renderRadio4BlockPosition(1, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(4, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(5, $block_data) . "</td>
-            <td rowspan='2'>" . $this->renderRadio4BlockPosition(2, $block_data) . '</td>
+            <td rowspan='2'>" . $this->renderRadio4BlockPosition(1, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(4, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(5, $block_data)."</td>
+            <td rowspan='2'>" . $this->renderRadio4BlockPosition(2, $block_data).'</td>
         </tr>
         <tr>
-            <td>' . $this->renderRadio4BlockPosition(6, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+            <td>' . $this->renderRadio4BlockPosition(6, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
         </tr>
         <tr>
-            <td colspan='5'>" . $this->renderRadio4BlockPositions($block_data, [1, 2, 3, 4, 5, 6, 7, 8]) . '</td>
+            <td colspan='5'>" . $this->renderRadio4BlockPositions($block_data, [1, 2, 3, 4, 5, 6, 7, 8]).'</td>
         </tr>
     </table>';
     }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForX20S.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     // private
 
     /**
-     * @param $target_side
+     * @param integer $target_side
      * @param $block_data
      * @return string
      */

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__ . '/MyBlocksAdmin.class.php';
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 /**
  * Class MyBlocksAdminForX20S
@@ -17,7 +17,7 @@ 
     {
         parent::construct();
 
-        @include_once XOOPS_ROOT_PATH . '/modules/system/language/' . $this->lang . '/admin/blocksadmin.php';
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
 
         $this->block_positions = [
             -1 => _NONE,
@@ -67,19 +67,19 @@ 
         return "
     <table style='width:80px;'>
         <tr>
-            <td rowspan='2'>" . $this->renderRadio4BlockPosition(0, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(5, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(4, $block_data) . "</td>
-            <td rowspan='2'>" . $this->renderRadio4BlockPosition(1, $block_data) . '</td>
+            <td rowspan='2'>" . $this->renderRadio4BlockPosition(0, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(5, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(4, $block_data)."</td>
+            <td rowspan='2'>" . $this->renderRadio4BlockPosition(1, $block_data).'</td>
         </tr>
         <tr>
-            <td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(9, $block_data) . '</td>
-            <td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+            <td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(9, $block_data).'</td>
+            <td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
         </tr>
         <tr>
-            <td colspan='5'>" . $this->renderRadio4BlockPosition(-1, $block_data) . _NONE . '</td>
+            <td colspan='5'>" . $this->renderRadio4BlockPosition(-1, $block_data)._NONE.'</td>
         </tr>
     </table>';
     }

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

Doc Comments +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
     }
 
     /**
-     * @param $dirname
-     * @param $fileBodyName
+     * @param string $dirname
+     * @param string $fileBodyName
      */
 
     public function _loadLanguage($dirname, $fileBodyName)

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
@@ -33,8 +33,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
@@ -47,7 +47,7 @@ 
 
     public function prepare()
     {
-        $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');
@@ -75,12 +75,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;
@@ -95,7 +95,7 @@ 
 
         // read normal
 
-        $this->langman->read($fileBodyName . '.php', $dirname);
+        $this->langman->read($fileBodyName.'.php', $dirname);
     }
 
     /**
@@ -107,7 +107,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/include/altsys_functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -130,8 +130,8 @@
 }
 
 /**
- * @param $mid
- * @param $coretype
+ * @param integer $mid
+ * @param integer|null $coretype
  * @return string
  */
 function altsys_get_link2modpreferences($mid, $coretype)

Spacing +16 added lines, -16 removed lines

@@ -45,17 +45,17 @@ 
     global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
 
     $mymenu_find_paths = [
-        $mydirpath . '/admin/mymenu.php',
-        $mydirpath . '/mymenu.php',
-        $mytrustdirpath . '/admin/mymenu.php',
-        $mytrustdirpath . '/mymenu.php',
+        $mydirpath.'/admin/mymenu.php',
+        $mydirpath.'/mymenu.php',
+        $mytrustdirpath.'/admin/mymenu.php',
+        $mytrustdirpath.'/mymenu.php',
     ];
 
     foreach ($mymenu_find_paths as $mymenu_find_path) {
         if (is_file($mymenu_find_path)) {
             include $mymenu_find_path;
 
-            include_once __DIR__ . '/adminmenu_functions.php';
+            include_once __DIR__.'/adminmenu_functions.php';
 
             altsys_adminmenu_insert_mymenu($xoopsModule);
 
@@ -73,14 +73,14 @@ 
 {
     $mylang = $GLOBALS['xoopsConfig']['language'];
 
-    if (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php';
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php')) {
-        include_once XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php';
-    } elseif (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php';
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php')) {
-        include_once XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php';
+    if (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
+    } elseif (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
     }
 }
 
@@ -144,9 +144,9 @@ 
         case ALTSYS_CORE_TYPE_X23P:
         case ALTSYS_CORE_TYPE_ICMS:
         default:
-            return XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
+            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
         case ALTSYS_CORE_TYPE_XCL21:
-            return XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
+            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid;
     }
 }
 
@@ -179,7 +179,7 @@ 
             continue;
         }
 
-        @unlink(XOOPS_COMPILE_PATH . '/' . $file);
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
     }
 
     closedir($dh);