mambax7 / altsys

xoops_trust_path/libs/altsys/include/gtickets.php

Doc Comments +3 added lines, -3 removed lines

@@ -191,7 +191,7 @@ 
          * @param bool   $post
          * @param string $area
          * @param bool   $allow_repost
-         * @return bool
+         * @return null|boolean
          */
 
         public function check($post = true, $area = '', $allow_repost = true)
@@ -362,9 +362,9 @@ 
         }
 
         /**
-         * @param $key_name
+         * @param string $key_name
          * @param $tmp_array
-         * @return array
+         * @return string[]
          */
 
         public function extract_post_recursive($key_name, $tmp_array)

Spacing +20 added lines, -20 removed lines

@@ -28,8 +28,8 @@ 
             // language file
 
             if (defined('XOOPS_ROOT_PATH') && !empty($xoopsConfig['language']) && !mb_strstr($xoopsConfig['language'], '/')) {
-                if (is_file(dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml')) {
-                    include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml';
+                if (is_file(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml')) {
+                    include dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml';
                 }
             }
 
@@ -60,7 +60,7 @@ 
 
         public function getTicketHtml($salt = '', $timeout = 1800, $area = '')
         {
-            return '<input type="hidden" name="XOOPS_G_TICKET" value="' . $this->issue($salt, $timeout, $area) . '" />';
+            return '<input type="hidden" name="XOOPS_G_TICKET" value="'.$this->issue($salt, $timeout, $area).'" />';
         }
 
         // returns an object of XoopsFormHidden including theh ticket
@@ -117,7 +117,7 @@ 
 
         public function getTicketParamString($salt = '', $noamp = false, $timeout = 1800, $area = '')
         {
-            return ($noamp ? '' : '&amp;') . 'XOOPS_G_TICKET=' . $this->issue($salt, $timeout, $area);
+            return ($noamp ? '' : '&amp;').'XOOPS_G_TICKET='.$this->issue($salt, $timeout, $area);
         }
 
         // issue a ticket
@@ -135,9 +135,9 @@ 
 
             if ('' === $salt) {
                 if (version_compare(PHP_VERSION, '7.0.0') >= 0 && function_exists('random_bytes')) {
-                    $salt = '$2y$07$' . str_replace('+', '.', base64_encode(random_bytes(self::PBKDF2_SALT_BYTES)));
+                    $salt = '$2y$07$'.str_replace('+', '.', base64_encode(random_bytes(self::PBKDF2_SALT_BYTES)));
                 } elseif (function_exists('mcrypt_create_iv')) {
-                    $salt = '$2y$07$' . str_replace('+', '.', base64_encode(mcrypt_create_iv(16, MCRYPT_DEV_URANDOM)));
+                    $salt = '$2y$07$'.str_replace('+', '.', base64_encode(mcrypt_create_iv(16, MCRYPT_DEV_URANDOM)));
                 }
             }
 
@@ -147,7 +147,7 @@ 
 
             $appendix_salt = empty($_SERVER['PATH']) ? XOOPS_DB_NAME : $_SERVER['PATH'];
 
-            $token = crypt($salt . $usec . $appendix_salt . $sec, $salt);
+            $token = crypt($salt.$usec.$appendix_salt.$sec, $salt);
 
             $this->_latest_token = $token;
 
@@ -182,7 +182,7 @@ 
 
             // paid md5ed token as a ticket
 
-            return md5($token . XOOPS_DB_PREFIX);
+            return md5($token.XOOPS_DB_PREFIX);
         }
 
         // check a ticket
@@ -228,7 +228,7 @@ 
                 // default lifetime 30min
 
                 if ($stub['expire'] >= time()) {
-                    if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                    if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                         $found_stub = $stub;
                     } else {
                         // store the other valid stubs into session
@@ -236,7 +236,7 @@ 
                         $_SESSION['XOOPS_G_STUBS'][] = $stub;
                     }
                 } else {
-                    if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                    if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                         // not CSRF but Time-Out
 
                         $timeout_flag = true;
@@ -321,7 +321,7 @@ 
 
             $table = '<table>';
 
-            $form = '<form action="?' . htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES) . '" method="post" >';
+            $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES).'" method="post" >';
 
             foreach ($_POST as $key => $val) {
                 if ('XOOPS_G_TICKET' == $key) {
@@ -343,22 +343,22 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . htmlspecialchars($key, ENT_QUOTES) . '</th><td>' . htmlspecialchars($val, ENT_QUOTES) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.htmlspecialchars($key, ENT_QUOTES).'</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . htmlspecialchars($key, ENT_QUOTES) . '" value="' . htmlspecialchars($val, ENT_QUOTES) . '" />' . "\n";
+                    $form .= '<input type="hidden" name="'.htmlspecialchars($key, ENT_QUOTES).'" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n";
                 }
             }
 
             $table .= '</table>';
 
