mambax7 / altsys

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

Spacing +11 added lines, -11 removed lines

@@ -14,21 +14,21 @@ 
 foreach ($tplsadmin_autoupdate_dirnames as $dirname) {
     $dirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $dirname);
 
-    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/templates';
+    $tplsadmin_autoupdate_path = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates';
 
     // modules
 
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (false !== ($file = readdir($handler))) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
 
             if (is_file($file_path) && '.tpl' == mb_substr($file, -5)) {
-                $mtime = (int) (@filemtime($file_path));
+                $mtime = (int)(@filemtime($file_path));
 
-                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime"));
+                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
 
                 if ($count <= 0) {
-                    require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                     tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }
@@ -38,17 +38,17 @@ 
 
     // blocks
 
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/blocks/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/blocks/')) {
         while (false !== ($file = readdir($handler))) {
-            $file_path = $tplsadmin_autoupdate_path . '/blocks/' . $file;
+            $file_path = $tplsadmin_autoupdate_path.'/blocks/'.$file;
 
             if (is_file($file_path) && '.tpl' == mb_substr($file, -5)) {
-                $mtime = (int) (@filemtime($file_path));
+                $mtime = (int)(@filemtime($file_path));
 
-                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime"));
+                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
 
                 if ($count <= 0) {
-                    require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                     tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
                 }

xoops_trust_path/libs/altsys/include/Text_Diff.php

Spacing +3 added lines, -3 removed lines

@@ -557,7 +557,7 @@ 
                 }
             }
 
-            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
 
             for (; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
@@ -608,7 +608,7 @@ 
         $ymid = $ymids[$this->lcs];
 
         for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
+            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
 
             $y1 = $ymid[$n] + 1;
 
@@ -639,7 +639,7 @@ 
         $beg = 1;
 
         while ($beg < $end) {
-            $mid = (int) (($beg + $end) / 2);
+            $mid = (int)(($beg + $end) / 2);
 
             if ($ypos > $this->seq[$mid]) {
                 $beg = $mid + 1;

xoops_trust_path/libs/altsys/include/altsys_functions.php

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;
 
-            require_once __DIR__ . '/adminmenu_functions.php';
+            require_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')) {
-        require_once XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php';
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php')) {
-        require_once XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php';
-    } elseif (is_file(XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php')) {
-        require_once XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php';
-    } elseif (is_file(XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php')) {
-        require_once XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php';
+    if (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
+        require_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
+    } elseif (is_file(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
+        require_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
+    } elseif (is_file(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
+        require_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);

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

Spacing +6 added lines, -6 removed lines

@@ -5,19 +5,19 @@
 }
 
 // templates/ under the theme
-$tplsadmin_autoupdate_path = XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/templates';
+$tplsadmin_autoupdate_path = XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/templates';
 
-if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
     while (false !== ($file = readdir($handler))) {
-        $file_path = $tplsadmin_autoupdate_path . '/' . $file;
+        $file_path = $tplsadmin_autoupdate_path.'/'.$file;
 
         if (is_file($file_path) && '.tpl' == mb_substr($file, -5)) {
-            $mtime = (int) (@filemtime($file_path));
+            $mtime = (int)(@filemtime($file_path));
 
-            [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($file) . "' AND tpl_lastmodified >= $mtime"));
+            [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($file)."' AND tpl_lastmodified >= $mtime"));
 
             if ($count <= 0) {
-                require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                 tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime);
             }

xoops_trust_path/libs/altsys/include/gtickets.php

Spacing +20 added lines, -20 removed lines

@@ -27,8 +27,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';
                 }
             }
 
@@ -59,7 +59,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
@@ -116,7 +116,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
@@ -134,9 +134,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)));
                 }
             }
 
@@ -146,7 +146,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;
 
@@ -181,7 +181,7 @@ 
 
             // paid md5ed token as a ticket
 
-            return md5($token . XOOPS_DB_PREFIX);
+            return md5($token.XOOPS_DB_PREFIX);
         }
 
         // check a ticket
@@ -227,14 +227,14 @@ 
                 // 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
 
                         $_SESSION['XOOPS_G_STUBS'][] = $stub;
                     }