-            $form .= $this->getTicketHtml(__LINE__, 300, $area) . '<input type="submit" value="' . $this->messages['btn_repost'] . '" /></form>';
+            $form .= $this->getTicketHtml(__LINE__, 300, $area).'<input type="submit" value="'.$this->messages['btn_repost'].'" /></form>';
 
             error_reporting(0);
 
             while (@ob_get_level() && @ob_end_clean()) {
             }
 
-            echo '<html><head><title>' . $this->messages['err_general'] . '</title><style>table,td,th {border:solid black 1px; border-collapse:collapse;}</style></head><body>' . sprintf($this->messages['fmt_prompt4repost'], $this->getErrors()) . $table . $form . '</body></html>';
+            echo '<html><head><title>'.$this->messages['err_general'].'</title><style>table,td,th {border:solid black 1px; border-collapse:collapse;}</style></head><body>'.sprintf($this->messages['fmt_prompt4repost'], $this->getErrors()).$table.$form.'</body></html>';
         }
 
         /**
@@ -379,7 +379,7 @@ 
                 }
 
                 if (is_array($val)) {
-                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name . '[' . htmlspecialchars($key, ENT_QUOTES) . ']', $val);
+                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES).']', $val);
 
                     $table .= $tmp_table;
 
@@ -389,9 +389,9 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES) . ']</th><td>' . htmlspecialchars($val, ENT_QUOTES) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']</th><td>'.htmlspecialchars($val, ENT_QUOTES).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES) . ']" value="' . htmlspecialchars($val, ENT_QUOTES) . '" />' . "\n";
+                    $form .= '<input type="hidden" name="'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES).']" value="'.htmlspecialchars($val, ENT_QUOTES).'" />'."\n";
                 }
             }
 
@@ -451,8 +451,8 @@ 
 
         public function errorHandler4FindOutput($errNo, $errStr, $errFile, $errLine)
         {
-            if (preg_match('?' . preg_quote(XOOPS_ROOT_PATH) . '([^:]+)\:(\d+)?', $errStr, $regs)) {
-                echo 'Irregular output! check the file ' . htmlspecialchars($regs[1], ENT_QUOTES | ENT_HTML5) . ' line ' . htmlspecialchars($regs[2], ENT_QUOTES | ENT_HTML5);
+            if (preg_match('?'.preg_quote(XOOPS_ROOT_PATH).'([^:]+)\:(\d+)?', $errStr, $regs)) {
+                echo 'Irregular output! check the file '.htmlspecialchars($regs[1], ENT_QUOTES | ENT_HTML5).' line '.htmlspecialchars($regs[2], ENT_QUOTES | ENT_HTML5);
             } else {
                 echo 'Irregular output! check language files etc.';
             }

xoops_trust_path/libs/altsys/include/mygrouppermform.php

Doc Comments +10 added lines, -4 removed lines

@@ -82,6 +82,12 @@ 
 
     //  public function MyXoopsGroupPermForm($title, $modid, $permname, $permdesc)
 
+    /**
+     * @param string $title
+     * @param integer $modid
+     * @param string $permname
+     * @param string $permdesc
+     */
     public function __construct($title, $modid, $permname, $permdesc)
     {
         //      $this->XoopsForm($title, 'groupperm_form', XOOPS_URL.'/modules/system/admin/groupperm.php', 'post'); GIJ
@@ -121,9 +127,9 @@ 
      * Add appendix
      *
      * @access public
-     * @param $permName
-     * @param $itemId
-     * @param $itemName
+     * @param string $permName
+     * @param integer $itemId
+     * @param string $itemName
      */
 
     public function addAppendix($permName, $itemId, $itemName)
@@ -311,7 +317,7 @@ 
     /**
      * Constructor
      * @param      $caption
-     * @param      $name
+     * @param      string $name
      * @param      $groupId
      * @param null $values
      */

Indentation +14 added lines, -14 removed lines

@@ -486,20 +486,20 @@
         }
 
         $tree .= ' />'