-                } elseif (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
+                } elseif (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
                         // not CSRF but Time-Out
 
                         $timeout_flag = true;
@@ -318,7 +318,7 @@ 
 
             $table = '<table>';
 
-            $form = '<form action="?' . htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES | ENT_HTML5) . '" method="post" >';
+            $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES | ENT_HTML5).'" method="post" >';
 
             foreach ($_POST as $key => $val) {
                 if ('XOOPS_G_TICKET' == $key) {
@@ -340,22 +340,22 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . '</th><td>' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).'</th><td>'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . '" value="' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '">' . "\n";
+                    $form .= '<input type="hidden" name="'.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).'" value="'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'">'."\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>';
         }
 
         /**
@@ -376,7 +376,7 @@ 
                 }
 
                 if (is_array($val)) {
-                    [$tmp_table, $tmp_form] = $this->extract_post_recursive($key_name . '[' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . ']', $val);
+                    [$tmp_table, $tmp_form] = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).']', $val);
 
                     $table .= $tmp_table;
 
@@ -386,9 +386,9 @@ 
                         $val = stripslashes($val);
                     }
 
-                    $table .= '<tr><th>' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . ']</th><td>' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '</td></tr>' . "\n";
+                    $table .= '<tr><th>'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).']</th><td>'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'</td></tr>'."\n";
 
-                    $form .= '<input type="hidden" name="' . $key_name . '[' . htmlspecialchars($key, ENT_QUOTES | ENT_HTML5) . ']" value="' . htmlspecialchars($val, ENT_QUOTES | ENT_HTML5) . '">' . "\n";
+                    $form .= '<input type="hidden" name="'.$key_name.'['.htmlspecialchars($key, ENT_QUOTES | ENT_HTML5).']" value="'.htmlspecialchars($val, ENT_QUOTES | ENT_HTML5).'">'."\n";
                 }
             }
 
@@ -448,8 +448,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/formcheckboxgroup.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 /**
  * Parent
  */
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php';
 
 /**
  * A checkbox field with a choice of available groups
@@ -58,7 +58,7 @@ 
         }
 
         foreach ($options as $k => $v) {
-            $options[$k] = $v . '<br>';
+            $options[$k] = $v.'<br>';
         }
 
         $this->addOptionArray($options);

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

Spacing +8 added lines, -8 removed lines

@@ -14,27 +14,27 @@
 foreach ($tplsadmin_autoupdate_mydirnames as $tplsadmin_mydirname) {
     $tplsadmin_mydirname = preg_replace('/[^a-zA-Z0-9_-]/', '', $tplsadmin_mydirname);
 
-    require XOOPS_ROOT_PATH . '/modules/' . $tplsadmin_mydirname . '/mytrustdirname.php';
+    require XOOPS_ROOT_PATH.'/modules/'.$tplsadmin_mydirname.'/mytrustdirname.php';
 
     $altsys_mid_path = 'altsys' == $mytrustdirname ? '/libs/' : '/modules/';
 
-    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH . $altsys_mid_path . $mytrustdirname . '/templates';
+    $tplsadmin_autoupdate_path = XOOPS_TRUST_PATH.$altsys_mid_path.$mytrustdirname.'/templates';
 
     // modules
 
-    if ($handler = @opendir($tplsadmin_autoupdate_path . '/')) {
+    if ($handler = @opendir($tplsadmin_autoupdate_path.'/')) {
         while (false !== ($file = readdir($handler))) {
-            $file_path = $tplsadmin_autoupdate_path . '/' . $file;
+            $file_path = $tplsadmin_autoupdate_path.'/'.$file;
 
             if (is_file($file_path)) {
-                $mtime = (int) (@filemtime($file_path));
+                $mtime = (int)(@filemtime($file_path));
 
-                $tpl_file = $tplsadmin_mydirname . '_' . $file;
+                $tpl_file = $tplsadmin_mydirname.'_'.$file;
 
-                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($xoopsConfig['template_set']) . "' AND tpl_file='" . addslashes($tpl_file) . "' AND tpl_lastmodified >= $mtime"));
+                [$count] = $xoopsDB->fetchRow($xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tplfile')." WHERE tpl_tplset='".addslashes($xoopsConfig['template_set'])."' AND tpl_file='".addslashes($tpl_file)."' AND tpl_lastmodified >= $mtime"));
 
                 if ($count <= 0) {
-                    require_once XOOPS_TRUST_PATH . '/libs/altsys/include/tpls_functions.php';
+                    require_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php';
 
                     tplsadmin_import_data($xoopsConfig['template_set'], $tpl_file, implode('', file($file_path)), $mtime);
                 }

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php

Spacing +9 added lines, -9 removed lines

@@ -37,7 +37,7 @@ 
     public function __construct($params = [])
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
 
             if (isset($this->$v)) {
                 $this->$v = $value;
@@ -134,7 +134,7 @@ 
             $output .= $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     /**
@@ -166,7 +166,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     /**
@@ -195,14 +195,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;
     }
 
     /**
@@ -211,7 +211,7 @@ 
      */
     public function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     /**
@@ -229,7 +229,7 @@ 
      */
     public function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     /**
@@ -266,6 +266,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/Archive_Zip.php

Spacing +44 added lines, -44 removed lines

@@ -141,7 +141,7 @@ 
               }*/ // GIJ
 
         if (!extension_loaded('zlib')) {
-            die("The extension 'zlib' couldn't be found.\n" . 'Please make sure your version of PHP was built ' . "with 'zlib' support.\n");
+            die("The extension 'zlib' couldn't be found.\n".'Please make sure your version of PHP was built '."with 'zlib' support.\n");
 
             return false;
         }