-                 . $option['name']
-                 . '<input type="hidden" name="'
-                 . $this->getName()
-                 . '[parents]['
-                 . $option['id']
-                 . ']" value="'
-                 . implode(':', $parentIds)
-                 . '" /><input type="hidden" name="'
-                 . $this->getName()
-                 . '[itemname]['
-                 . $option['id']
-                 . ']" value="'
-                 . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
-                 . "\" /><br />\n";
+                    . $option['name']
+                    . '<input type="hidden" name="'
+                    . $this->getName()
+                    . '[parents]['
+                    . $option['id']
+                    . ']" value="'
+                    . implode(':', $parentIds)
+                    . '" /><input type="hidden" name="'
+                    . $this->getName()
+                    . '[itemname]['
+                    . $option['id']
+                    . ']" value="'
+                    . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
+                    . "\" /><br />\n";
 
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {

Spacing +21 added lines, -21 removed lines

@@ -18,11 +18,11 @@ 
     exit;
 }
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
 
 /**
  * Renders a form for setting module specific group permissions
@@ -188,13 +188,13 @@ 
 
             $selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
 
-            $ele = new MyXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele = new MyXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
 
             $ele->setOptionTree($this->_itemTree);
 
             // GIJ start
 
-            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\[' . $i . '\]/)){elements[i].checked=this.checked;}}};">');
+            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">');
 
             // GIJ_end
 
@@ -237,9 +237,9 @@ 
 
         $this->addElement($tray);
 
-        $ret = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br />';
+        $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
 
-        $ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1'>\n";
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
 
         $elements = &$this->getElements();
 
@@ -249,21 +249,21 @@ 
             } elseif (!$elements[$i]->isHidden()) {
                 // group name
 
-                $ret .= "<tr valign='top' align='" . _GLOBAL_LEFT . "'><td class='head'>" . $elements[$i]->getCaption();
+                $ret .= "<tr valign='top' align='"._GLOBAL_LEFT."'><td class='head'>".$elements[$i]->getCaption();
 
                 // group description
 
                 if ('' != $elements[$i]->getDescription()) {
-                    $ret .= '<br /><br /><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                    $ret .= '<br /><br /><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
 
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $ret .= $elements[$i]->render();
             }
         }
 
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
 
         return $ret;
     }
@@ -396,7 +396,7 @@ 
 
                 $checked = $append['selected'] ? 'checked="checked"' : '';
 
-                $name = 'perms[' . $append['permname'] . ']';
+                $name = 'perms['.$append['permname'].']';
 
                 $itemid = $append['itemid'];
 
@@ -428,7 +428,7 @@ 
 
                 $this->_renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
 
-                $ret .= $tree . '</td>';
+                $ret .= $tree.'</td>';
 
                 $cols++;
             }
@@ -451,7 +451,7 @@ 
 
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
     {
-        $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+        $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
 
         // If there are parent elements, add javascript that will
 
@@ -460,9 +460,9 @@ 
         // sure permissions to parent items are added as well.
 
         foreach ($parentIds as $pid) {
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
 
-            $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if(ele.checked != true) {ele.checked = this.checked;}";
         }
 
         // If there are child elements, add javascript that will
@@ -474,9 +474,9 @@ 
         // is no permission to this item.
 
         foreach ($option['allchild'] as $cid) {
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
 
-            $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked != true) {ele.checked = false;}";
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if(this.checked != true) {ele.checked = false;}";
         }
 
         $tree .= '" value="1"';
@@ -505,7 +505,7 @@ 
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);
 
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }

xoops_trust_path/libs/altsys/include/Text_Diff.php

Doc Comments +5 added lines, -5 removed lines

@@ -532,7 +532,7 @@ 
      * @param $xlim
      * @param $yoff
      * @param $ylim
-     * @param $nchunks
+     * @param double $nchunks
      * @return array
      */
 
@@ -692,10 +692,10 @@ 
      *
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
-     * @param $xoff
-     * @param $xlim
-     * @param $yoff
-     * @param $ylim
+     * @param integer $xoff
+     * @param integer $xlim
+     * @param integer $yoff
+     * @param integer $ylim
      */
 
     public function _compareseq($xoff, $xlim, $yoff, $ylim)

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php

Doc Comments +5 added lines, -5 removed lines

@@ -145,10 +145,10 @@ 
     }
 
     /**
-     * @param $xbeg
-     * @param $xlen
-     * @param $ybeg
-     * @param $ylen
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
      * @param $edits
      * @return string
      */
@@ -217,7 +217,7 @@ 
     }
 
     /**
-     * @param $header
+     * @param string $header
      * @return string
      */
 

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
     public function __construct($params = [])
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
 
             if (isset($this->$v)) {
                 $this->$v = $value;
@@ -141,7 +141,7 @@ 
             $output .= $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     /**
@@ -174,7 +174,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     /**
@@ -206,14 +206,14 @@ 
     public function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
 
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     /**
@@ -223,7 +223,7 @@ 
 
     public function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     /**
@@ -243,7 +243,7 @@ 
 
     public function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     /**
@@ -284,6 +284,6 @@ 
 
     public function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 }

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer_inline.php

Doc Comments +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
     }
 
     /**
-     * @param        $lines
+     * @param        string[] $lines
      * @param string $prefix
      * @param bool   $encode
      * @return string
@@ -188,8 +188,8 @@ 
     }
 
     /**
-     * @param        $string
-     * @param string $newlineEscape
+     * @param        string $string
+     * @param string string
      * @return array
      */
 

Spacing +5 added lines, -5 removed lines

@@ -101,7 +101,7 @@ 
             return implode('', $lines);
         }
 
-        return implode("\n", $lines) . "\n";
+        return implode("\n", $lines)."\n";
     }
 
     /**
@@ -113,7 +113,7 @@ 
     {
         array_walk($lines, [&$this, '_encode']);
 
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
 
         $lines[count($lines) - 1] .= $this->_ins_suffix;
 
@@ -130,7 +130,7 @@ 
     {
         array_walk($lines, [&$this, '_encode']);
 
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
 
         $lines[count($lines) - 1] .= $this->_del_suffix;
 
@@ -161,7 +161,7 @@ 
                 $final[0] = mb_substr($final[0], 1);
             }
 
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -184,7 +184,7 @@ 
 
         /* Run the diff and get the output. */
 
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
     }
 
     /**

xoops_trust_path/libs/altsys/put_templates.php

Spacing +5 added lines, -5 removed lines

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

xoops_trust_path/libs/altsys/mytplsform.php

Indentation +10 added lines, -10 removed lines

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

Spacing +46 added lines, -46 removed lines

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

xoops_trust_path/libs/altsys/get_templates.php

Spacing +7 added lines, -7 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 
 // Keep Block option values when update (by nobunobu) for XOOPS 2.0.x
 global $xoopsDB;
-$query = 'SELECT mid FROM ' . $xoopsDB->prefix('modules') . " WHERE dirname='" . $modversion['dirname'] . "' ";
+$query = 'SELECT mid FROM '.$xoopsDB->prefix('modules')." WHERE dirname='".$modversion['dirname']."' ";
 $result = $xoopsDB->query($query);
 $record = $xoopsDB->fetchArray($result);
 if ($record) {
@@ -55,20 +55,20 @@ 
         }
     } */
 
-    $sql = 'SELECT * FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $mid . " AND block_type <>'D' AND func_num > $count";
+    $sql = 'SELECT * FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$mid." AND block_type <>'D' AND func_num > $count";
 
     $fresult = $xoopsDB->query($sql);
 
     while (false !== ($fblock = $xoopsDB->fetchArray($fresult))) {
-        $local_msgs[] = 'Non Defined Block <b>' . $fblock['name'] . '</b> will be deleted';
+        $local_msgs[] = 'Non Defined Block <b>'.$fblock['name'].'</b> will be deleted';
 
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('newblocks') . " WHERE bid='" . $fblock['bid'] . "'";
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('newblocks')." WHERE bid='".$fblock['bid']."'";
 
         $iret = $xoopsDB->query($sql);
     }
 
     for ($i = 1; $i <= $count; ++$i) {
-        $sql = 'SELECT name,options FROM ' . $xoopsDB->prefix('newblocks') . ' WHERE mid=' . $mid . ' AND func_num=' . $i . " AND show_func='" . addslashes($modversion['blocks'][$i]['show_func']) . "' AND func_file='" . addslashes($modversion['blocks'][$i]['file']) . "'";
+        $sql = 'SELECT name,options FROM '.$xoopsDB->prefix('newblocks').' WHERE mid='.$mid.' AND func_num='.$i." AND show_func='".addslashes($modversion['blocks'][$i]['show_func'])."' AND func_file='".addslashes($modversion['blocks'][$i]['file'])."'";
 
         $fresult = $xoopsDB->query($sql);
 
@@ -82,7 +82,7 @@ 
             if (count($old_vals) == count($def_vals)) {
                 $modversion['blocks'][$i]['options'] = $fblock['options'];
 
-                $local_msgs[] = "Option's values of the block <b>" . $fblock['name'] . '</b> will be kept. (value = <b>' . $fblock['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be kept. (value = <b>'.$fblock['options'].'</b>)';
             } elseif (count($old_vals) < count($def_vals)) {
                 for ($j = 0; $j < count($old_vals); $j++) {
                     $def_vals[$j] = $old_vals[$j];
@@ -90,9 +90,9 @@ 
 
                 $modversion['blocks'][$i]['options'] = implode('|', $def_vals);
 
-                $local_msgs[] = "Option's values of the block <b>" . $fblock['name'] . '</b> will be kept and new option(s) are added. (value = <b>' . $modversion['blocks'][$i]['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be kept and new option(s) are added. (value = <b>'.$modversion['blocks'][$i]['options'].'</b>)';
             } else {
-                $local_msgs[] = "Option's values of the block <b>" . $fblock['name'] . '</b> will be reset to the default, because of some decrease of options. (value = <b>' . $modversion['blocks'][$i]['options'] . '</b>)';
+                $local_msgs[] = "Option's values of the block <b>".$fblock['name'].'</b> will be reset to the default, because of some decrease of options. (value = <b>'.$modversion['blocks'][$i]['options'].'</b>)';
             }
         }
     }