@@ -525,7 +525,7 @@ 
             && ('' == $p_params['by_index'])
             && ('' == $p_params['by_ereg'])
             && ('' == $p_params['by_preg'])) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'At least one filtering rule must' . ' be set as parameter');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'At least one filtering rule must'.' be set as parameter');
 
             return 0;
         }
@@ -583,7 +583,7 @@ 
             // ----- Open the zip file
 
             if (0 == ($this->_zip_fd = @fopen($this->_zipname, 'rb'))) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->_zipname . '\' in binary read mode');
+                $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
 
                 return 0;
             }
@@ -640,7 +640,7 @@ 
             // TBC : Should also check the archive format
 
             if (!is_file($p_archive)) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
+                $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
 
                 $v_result = ARCHIVE_ZIP_ERR_MISSING_FILE;
             } else {
@@ -756,7 +756,7 @@ 
         }
 
         if ($p_with_code) {
-            return ($v_value . ' (' . $this->_error_code . ')');
+            return ($v_value.' ('.$this->_error_code.')');
         }
 
         return $v_value;
@@ -778,10 +778,10 @@ 
     public function errorInfo($p_full = false)
     {
         if ($p_full) {
-            return ($this->errorName(true) . ' : ' . $this->_error_string);
+            return ($this->errorName(true).' : '.$this->_error_string);
         }
 
-        return ($this->_error_string . ' [code ' . $this->_error_code . ']');
+        return ($this->_error_string.' [code '.$this->_error_code.']');
     }
 
     // }}}
@@ -845,7 +845,7 @@ 
         if (!is_file($this->_zipname)) {
             // ----- Error log
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->_zipname . "'");
+            $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE, "Missing archive file '".$this->_zipname."'");
 
             return false;
         }
@@ -855,7 +855,7 @@ 
         if (!is_readable($this->_zipname)) {
             // ----- Error log
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->_zipname . "'");
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->_zipname."'");
 
             return false;
         }
@@ -998,14 +998,14 @@ 
 
         // ----- Creates a temporay file
 
-        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR . uniqid('archive_zip-') . '.tmp';
+        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
 
         // ----- Open the temporary file in write mode
 
         if (0 == ($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb'))) {
             $this->_closeFd();
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
             return self::errorCode();
         }
@@ -1181,7 +1181,7 @@ 
         // ----- Look if already open
 
         if (0 != $this->_zip_fd) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->_zipname . '\' already open');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->_zipname.'\' already open');
 
             return self::errorCode();
         }
@@ -1189,7 +1189,7 @@ 
         // ----- Open the zip file
 
         if (0 == ($this->_zip_fd = @fopen($this->_zipname, $p_mode))) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->_zipname . '\' in ' . $p_mode . ' mode');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in '.$p_mode.' mode');
 
             return self::errorCode();
         }
@@ -1436,7 +1436,7 @@ 
                 // ----- Look for path
 
                 if ('.' != $p_filename) {
-                    $v_path = $p_filename . '/';
+                    $v_path = $p_filename.'/';
                 } else {
                     $v_path = '';
                 }
@@ -1450,10 +1450,10 @@ 
                 while ($p_hitem = readdir($p_hdir)) {
                     // ----- Look for a file
 
-                    if (is_file($v_path . $p_hitem)) {
+                    if (is_file($v_path.$p_hitem)) {
                         // ----- Add the file
 
-                        if (1 != ($v_result = $this->_addFile($v_path . $p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params))) {
+                        if (1 != ($v_result = $this->_addFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params))) {
                             // ----- Return status
 
                             return $v_result;
@@ -1467,7 +1467,7 @@ 
                     else {
                         // ----- Need an array as parameter
 
-                        $p_temp_list[0] = $v_path . $p_hitem;
+                        $p_temp_list[0] = $v_path.$p_hitem;
 
                         $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
 
@@ -1543,7 +1543,7 @@ 
 
             if (('./' == mb_substr($p_filename, 0, 2)) || ('./' == mb_substr($p_remove_dir, 0, 2))) {
                 if (('./' == mb_substr($p_filename, 0, 2)) && ('./' != mb_substr($p_remove_dir, 0, 2))) {
-                    $p_remove_dir = './' . $p_remove_dir;
+                    $p_remove_dir = './'.$p_remove_dir;
                 }
 
                 if (('./' != mb_substr($p_filename, 0, 2)) && ('./' == mb_substr($p_remove_dir, 0, 2))) {
@@ -1568,9 +1568,9 @@ 
 
         if ('' != $p_add_dir) {
             if ('/' == mb_substr($p_add_dir, -1)) {
-                $v_stored_filename = $p_add_dir . $v_stored_filename;
+                $v_stored_filename = $p_add_dir.$v_stored_filename;
             } else {
-                $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
+                $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
             }
         }
 
@@ -1652,7 +1652,7 @@ 
 
             // header.
 
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_PRE_ADD] . '(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
 
             if (0 == $v_result) {
                 // ----- Change the file status
@@ -1735,7 +1735,7 @@ 
 
                 // ----- Write the compressed content
 
-                $v_binary_data = pack('a' . $p_header['compressed_size'], $v_content_compressed);
+                $v_binary_data = pack('a'.$p_header['compressed_size'], $v_content_compressed);
 
                 @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
 
@@ -1753,7 +1753,7 @@ 
 
                 $p_header['size'] = 0;
 
-                $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+                $p_header['external'] = 0x41FF0010; // Value for a folder : to be checked
 
                 // ----- Call the header generation
 
@@ -1779,7 +1779,7 @@ 
 
             // header.
 
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_POST_ADD] . '(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
 
             if (0 == $v_result) {
                 // ----- Ignored
@@ -2024,7 +2024,7 @@ 
         if (0 == ($this->_zip_fd = @fopen($this->_zipname, 'rb'))) {
             // ----- Error log
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->_zipname . '\' in binary read mode');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
 
             // ----- Return
 
@@ -2213,7 +2213,7 @@ 
             || (('/' != mb_substr($p_path, 0, 1))
                 && ('../' != mb_substr($p_path, 0, 3))
                 && (':/' != mb_substr($p_path, 1, 2)))) {
-            $p_path = './' . $p_path;
+            $p_path = './'.$p_path;
         }
 
         // ----- Reduce the path last (and duplicated) '/'
@@ -2519,7 +2519,7 @@ 
         // ----- Add the path
 
         if ('' != $p_path) {
-            $p_entry['filename'] = $p_path . '/' . $p_entry['filename'];
+            $p_entry['filename'] = $p_path.'/'.$p_entry['filename'];
         }
 
         // ----- Look for pre-extract callback
@@ -2538,7 +2538,7 @@ 
 
             // header.
 
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT] . '(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
 
             if (0 == $v_result) {
                 // ----- Change the file status
@@ -2644,7 +2644,7 @@ 
 
                         $v_buffer = fread($this->_zip_fd, $v_read_size);
 
-                        $v_binary_data = pack('a' . $v_read_size, $v_buffer);
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
 
                         @fwrite($v_dest_file, $v_binary_data, $v_read_size);
 
@@ -2723,7 +2723,7 @@ 
 
             // header.
 
-            eval('$v_result = ' . $p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT] . '(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
+            eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
         }
 
         // ----- Return
@@ -2861,7 +2861,7 @@ 
 
             // ----- Error log
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . mb_strlen($v_binary_data));
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.mb_strlen($v_binary_data));
 
             // ----- Return
 
@@ -3003,7 +3003,7 @@ 
 
             // ----- Error log
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . mb_strlen($v_binary_data));
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.mb_strlen($v_binary_data));
 
             // ----- Return
 
@@ -3117,7 +3117,7 @@ 
         @fseek($this->_zip_fd, $v_size);
 
         if (@ftell($this->_zip_fd) != $v_size) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->_zipname . '\'');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->_zipname.'\'');
 
             return self::errorCode();
         }
@@ -3134,7 +3134,7 @@ 
             @fseek($this->_zip_fd, $v_size - 22);
 
             if (($v_pos = @ftell($this->_zip_fd)) != ($v_size - 22)) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->_zipname . '\'');
+                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->_zipname.'\'');
 
                 return self::errorCode();
             }
@@ -3166,7 +3166,7 @@ 
             @fseek($this->_zip_fd, $v_size - $v_maximum_size);
 
             if (@ftell($this->_zip_fd) != ($v_size - $v_maximum_size)) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->_zipname . '\'');
+                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->_zipname.'\'');
 
                 return self::errorCode();
             }
@@ -3213,7 +3213,7 @@ 
         // ----- Look for invalid block size
 
         if (18 != mb_strlen($v_binary_data)) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid End of Central Dir Record size : ' . mb_strlen($v_binary_data));
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid End of Central Dir Record size : '.mb_strlen($v_binary_data));
 
             return self::errorCode();
         }
@@ -3369,7 +3369,7 @@ 
                             && (mb_substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, mb_strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                             $v_found = true;
                         } elseif ((0x00000010 == ($v_header_list[$v_nb_extracted]['external'] & 0x00000010)) /* Indicates a folder */
-                                  && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
+                                  && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                             $v_found = true;
                         }
                     } // ----- Look for a filename
@@ -3435,7 +3435,7 @@ 
         if ($v_nb_extracted > 0) {
             // ----- Creates a temporay file
 
-            $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR . uniqid('archive_zip-') . '.tmp';
+            $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
 
             // ----- Creates a temporary zip archive
 
@@ -3774,7 +3774,7 @@ 
 
         // ----- Creates a temporay file
 
-        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR . uniqid('archive_zip-') . '.tmp';
+        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
 
         // ----- Open the temporary file in write mode
 
@@ -3783,7 +3783,7 @@ 
 
             $p_archive_to_add->_closeFd();
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
 
             return self::errorCode();
         }
@@ -3981,7 +3981,7 @@ 
         if (0 == ($v_zip_temp_fd = @fopen($p_archive_filename, 'rb'))) {
             $this->_closeFd();
 
-            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
+            $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
 
             return self::errorCode();
         }
@@ -4042,7 +4042,7 @@ 
 
         for (reset($p_params); [$v_key, $v_value] = each($p_params);) {
             if (!isset($p_default[$v_key])) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Unsupported parameter with key \'' . $v_key . '\'');
+                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Unsupported parameter with key \''.$v_key.'\'');
 
                 return self::errorCode();
             }
@@ -4070,7 +4070,7 @@ 
 
             if (isset($p_params[$v_key]) && ('' != $p_params[$v_key])) {
                 if (!function_exists($p_params[$v_key])) {
-                    $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE, "Callback '" . $p_params[$v_key] . "()' is not an existing function for " . "parameter '" . $v_key . "'");
+                    $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE, "Callback '".$p_params[$v_key]."()' is not an existing function for "."parameter '".$v_key."'");
 
                     return self::errorCode();
                 }
@@ -4179,7 +4179,7 @@ 
                     // ----- Ignore only the double '//' in path,
                     // but not the first and last '/'
                 } else {
-                    $v_result = $v_list[$i] . ($i != (count($v_list) - 1) ? '/' . $v_result : '');
+                    $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : '');
                 }
             }
         }