mambax7 / altsys

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

Doc Comments +3 added lines

@@ -35,6 +35,9 @@
 }
 
 
+    /**
+     * @param string $resource
+     */
     public function read($resource, $mydirname, $mytrustdirname = null, $read_once = true)
     {
         $d3file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/mytrustdirname.php' ;

Spacing +38 added lines, -38 removed lines

@@ -3,102 +3,102 @@ 
 class D3LanguageManager
 {
 
-    public $default_language = 'english' ;
-    public $language = 'english' ;
-    public $salt ;
-    public $cache_path ;
-    public $cache_prefix = 'lang' ;
-    public $my_language = false ;
+    public $default_language = 'english';
+    public $language = 'english';
+    public $salt;
+    public $cache_path;
+    public $cache_prefix = 'lang';
+    public $my_language = false;
 
 
 //HACK by domifara
 //public function D3LanguageManager()
 public function __construct()
 {
-    $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']) ;
-    $this->salt = substr(md5(XOOPS_ROOT_PATH . XOOPS_DB_USER . XOOPS_DB_PREFIX), 0, 6) ;
-    $this->cache_path = XOOPS_TRUST_PATH.'/cache' ;
+    $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']);
+    $this->salt = substr(md5(XOOPS_ROOT_PATH.XOOPS_DB_USER.XOOPS_DB_PREFIX), 0, 6);
+    $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 ;
+        $this->my_language = ALTSYS_MYLANGUAGE_ROOT_PATH;
     }
 }
 //HACK by domifara for php5.3+
 //function &getInstance( $conn = null )
 public static function &getInstance($conn = null)
 {
-    static $instance ;
-    if (! isset($instance)) {
-        $instance = new D3LanguageManager() ;
+    static $instance;
+    if (!isset($instance)) {
+        $instance = new D3LanguageManager();
     }
-    return $instance ;
+    return $instance;
 }
 
 
     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) && file_exists($d3file)) {
-            require $d3file ;
+            require $d3file;
         }
 
         if (empty($this->language)) {
-            $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']) ;
+            $this->language = preg_replace('/[^0-9a-zA-Z_-]/', '', @$GLOBALS['xoopsConfig']['language']);
         }
 
-        $cache_file = $this->getCacheFileName($resource, $mydirname) ;
-        $root_file = XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/language/'.$this->language.'/'.$resource ;
+        $cache_file = $this->getCacheFileName($resource, $mydirname);
+        $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 (file_exists($mylang_file)) {
-            require_once $mylang_file ;
+            require_once $mylang_file;
         }
-        $original_error_level = error_reporting() ;
-        error_reporting($original_error_level & ~ E_NOTICE) ;
+        $original_error_level = error_reporting();
+        error_reporting($original_error_level & ~ E_NOTICE);
     }
 
         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 (file_exists($cache_file)) {
-                require_once $cache_file ;
+                require_once $cache_file;
             } elseif (file_exists($root_file)) {
-                require_once $root_file ;
+                require_once $root_file;
             } elseif (file_exists($default_file)) {
                 // fall back english
-            require_once $default_file ;
+            require_once $default_file;
             }
         } else {
             // D3 modules
-        $trust_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->language.'/'.$resource ;
-            $default_file = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/language/'.$this->default_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;
 
             if (file_exists($cache_file)) {
-                require_once $cache_file ;
+                require_once $cache_file;
             } elseif (file_exists($root_file)) {
-                require_once $root_file ;
+                require_once $root_file;
             } elseif (file_exists($trust_file)) {
                 if ($read_once) {
-                    require_once $trust_file ;
+                    require_once $trust_file;
                 } else {
-                    require $trust_file ;
+                    require $trust_file;
                 }
             } elseif (file_exists($default_file)) {
                 // fall back english
             if ($read_once) {
-                require_once $default_file ;
+                require_once $default_file;
             } else {
-                require $default_file ;
+                require $default_file;
             }
             }
         }
 
         if ($this->my_language) {
-            error_reporting($original_error_level) ;
+            error_reporting($original_error_level);
         }
     }
 
@@ -106,8 +106,8 @@ 
     public function getCacheFileName($resource, $mydirname, $language = null)
     {
         if (empty($language)) {
-            $language = $this->language ;
+            $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/d3utilities.php

Doc Comments +3 added lines

@@ -261,6 +261,9 @@
 			</form>\n" ;
     }
 
+    /**
+     * @param string $name
+     */
     public function get_select($name, $options, $current_value)
     {
         $ret = "<select name='".htmlspecialchars($name, ENT_QUOTES)."'>\n" ;

Spacing +101 added lines, -101 removed lines

@@ -3,40 +3,40 @@ 
 class d3utilities
 {
 
-    public $dirname = '' ; // directory name under xoops_trust_path
-    public $mydirname = '' ; // each directory name under xoops_root_path
-    public $mid = 0 ; // id of each module instance
-    public $table = '' ; // table with prefix and dirname
-    public $primary_key = '' ; // column for primary_key
-    public $cols = array() ; // settings of each columns
-    public $form_mode = 'new' ; // 'new','edit' are available
-    public $page_name = '' ; // controller's name  eg) page=(controller) in URI
-    public $action_base_hiddens = array() ;
+    public $dirname = ''; // directory name under xoops_trust_path
+    public $mydirname = ''; // each directory name under xoops_root_path
+    public $mid = 0; // id of each module instance
+    public $table = ''; // table with prefix and dirname
+    public $primary_key = ''; // column for primary_key
+    public $cols = array(); // settings of each columns
+    public $form_mode = 'new'; // 'new','edit' are available
+    public $page_name = ''; // controller's name  eg) page=(controller) in URI
+    public $action_base_hiddens = array();
 
 //HACK by domifara
 //	public function D3Utilities( $mydirname , $table_body , $primary_key , $cols , $page_name , $action_base_hiddens )
     public function __construct($mydirname, $table_body, $primary_key, $cols, $page_name, $action_base_hiddens)
     {
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
-
-        $this->dirname = basename(dirname(__DIR__)) ;
-        $this->mydirname = $mydirname ;
-        $this->table = $db->prefix($mydirname ? $mydirname . '_' . $table_body : $table_body) ;
-        $this->primary_key = $primary_key ;
-        $this->cols = $cols ;
-        $module_handler =& xoops_gethandler('module') ;
-        $module =& $module_handler->getByDirname($this->mydirname) ;
-        if (! empty($module)) {
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
+
+        $this->dirname = basename(dirname(__DIR__));
+        $this->mydirname = $mydirname;
+        $this->table = $db->prefix($mydirname ? $mydirname.'_'.$table_body : $table_body);
+        $this->primary_key = $primary_key;
+        $this->cols = $cols;
+        $module_handler = & xoops_gethandler('module');
+        $module = & $module_handler->getByDirname($this->mydirname);
+        if (!empty($module)) {
             $this->mid = (int)$module->getVar('mid');
         }
-        $this->page_name = $page_name ;
-        $this->action_base_hiddens = $action_base_hiddens ;
+        $this->page_name = $page_name;
+        $this->action_base_hiddens = $action_base_hiddens;
     }
 
 
     public function get_language_constant($name)
     {
-        return constant(strtoupper('_MD_A_' . $this->dirname . '_' . $this->page_name . '_' . $name)) ;
+        return constant(strtoupper('_MD_A_'.$this->dirname.'_'.$this->page_name.'_'.$name));
     }
 
 
@@ -46,22 +46,22 @@ 
             case 'text' :
             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;
-                if (! empty($col['max'])) {
-                    $value = min($value, (int)$col['max']) ;
+                if (!empty($col['max'])) {
+                    $value = min($value, (int)$col['max']);
                 }
-                if (! empty($col['min'])) {
-                    $value = max($value, (int)$col['min']) ;
+                if (!empty($col['min'])) {
+                    $value = max($value, (int)$col['min']);
                 }
-                return "`{$col['name']}`=$value" ;
+                return "`{$col['name']}`=$value";
         }
     }
 
@@ -69,29 +69,29 @@ 
     // single update or insert
     public function insert()
     {
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
 
-        $id = $this->init_default_values() ;
+        $id = $this->init_default_values();
 
-        $set4sql = '' ;
+        $set4sql = '';
         foreach ($this->cols as $col) {
             if (empty($col['edit_edit'])) {
-                continue ;
+                continue;
             }
             if ($col['name'] == $this->primary_key) {
-                continue ;
+                continue;
             }
-            $set4sql .= $this->get_set4sql(@$_POST[ $col['name'] ], $col) . ',' ;
+            $set4sql .= $this->get_set4sql(@$_POST[$col['name']], $col).',';
         }
-        if (! empty($set4sql)) {
+        if (!empty($set4sql)) {
             if ($id > 0) {
                 // UPDATE
-                $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'") ;
-                return array( $id , 'update' ) ;
+                $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key='".addslashes($id)."'");
+                return array($id, 'update');
             } else {
                 // INSERT
-                $db->queryF("INSERT INTO $this->table SET ".substr($set4sql, 0, -1)) ;
-                return array( $db->getInsertId() , 'insert' ) ;
+                $db->queryF("INSERT INTO $this->table SET ".substr($set4sql, 0, -1));
+                return array($db->getInsertId(), 'insert');
             }
         }
     }
@@ -100,156 +100,156 @@ 
     // multiple update
     public function update()
     {
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
 
         // search appropriate column for getting primary_key
         foreach ($this->cols as $col) {
-            if (in_array(@$col['list_edit'], array( 'text', 'textarea', 'hidden' ))) {
-                $column4key = $col['name'] ;
-                break ;
+            if (in_array(@$col['list_edit'], array('text', 'textarea', 'hidden'))) {
+                $column4key = $col['name'];
+                break;
             }
         }
         if (empty($column4key)) {
-            $column4key = $this->cols[0]['name'] ;
+            $column4key = $this->cols[0]['name'];
         }
 
-        $ret = array() ;
+        $ret = array();
         foreach (array_keys($_POST[$column4key]) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
-            $set4sql = '' ;
+            $id = (int)$id; // primary_key should be 'integer'
+            $set4sql = '';
             foreach ($this->cols as $col) {
                 if (empty($col['list_edit'])) {
-                    continue ;
+                    continue;
                 }
                 if ($col['name'] == $this->primary_key) {
-                    continue ;
+                    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 (!empty($set4sql)) {
+                $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
                 if ($db->getRowsNum($result) == 1) {
-                    $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key=$id") ;
+                    $db->queryF("UPDATE $this->table SET ".substr($set4sql, 0, -1)." WHERE $this->primary_key=$id");
                     if ($db->getAffectedRows() == 1) {
-                        $ret[ $id ] = $db->fetchArray($result) ;
+                        $ret[$id] = $db->fetchArray($result);
                     }
                 }
             }
         }
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function delete($delete_comments = false, $delete_notifications = false)
     {
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
 
-        $ret = array() ;
+        $ret = array();
         foreach (array_keys($_POST['admin_main_checkboxes']) as $id) {
-            $id = (int)$id;    // primary_key should be 'integer'
-            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $id = (int)$id; // primary_key should be 'integer'
+            $result = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
             if ($db->getRowsNum($result) == 1) {
-                $ret[ $id ] = $db->fetchArray($result) ;
+                $ret[$id] = $db->fetchArray($result);
 
-                $db->queryF("DELETE FROM $this->table WHERE $this->primary_key=$id") ;
+                $db->queryF("DELETE FROM $this->table WHERE $this->primary_key=$id");
                 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");
                 }
             }
         }
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function init_default_values()
     {
-        $db =& XoopsDatabaseFactory::getDatabaseConnection() ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
 
         if (@$_GET['id']) {
             $id = (int)$_GET['id'];
-            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id") ;
+            $rs = $db->query("SELECT * FROM $this->table WHERE $this->primary_key=$id");
             if ($db->getRowsNum($rs) == 1) {
-                $row = $db->fetchArray($rs) ;
+                $row = $db->fetchArray($rs);
                 foreach (array_keys($this->cols) as $key) {
                     if (empty($this->cols[$key]['edit_show'])) {
-                        continue ;
+                        continue;
                     }
-                    $this->cols[$key]['default_value'] = $row[ $this->cols[$key]['name'] ] ;
+                    $this->cols[$key]['default_value'] = $row[$this->cols[$key]['name']];
                 }
-                $this->form_mode = 'edit' ;
-                return $id ;
+                $this->form_mode = 'edit';
+                return $id;
             }
         }
 
-        $this->form_mode = 'new' ;
-        return 0 ;
+        $this->form_mode = 'new';
+        return 0;
     }
 
 
     public function get_view_edit()
     {
-        $id = $this->init_default_values() ;
+        $id = $this->init_default_values();
 
-        $lines = array() ;
+        $lines = array();
         foreach ($this->cols as $col) {
             if (empty($col['edit_show'])) {
-                continue ;
+                continue;
             }
-            if (! isset($col['default_value'])) {
+            if (!isset($col['default_value'])) {
                 switch ($col['type']) {
                     case 'int' :
                     case 'integer' :
-                        $col['default_value'] = 0 ;
-                        break ;
+                        $col['default_value'] = 0;
+                        break;
                     default :
-                        $col['default_value'] = '' ;
-                        break ;
+                        $col['default_value'] = '';
+                        break;
                 }
             }
             switch ($col['edit_edit']) {
                 case 'checkbox' :
-                    $checked = empty($col['default_value']) ? '' : "checked='checked'" ;
-                    $value = empty($col['checkbox_value']) ? 1 : htmlspecialchars($col['checkbox_value'], ENT_QUOTES) ;
+                    $checked = empty($col['default_value']) ? '' : "checked='checked'";
+                    $value = empty($col['checkbox_value']) ? 1 : htmlspecialchars($col['checkbox_value'], ENT_QUOTES);
 
-                    $lines[ $col['name'] ] = "<input type='checkbox' name='{$col['name']}' value='$value' $checked />" ;
-                    break ;
+                    $lines[$col['name']] = "<input type='checkbox' name='{$col['name']}' value='$value' $checked />";
+                    break;
                 case 'text' :
                 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)."' />" ;
-                    break ;
+                    $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) ;
-                    break ;
+                    $lines[$col['name']] = htmlspecialchars($col['default_value'], ENT_QUOTES);
+                    break;
             }
         }
 
-        return array( $id , $lines ) ;
+        return array($id, $lines);
     }
 
 
     public function get_control_form($controllers)
     {
-        $hiddens = '' ;
+        $hiddens = '';
         foreach ($this->action_base_hiddens as $key => $val) {
-            $key4disp = htmlspecialchars($key, ENT_QUOTES) ;
-            $val4disp = htmlspecialchars($val, ENT_QUOTES) ;
-            $hiddens .= "<input type='hidden' name='$key4disp' value='$val4disp' />\n" ;
+            $key4disp = htmlspecialchars($key, ENT_QUOTES);
+            $val4disp = htmlspecialchars($val, ENT_QUOTES);
+            $hiddens .= "<input type='hidden' name='$key4disp' value='$val4disp' />\n";
         }
 
-        $controllers_html = '' ;
+        $controllers_html = '';
         foreach ($controllers as $type => $body) {
             if ($type == 'num') {
-                $controllers_html .= $this->get_select('num', $body, $GLOBALS['num']) ;
+                $controllers_html .= $this->get_select('num', $body, $GLOBALS['num']);
             }
         }
 
@@ -263,13 +263,13 @@ 
 
     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" ;
+        $ret .= "</select>\n";
 
-        return $ret ;
+        return $ret;
     }
 }

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

Doc Comments +3 added lines

@@ -69,6 +69,9 @@
 
 
 // private
+/**
+ * @param integer $target_side
+ */
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
     $bid = intval($block_data['bid']) ;

Spacing +27 added lines, -27 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForX20S extends MyBlocksAdmin
 {
 
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForX20S()
     {
@@ -14,20 +14,20 @@ 
 
     public function construct()
     {
-        parent::construct() ;
+        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 = array(
-        -1 => _NONE ,
-        0 => _AM_SBLEFT ,
-        1 => _AM_SBRIGHT ,
-        3 => _AM_CBLEFT ,
-        4 => _AM_CBRIGHT ,
-        5 => _AM_CBCENTER ,
-        7 => _AM_CBBOTTOMLEFT ,
-        8 => _AM_CBBOTTOMRIGHT ,
+        -1 => _NONE,
+        0 => _AM_SBLEFT,
+        1 => _AM_SBRIGHT,
+        3 => _AM_CBLEFT,
+        4 => _AM_CBRIGHT,
+        5 => _AM_CBCENTER,
+        7 => _AM_CBBOTTOMLEFT,
+        8 => _AM_CBBOTTOMRIGHT,
         9 => _AM_CBBOTTOM
-    ) ;
+    );
     }
 
 //HACK by domifara for php5.3+
@@ -37,7 +37,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForX20S();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -50,19 +50,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>';
 }
@@ -73,18 +73,18 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $label4disp = htmlspecialchars($this->block_positions[ $target_side ], ENT_QUOTES) ;
+    $label4disp = htmlspecialchars($this->block_positions[$target_side], ENT_QUOTES);
 
     if ($current_side == $target_side) {
-        $checked = "checked='checked'" ;
+        $checked = "checked='checked'";
         $divstyle = $target_side == -1 ? 'disabled' : 'selected';
     } else {
         $checked = '';
         $divstyle = 'unselected';
     }
 
-    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>" ;
+    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>";
 }
 }

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

Doc Comments +4 added lines

@@ -47,6 +47,10 @@
         parent::prepare();
     }
 
+    /**
+     * @param string $dirname
+     * @param string $fileBodyName
+     */
     public function _loadLanguage($dirname, $fileBodyName)
     {
         // read/check once (selected_theme)/language/(lang).php

Spacing +32 added lines, -32 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-if (! defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
-    header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php') ;
-    exit ;
+if (!defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') {
+    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 extends XCube_ActionFilter
@@ -26,23 +26,23 @@ 
 }
 
 
-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 extends Legacy_LanguageManager
 {
-    public $langman = null ;
-    public $theme_lang_checked = false ;
+    public $langman = null;
+    public $theme_lang_checked = false;
 
     public function prepare()
     {
-        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php' ;
-        if (! file_exists($langmanpath)) {
-            die('install the latest altsys') ;
+        $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php';
+        if (!file_exists($langmanpath)) {
+            die('install the latest altsys');
         }
-        require_once($langmanpath) ;
-        $this->langman =& D3LanguageManager::getInstance() ;
-        $this->langman->language = $this->mLanguageName ;
+        require_once($langmanpath);
+        $this->langman = & D3LanguageManager::getInstance();
+        $this->langman->language = $this->mLanguageName;
 
         parent::prepare();
     }
@@ -50,40 +50,40 @@ 
     public function _loadLanguage($dirname, $fileBodyName)
     {
         // read/check once (selected_theme)/language/(lang).php
-        if (! $this->theme_lang_checked) {
-            $root =& XCube_Root::getSingleton() ;
-            if (! empty($root->mContext->mXoopsConfig['theme_set'])) {
-                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language' ;
+        if (!$this->theme_lang_checked) {
+            $root = & XCube_Root::getSingleton();
+            if (!empty($root->mContext->mXoopsConfig['theme_set'])) {
+                $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language';
                 if (file_exists($langdir)) {
-                    $langfile = $langdir.'/'.$this->mLanguageName.'.php' ;
-                    $engfile = $langdir.'/english.php' ;
+                    $langfile = $langdir.'/'.$this->mLanguageName.'.php';
+                    $engfile = $langdir.'/english.php';
                     if (file_exists($langfile)) {
-                        require_once $langfile ;
+                        require_once $langfile;
                     } elseif (file_exists($engfile)) {
-                        require_once $engfile ;
+                        require_once $engfile;
                     }
                 }
-                $this->theme_lang_checked = true ;
+                $this->theme_lang_checked = true;
             }
         }
 
         // read normal
-        $this->langman->read($fileBodyName.'.php', $dirname) ;
+        $this->langman->read($fileBodyName.'.php', $dirname);
     }
 
     public function loadPageTypeMessageCatalog($type)
     {
         // I dare not to use langman...
         if (strpos($type, '.') === false && $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 (file_exists($mylang_file)) {
-                require_once $mylang_file ;
+                require_once $mylang_file;
             }
         }
-        $original_error_level = error_reporting() ;
-        error_reporting($original_error_level & ~ E_NOTICE) ;
+        $original_error_level = error_reporting();
+        error_reporting($original_error_level & ~ E_NOTICE);
         parent::loadPageTypeMessageCatalog($type);
-        error_reporting($original_error_level) ;
+        error_reporting($original_error_level);
     }
 
     public function loadGlobalMessageCatalog()
@@ -91,7 +91,7 @@ 
         /* if (!$this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/" . $this->mLanguageName . "/global.php")) {
             $this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/english/global.php");
         } */
-        $this->_loadLanguage('legacy', 'global') ;
+        $this->_loadLanguage('legacy', 'global');
 
         //
         // Now, if XOOPS_USE_MULTIBYTES isn't defined, set zero to it.

xoops_trust_path/libs/altsys/include/Archive_Zip.php

Doc Comments +12 added lines, -6 removed lines

@@ -136,6 +136,9 @@ 
     */
 //HACK by domifara
 //	function Archive_Zip($p_zipname)
+    /**
+     * @param string $p_zipname
+     */
     public function __construct($p_zipname)
     {
 
@@ -177,7 +180,7 @@ 
     * @param  mixed  $p_filelist  The list of the files or folders to add.
     *                             It can be a string with filenames separated
     *                             by a comma, or an array of filenames.
-    * @param  mixed  $p_params  An array of variable parameters and values.
+    * @param  integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               an error code on error
     */
@@ -248,7 +251,7 @@ 
     * @param    mixed  $p_filelist  The list of the files or folders to add.
     *                               It can be a string with filenames separated
     *                               by a comma, or an array of filenames.
-    * @param    mixed  $p_params  An array of variable parameters and values.
+    * @param    integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
@@ -399,7 +402,7 @@ 
     *                            each entry extraction.
     *
     * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
+    * @param    integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
@@ -514,7 +517,6 @@ 
     *    status : not_exist, ok
     *
     * @access public
-    * @param    mixed  $p_params  {Description}
     * @return mixed An array with the global properties or 0 on error.
     */
     public function properties()
@@ -1000,6 +1002,7 @@ 
   *
   * { Description }
   *
+  * @param string $p_mode
   */
   public function _openFd($p_mode)
   {
@@ -1571,6 +1574,7 @@ 
   *
   * { Description }
   *
+  * @param string $p_comment
   */
   public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
@@ -3148,8 +3152,6 @@ 
   *
   * { Description }
   *
-  * @param integer $p_error_code
-  * @param string $p_error_string
   */
   public function _check_parameters(&$p_params, $p_default)
   {
@@ -3379,6 +3381,8 @@ 
   * { Description }
   *
   * @param integer $p_mode
+  * @param integer $p_src
+  * @param integer $p_dest
   */
   public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
@@ -3440,6 +3444,8 @@ 
   *
   * { Description }
   *
+  * @param string $p_src
+  * @param string $p_dest
   */
   public function _tool_Rename($p_src, $p_dest)
   {

Spacing +108 added lines, -108 removed lines

@@ -106,24 +106,24 @@ 
     *
     * @var string Name of the Zip file
     */
-    public $_zipname='';
+    public $_zipname = '';
 
     /**
     * File descriptor of the opened Zip file.
     *
     * @var int Internal zip file descriptor
     */
-    public $_zip_fd=0;
+    public $_zip_fd = 0;
 
     /**
     * @var int last error code
     */
-    public $_error_code=1;
+    public $_error_code = 1;
 
     /**
     * @var string Last error description
     */
-    public $_error_string='';
+    public $_error_string = '';
 
     // {{{ constructor
     /**
@@ -144,7 +144,7 @@ 
           PEAR::loadExtension('zlib');
       }*/ // GIJ
       if (!extension_loaded('zlib')) {
-          die("The extension 'zlib' couldn't be found.\n". 'Please make sure your version of PHP was built ' .
+          die("The extension 'zlib' couldn't be found.\n".'Please make sure your version of PHP was built '.
               "with 'zlib' support.\n");
           return false;
       }
@@ -180,7 +180,7 @@ 
     * @return mixed An array of file description on success,
     *               an error code on error
     */
-    public function create($p_filelist, $p_params=0)
+    public function create($p_filelist, $p_params = 0)
     {
         $this->_errorReset();
 
@@ -251,7 +251,7 @@ 
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
-    public function add($p_filelist, $p_params=0)
+    public function add($p_filelist, $p_params = 0)
     {
         $this->_errorReset();
 
@@ -401,7 +401,7 @@ 
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
-    public function extract($p_params=0)
+    public function extract($p_params = 0)
     {
         $this->_errorReset();
 
@@ -671,7 +671,7 @@ 
     * @param  boolean $p_with_code  If true, gives the name and the int value.
     * @return string The error name.
     */
-    public function errorName($p_with_code=false)
+    public function errorName($p_with_code = false)
     {
         $v_const_list = get_defined_constants();
 
@@ -685,8 +685,8 @@ 
         }
 
         // ----- Search the name form the code value
-        $v_key=array_search($this->_error_code, $v_error_list, true);
-        if ($v_key!=false) {
+        $v_key = array_search($this->_error_code, $v_error_list, true);
+        if ($v_key != false) {
             $v_value = $v_key;
         } else {
             $v_value = 'NoName';
@@ -711,12 +711,12 @@ 
     *                         and the error code.
     * @return string The error description.
     */
-    public function errorInfo($p_full=false)
+    public function errorInfo($p_full = false)
     {
         if ($p_full) {
-            return($this->errorName(true) . ' : ' . $this->_error_string);
+            return($this->errorName(true).' : '.$this->_error_string);
         } else {
-            return($this->_error_string . ' [code ' . $this->_error_code . ']');
+            return($this->_error_string.' [code '.$this->_error_code.']');
         }
     }
     // }}}
@@ -749,7 +749,7 @@ 
   *
   * @param integer $p_level
   */
-  public function _checkFormat($p_level=0)
+  public function _checkFormat($p_level = 0)
   {
       $v_result = true;
 
@@ -800,7 +800,7 @@ 
   */
   public function _create($p_list, &$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
       $p_add_dir = $p_params['add_path'];
@@ -838,7 +838,7 @@ 
   */
   public function _add($p_list, &$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
       $p_add_dir = $p_params['add_path'];
@@ -852,7 +852,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         return $v_result;
     }
 
@@ -925,10 +925,10 @@ 
       }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
+    for ($i = 0, $v_count = 0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
-          if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
+          if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
               fclose($v_zip_temp_fd);
               $this->_closeFd();
               @unlink($v_zip_temp_name);
@@ -947,7 +947,7 @@ 
     $v_comment = '';
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->_zip_fd)-$v_offset;
+    $v_size = @ftell($this->_zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->_writeCentralHeader($v_count
@@ -999,7 +999,7 @@ 
   */
   public function _openFd($p_mode)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if already open
     if ($this->_zip_fd != 0) {
@@ -1034,7 +1034,7 @@ 
   */
   public function _closeFd()
   {
-      $v_result=1;
+      $v_result = 1;
 
       if ($this->_zip_fd != 0) {
           @fclose($this->_zip_fd);
@@ -1068,7 +1068,7 @@ 
   public function _addList($p_list, &$p_result_list,
                     $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -1082,7 +1082,7 @@ 
     $v_offset = @ftell($this->_zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
+    for ($i = 0, $v_count = 0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
           if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
@@ -1099,7 +1099,7 @@ 
     $v_comment = '';
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->_zip_fd)-$v_offset;
+    $v_size = @ftell($this->_zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->_writeCentralHeader($v_count, $v_size, $v_offset,
@@ -1139,14 +1139,14 @@ 
                         $p_add_dir, $p_remove_dir, $p_remove_all_dir,
                         &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = count($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < count($p_list)) && ($v_result == 1); $j++) {
         // ----- Recuperate the filename
       $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
 
@@ -1179,7 +1179,7 @@ 
 
         // ----- Look for path
         if ($p_filename != '.') {
-            $v_path = $p_filename . '/';
+            $v_path = $p_filename.'/';
         } else {
             $v_path = '';
         }
@@ -1240,7 +1240,7 @@ 
   */
   public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
       if ($p_filename == '') {
           // ----- Error log
@@ -1265,7 +1265,7 @@ 
 
         if ((substr($p_filename, 0, 2) == './') || (substr($p_remove_dir, 0, 2) == './')) {
             if ((substr($p_filename, 0, 2) == './') && (substr($p_remove_dir, 0, 2) != './')) {
-                $p_remove_dir = './' . $p_remove_dir;
+                $p_remove_dir = './'.$p_remove_dir;
             }
             if ((substr($p_filename, 0, 2) != './') && (substr($p_remove_dir, 0, 2) == './')) {
                 $p_remove_dir = substr($p_remove_dir, 2);
@@ -1289,7 +1289,7 @@ 
         if (substr($p_add_dir, -1) == '/') {
             $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;
         }
     }
 
@@ -1324,7 +1324,7 @@ 
       $p_header['comment_len'] = 0;
       $p_header['disk'] = 0;
       $p_header['internal'] = 0;
-      $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
+      $p_header['external'] = (is_file($p_filename) ? 0xFE49FFE0 : 0x41FF0010);
       $p_header['offset'] = 0;
       $p_header['filename'] = $p_filename;
       $p_header['stored_filename'] = $v_stored_filename;
@@ -1420,7 +1420,7 @@ 
         $p_header['filename'] .= '/';
           $p_header['filename_len']++;
           $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
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
@@ -1469,7 +1469,7 @@ 
   */
   public function _writeFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1480,8 +1480,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-      $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-      $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+      $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+      $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack('VvvvvvVVVvv', 0x04034b50, $p_header['version'], $p_header['flag'],
@@ -1519,7 +1519,7 @@ 
   */
   public function _writeCentralFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1527,8 +1527,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-      $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-      $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+      $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+      $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack('VvvvvvvVVVvvvvvVV', 0x02014b50, $p_header['version'], $p_header['version_extracted'],
@@ -1570,7 +1570,7 @@ 
   */
   public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack('VvvvvVVv', 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
@@ -1602,7 +1602,7 @@ 
   */
   public function _list(&$p_list)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
@@ -1630,7 +1630,7 @@ 
       }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++) {
+    for ($i = 0; $i < $v_central_dir['entries']; $i++) {
         // ----- Read the file header
       if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
           return $v_result;
@@ -1676,7 +1676,7 @@ 
   */
   public function _convertHeader2FileInfo($p_header, &$p_info)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Get the interesting attributes
     $p_info['filename'] = $p_header['filename'];
@@ -1685,7 +1685,7 @@ 
       $p_info['compressed_size'] = $p_header['compressed_size'];
       $p_info['mtime'] = $p_header['mtime'];
       $p_info['comment'] = $p_header['comment'];
-      $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+      $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
       $p_info['index'] = $p_header['index'];
       $p_info['status'] = $p_header['status'];
 
@@ -1718,7 +1718,7 @@ 
   */
   public function _extractByRule(&$p_file_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
       $p_path = $p_params['add_path'];
       $p_remove_path = $p_params['remove_path'];
@@ -1728,14 +1728,14 @@ 
     if (($p_path == '')
         || ((substr($p_path, 0, 1) != '/')
         && (substr($p_path, 0, 3) != '../') && (substr($p_path, 1, 2) != ':/'))) {
-        $p_path = './' . $p_path;
+        $p_path = './'.$p_path;
     }
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != './') && ($p_path != '/')) {
         // ----- Look for the path end '/'
       while (substr($p_path, -1) == '/') {
-          $p_path = substr($p_path, 0, strlen($p_path)-1);
+          $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -1764,7 +1764,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-      for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+      for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
           // ----- Read next Central dir entry
       @rewind($this->_zip_fd);
           if (@fseek($this->_zip_fd, $v_pos_entry)) {
@@ -1798,7 +1798,7 @@ 
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0;
+          for ($j = 0;
                   ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                && (!$v_extract);
                $j++) {
@@ -1840,15 +1840,15 @@ 
                && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+          for ($j = $j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
+              if (($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i <= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -1942,7 +1942,7 @@ 
   */
   public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->_readFileHeader($v_header)) != 1) {
@@ -1982,7 +1982,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
@@ -2048,7 +2048,7 @@ 
 
     // ----- Check the directory availability and create it if necessary
     else {
-        if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+        if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
             $v_dir_to_check = $p_entry['filename'];
         } elseif (!strstr($p_entry['filename'], '/')) {
             $v_dir_to_check = '';
@@ -2072,7 +2072,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
 
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
@@ -2177,7 +2177,7 @@ 
   */
   public function _extractFileAsString(&$p_entry, &$p_string)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -2193,7 +2193,7 @@ 
     // ----- Trace
 
     // ----- Do the extraction (if not a folder)
-    if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+    if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
       if ($p_entry['compressed_size'] == $p_entry['size']) {
           // ----- Trace
@@ -2234,7 +2234,7 @@ 
   */
   public function _readFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
@@ -2259,7 +2259,7 @@ 
         $p_header['status'] = 'invalid_header';
 
       // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
 
       // ----- Return
       return Archive_Zip::errorCode();
@@ -2292,7 +2292,7 @@ 
           // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
           $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-          $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+          $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -2336,7 +2336,7 @@ 
   */
   public function _readCentralFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
@@ -2361,7 +2361,7 @@ 
         $p_header['status'] = 'invalid_header';
 
       // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
 
       // ----- Return
       return Archive_Zip::errorCode();
@@ -2398,7 +2398,7 @@ 
         // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
         $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-        $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+        $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -2442,7 +2442,7 @@ 
   */
   public function _readEndCentralDir(&$p_central_dir)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->_zipname);
@@ -2459,8 +2459,8 @@ 
     // in this case the end of central dir is at 22 bytes of the file end
     $v_found = 0;
       if ($v_size > 26) {
-          @fseek($this->_zip_fd, $v_size-22);
-          if (($v_pos = @ftell($this->_zip_fd)) != ($v_size-22)) {
+          @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.'\'');
@@ -2485,8 +2485,8 @@ 
       if ($v_maximum_size > $v_size) {
           $v_maximum_size = $v_size;
       }
-        @fseek($this->_zip_fd, $v_size-$v_maximum_size);
-        if (@ftell($this->_zip_fd) != ($v_size-$v_maximum_size)) {
+        @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.'\'');
@@ -2572,11 +2572,11 @@ 
   */
   public function _deleteByRule(&$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         // ----- Return
       return $v_result;
     }
@@ -2607,7 +2607,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
       $j_start = 0;
-      for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+      for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
 
       // ----- Read the file header
       $v_header_list[$v_nb_extracted] = array();
@@ -2631,7 +2631,7 @@ 
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0;
+          for ($j = 0;
                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                  && (!$v_found);
                $j++) {
@@ -2643,7 +2643,7 @@ 
                   if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                       $v_found = true;
-                  } elseif ((($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                  } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */
                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -2679,19 +2679,19 @@ 
                && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start;
+          for ($j = $j_start;
                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
                  && (!$v_found);
                $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
-                  && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
+                  && ($i <= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -2724,11 +2724,11 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i < count($v_header_list); $i++) {
+        for ($i = 0; $i < count($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->_zip_fd);
-            if (@fseek($this->_zip_fd,  $v_header_list[$i]['offset'])) {
+            if (@fseek($this->_zip_fd, $v_header_list[$i]['offset'])) {
                 // ----- Clean
                 $this->_closeFd();
                 $v_temp_zip->_closeFd();
@@ -2778,9 +2778,9 @@ 
         $v_offset = @ftell($v_temp_zip->_zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i < count($v_header_list); $i++) {
+        for ($i = 0; $i < count($v_header_list); $i++) {
             // ----- Create the file header
-            $v_result=$v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
+            $v_result = $v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
             if ($v_result != 1) {
                 // ----- Clean
                 $v_temp_zip->_closeFd();
@@ -2800,7 +2800,7 @@ 
         $v_comment = '';
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->_zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->_zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         $v_result = $v_temp_zip->_writeCentralHeader(count($v_header_list),
@@ -2856,13 +2856,13 @@ 
   *
   * @param [type] $p_is_dir
   */
-  public function _dirCheck($p_dir, $p_is_dir=false)
+  public function _dirCheck($p_dir, $p_is_dir = false)
   {
       $v_result = 1;
 
     // ----- Remove the final '/'
     if ($p_is_dir && (substr($p_dir, -1) == '/')) {
-        $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+        $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
     }
 
     // ----- Check the directory availability
@@ -2910,7 +2910,7 @@ 
   */
   public function _merge(&$p_archive_to_add)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->_zipname)) {
@@ -2927,7 +2927,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         return $v_result;
     }
 
@@ -2942,7 +2942,7 @@ 
     @rewind($this->_zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->_openFd('rb')) != 1) {
+    if (($v_result = $p_archive_to_add->_openFd('rb')) != 1) {
         $this->_closeFd();
         return $v_result;
     }
@@ -3022,7 +3022,7 @@ 
     $v_comment = '';
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -3088,7 +3088,7 @@ 
   */
   public function _duplicate($p_archive_filename)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename)) {
@@ -3101,7 +3101,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('wb')) != 1) {
+    if (($v_result = $this->_openFd('wb')) != 1) {
         // ----- Return
       return $v_result;
     }
@@ -3175,8 +3175,8 @@ 
     // ----- Check specific parameters
     $v_callback_list = array('callback_pre_add', 'callback_post_add',
                               'callback_pre_extract', 'callback_post_extract');
-      for ($i=0; $i < count($v_callback_list); $i++) {
-          $v_key=$v_callback_list[$i];
+      for ($i = 0; $i < count($v_callback_list); $i++) {
+          $v_key = $v_callback_list[$i];
           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,
@@ -3205,7 +3205,7 @@ 
   * @param integer $p_error_code
   * @param string $p_error_string
   */
-  public function _errorLog($p_error_code=0, $p_error_string='')
+  public function _errorLog($p_error_code = 0, $p_error_string = '')
   {
       $this->_error_code = $p_error_code;
       $this->_error_string = $p_error_string;
@@ -3252,7 +3252,7 @@ 
       $v_list = explode('/', $p_dir);
 
       // ----- Study directories from last to first
-      for ($i= count($v_list) - 1; $i >= 0; $i--) {
+      for ($i = count($v_list) - 1; $i >= 0; $i--) {
           // ----- Look for current path
         if ($v_list[$i] == '.') {
             // ----- Ignore this directory
@@ -3264,7 +3264,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 : '');
         }
       }
     }
@@ -3374,11 +3374,11 @@ 
   *
   * @param integer $p_mode
   */
-  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
       $v_result = 1;
 
-      if ($p_mode==0) {
+      if ($p_mode == 0) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3386,7 +3386,7 @@ 
               @fwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==1) {
+      } elseif ($p_mode == 1) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3394,7 +3394,7 @@ 
               @fwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==2) {
+      } elseif ($p_mode == 2) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3402,7 +3402,7 @@ 
               @gzwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==3) {
+      } elseif ($p_mode == 3) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3473,13 +3473,13 @@ 
   *
   * @param [type] $p_remove_disk_letter
   */
-  public function _tool_TranslateWinPath($p_path, $p_remove_disk_letter=true)
+  public function _tool_TranslateWinPath($p_path, $p_remove_disk_letter = true)
   {
       if (stristr(php_uname(), 'windows')) {
           // ----- Look for potential disk letter
       if ($p_remove_disk_letter
           && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
       if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {

xoops_trust_path/libs/altsys/include/gtickets.php

Doc Comments +3 added lines

@@ -233,6 +233,9 @@
         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>' ;
     }
 
+        /**
+         * @param string $key_name
+         */
         public function extract_post_recursive($key_name, $tmp_array)
         {
             $table = '' ;

Spacing +104 added lines, -104 removed lines

@@ -2,147 +2,147 @@ 
 // GIJOE's Ticket Class (based on Marijuana's Oreteki XOOPS)
 // nobunobu's suggestions are applied
 
-if (! class_exists('XoopsGTicket')) {
+if (!class_exists('XoopsGTicket')) {
     class XoopsGTicket
     {
 
-        public $_errors = array() ;
-        public $_latest_token = '' ;
-        public $messages = array() ;
+        public $_errors = array();
+        public $_latest_token = '';
+        public $messages = array();
 
         public function __construct()
         {
-            global $xoopsConfig ;
+            global $xoopsConfig;
 
         // language file
-        if (defined('XOOPS_ROOT_PATH') && ! empty($xoopsConfig['language']) && ! strstr($xoopsConfig['language'], '/')) {
-            if (file_exists(dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml')) {
-                include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml' ;
+        if (defined('XOOPS_ROOT_PATH') && !empty($xoopsConfig['language']) && !strstr($xoopsConfig['language'], '/')) {
+            if (file_exists(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml')) {
+                include dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/gticket_messages.phtml';
             }
         }
 
         // default messages
         if (empty($this->messages)) {
             $this->messages = array(
-            'err_general' => 'GTicket Error' ,
-            'err_nostubs' => 'No stubs found' ,
-            'err_noticket' => 'No ticket found' ,
-            'err_nopair' => 'No valid ticket-stub pair found' ,
-            'err_timeout' => 'Time out' ,
-            'err_areaorref' => 'Invalid area or referer' ,
-            'fmt_prompt4repost' => 'error(s) found:<br /><span style="background-color:red;font-weight:bold;color:white;">%s</span><br />Confirm it.<br />And do you want to post again?' ,
+            'err_general' => 'GTicket Error',
+            'err_nostubs' => 'No stubs found',
+            'err_noticket' => 'No ticket found',
+            'err_nopair' => 'No valid ticket-stub pair found',
+            'err_timeout' => 'Time out',
+            'err_areaorref' => 'Invalid area or referer',
+            'fmt_prompt4repost' => 'error(s) found:<br /><span style="background-color:red;font-weight:bold;color:white;">%s</span><br />Confirm it.<br />And do you want to post again?',
             'btn_repost' => 'repost'
-        ) ;
+        );
         }
         }
 
     // render form as plain html
     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
     public function getTicketXoopsForm($salt = '', $timeout = 1800, $area = '')
     {
-        return new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area)) ;
+        return new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area));
     }
 
     // add a ticket as Hidden Element into XoopsForm
     public function addTicketXoopsFormElement(&$form, $salt = '', $timeout = 1800, $area = '')
     {
-        $form->addElement(new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area))) ;
+        $form->addElement(new XoopsFormHidden('XOOPS_G_TICKET', $this->issue($salt, $timeout, $area)));
     }
 
     // returns an array for xoops_confirm() ;
     public function getTicketArray($salt = '', $timeout = 1800, $area = '')
     {
-        return array( 'XOOPS_G_TICKET' => $this->issue($salt, $timeout, $area) ) ;
+        return array('XOOPS_G_TICKET' => $this->issue($salt, $timeout, $area));
     }
 
     // return GET parameter string.
-    public function getTicketParamString($salt = '', $noamp = false, $timeout=1800, $area = '')
+    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
     public function issue($salt = '', $timeout = 1800, $area = '')
     {
-        global $xoopsModule ;
+        global $xoopsModule;
 
         // create a token
-        list($usec, $sec) = explode(' ', microtime()) ;
-        $appendix_salt = empty($_SERVER['PATH']) ? XOOPS_DB_NAME : $_SERVER['PATH'] ;
-        $token = crypt($salt . $usec . $appendix_salt . $sec, XOOPS_DB_PREFIX) ;
-        $this->_latest_token = $token ;
+        list($usec, $sec) = explode(' ', microtime());
+        $appendix_salt = empty($_SERVER['PATH']) ? XOOPS_DB_NAME : $_SERVER['PATH'];
+        $token = crypt($salt.$usec.$appendix_salt.$sec, XOOPS_DB_PREFIX);
+        $this->_latest_token = $token;
 
         if (empty($_SESSION['XOOPS_G_STUBS'])) {
-            $_SESSION['XOOPS_G_STUBS'] = array() ;
+            $_SESSION['XOOPS_G_STUBS'] = array();
         }
 
         // limit max stubs 10
         if (count($_SESSION['XOOPS_G_STUBS']) > 10) {
-            $_SESSION['XOOPS_G_STUBS'] = array_slice($_SESSION['XOOPS_G_STUBS'], -10) ;
+            $_SESSION['XOOPS_G_STUBS'] = array_slice($_SESSION['XOOPS_G_STUBS'], -10);
         }
 
         // record referer if browser send it
-        $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['REQUEST_URI'] ;
+        $referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['REQUEST_URI'];
 
         // area as module's dirname
-        if (! $area && is_object(@$xoopsModule)) {
-            $area = $xoopsModule->getVar('dirname') ;
+        if (!$area && is_object(@$xoopsModule)) {
+            $area = $xoopsModule->getVar('dirname');
         }
 
         // store stub
         $_SESSION['XOOPS_G_STUBS'][] = array(
-            'expire' => time() + $timeout ,
-            'referer' => $referer ,
-            'area' => $area ,
+            'expire' => time() + $timeout,
+            'referer' => $referer,
+            'area' => $area,
             'token' => $token
-        ) ;
+        );
 
         // paid md5ed token as a ticket
-        return md5($token . XOOPS_DB_PREFIX) ;
+        return md5($token.XOOPS_DB_PREFIX);
     }
 
     // check a ticket
     public function check($post = true, $area = '', $allow_repost = true)
     {
-        global $xoopsModule ;
+        global $xoopsModule;
 
-        $this->_errors = array() ;
+        $this->_errors = array();
 
         // CHECK: stubs are not stored in session
-        if (! is_array(@$_SESSION['XOOPS_G_STUBS'])) {
-            $this->_errors[] = $this->messages['err_nostubs'] ;
-            $_SESSION['XOOPS_G_STUBS'] = array() ;
+        if (!is_array(@$_SESSION['XOOPS_G_STUBS'])) {
+            $this->_errors[] = $this->messages['err_nostubs'];
+            $_SESSION['XOOPS_G_STUBS'] = array();
         }
 
         // get key&val of the ticket from a user's query
-        $ticket = $post ? @$_POST['XOOPS_G_TICKET'] : @$_GET['XOOPS_G_TICKET'] ;
+        $ticket = $post ? @$_POST['XOOPS_G_TICKET'] : @$_GET['XOOPS_G_TICKET'];
 
         // CHECK: no tickets found
         if (empty($ticket)) {
-            $this->_errors[] = $this->messages['err_noticket'] ;
+            $this->_errors[] = $this->messages['err_noticket'];
         }
 
         // gargage collection & find a right stub
-        $stubs_tmp = $_SESSION['XOOPS_G_STUBS'] ;
-        $_SESSION['XOOPS_G_STUBS'] = array() ;
+        $stubs_tmp = $_SESSION['XOOPS_G_STUBS'];
+        $_SESSION['XOOPS_G_STUBS'] = array();
         foreach ($stubs_tmp as $stub) {
             // default lifetime 30min
             if ($stub['expire'] >= time()) {
-                if (md5($stub['token'] . XOOPS_DB_PREFIX) === $ticket) {
-                    $found_stub = $stub ;
+                if (md5($stub['token'].XOOPS_DB_PREFIX) === $ticket) {
+                    $found_stub = $stub;
                 } else {
                     // store the other valid stubs into session
-                    $_SESSION['XOOPS_G_STUBS'][] = $stub ;
+                    $_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 ;
+                    $timeout_flag = true;
                 }
             }
         }
@@ -150,40 +150,40 @@ 
         // CHECK: the right stub found or not
         if (empty($found_stub)) {
             if (empty($timeout_flag)) {
-                $this->_errors[] = $this->messages['err_nopair'] ;
+                $this->_errors[] = $this->messages['err_nopair'];
             } else {
-                $this->_errors[] = $this->messages['err_timeout'] ;
+                $this->_errors[] = $this->messages['err_timeout'];
             }
         } else {
 
             // set area if necessary
             // area as module's dirname
-            if (! $area && is_object(@$xoopsModule)) {
-                $area = $xoopsModule->getVar('dirname') ;
+            if (!$area && is_object(@$xoopsModule)) {
+                $area = $xoopsModule->getVar('dirname');
             }
 
             // check area or referer
             if (@$found_stub['area'] == $area) {
-                $area_check = true ;
+                $area_check = true;
             }
-            if (! empty($found_stub['referer']) && strstr(@$_SERVER['HTTP_REFERER'], $found_stub['referer'])) {
-                $referer_check = true ;
+            if (!empty($found_stub['referer']) && strstr(@$_SERVER['HTTP_REFERER'], $found_stub['referer'])) {
+                $referer_check = true;
             }
 
             if (empty($area_check) && empty($referer_check)) { // loose
-                $this->_errors[] = $this->messages['err_areaorref'] ;
+                $this->_errors[] = $this->messages['err_areaorref'];
             }
         }
 
-        if (! empty($this->_errors)) {
+        if (!empty($this->_errors)) {
             if ($allow_repost) {
                 // repost form
-                $this->draw_repost_form($area) ;
-                exit ;
+                $this->draw_repost_form($area);
+                exit;
             } else {
                 // failed
-                $this->clear() ;
-                return false ;
+                $this->clear();
+                return false;
             }
         } else {
             // all green
@@ -196,78 +196,78 @@ 
     {
         // Notify which file is broken
         if (headers_sent()) {
-            restore_error_handler() ;
-            set_error_handler(array( &$this, 'errorHandler4FindOutput' )) ;
-            header('Dummy: for warning') ;
-            restore_error_handler() ;
-            exit ;
+            restore_error_handler();
+            set_error_handler(array(&$this, 'errorHandler4FindOutput'));
+            header('Dummy: for warning');
+            restore_error_handler();
+            exit;
         }
 
-        $table = '<table>' ;
-        $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES).'" method="post" >' ;
+        $table = '<table>';
+        $form = '<form action="?'.htmlspecialchars(@$_SERVER['QUERY_STRING'], ENT_QUOTES).'" method="post" >';
         foreach ($_POST as $key => $val) {
             if ($key == 'XOOPS_G_TICKET') {
-                continue ;
+                continue;
             }
             if (get_magic_quotes_gpc()) {
-                $key = stripslashes($key) ;
+                $key = stripslashes($key);
             }
             if (is_array($val)) {
-                list($tmp_table, $tmp_form) = $this->extract_post_recursive(htmlspecialchars($key, ENT_QUOTES), $val) ;
-                $table .= $tmp_table ;
-                $form .= $tmp_form ;
+                list($tmp_table, $tmp_form) = $this->extract_post_recursive(htmlspecialchars($key, ENT_QUOTES), $val);
+                $table .= $tmp_table;
+                $form .= $tmp_form;
             } else {
                 if (get_magic_quotes_gpc()) {
-                    $val = stripslashes($val) ;
+                    $val = stripslashes($val);
                 }
-                $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" ;
+                $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";
             }
         }
-        $table .= '</table>' ;
-        $form .= $this->getTicketHtml(__LINE__, 300, $area).'<input type="submit" value="'.$this->messages['btn_repost'].'" /></form>' ;
+        $table .= '</table>';
+        $form .= $this->getTicketHtml(__LINE__, 300, $area).'<input type="submit" value="'.$this->messages['btn_repost'].'" /></form>';
 
-        error_reporting(0) ;
+        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>';
     }
 
         public function extract_post_recursive($key_name, $tmp_array)
         {
-            $table = '' ;
-            $form = '' ;
+            $table = '';
+            $form = '';
             foreach ($tmp_array as $key => $val) {
                 if (get_magic_quotes_gpc()) {
-                    $key = stripslashes($key) ;
+                    $key = stripslashes($key);
                 }
                 if (is_array($val)) {
-                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES).']', $val) ;
-                    $table .= $tmp_table ;
-                    $form .= $tmp_form ;
+                    list($tmp_table, $tmp_form) = $this->extract_post_recursive($key_name.'['.htmlspecialchars($key, ENT_QUOTES).']', $val);
+                    $table .= $tmp_table;
+                    $form .= $tmp_form;
                 } else {
                     if (get_magic_quotes_gpc()) {
-                        $val = stripslashes($val) ;
+                        $val = stripslashes($val);
                     }
-                    $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" ;
+                    $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";
                 }
             }
-            return array( $table , $form ) ;
+            return array($table, $form);
         }
 
 
     // clear all stubs
     public function clear()
     {
-        $_SESSION['XOOPS_G_STUBS'] = array() ;
+        $_SESSION['XOOPS_G_STUBS'] = array();
     }
 
 
     // Ticket Using
     public function using()
     {
-        if (! empty($_SESSION['XOOPS_G_STUBS'])) {
+        if (!empty($_SESSION['XOOPS_G_STUBS'])) {
             return true;
         } else {
             return false;
@@ -279,39 +279,39 @@ 
     public function getErrors($ashtml = true)
     {
         if ($ashtml) {
-            $ret = '' ;
+            $ret = '';
             foreach ($this->_errors as $msg) {
-                $ret .= "$msg<br />\n" ;
+                $ret .= "$msg<br />\n";
             }
         } else {
-            $ret = $this->_errors ;
+            $ret = $this->_errors;
         }
-        return $ret ;
+        return $ret;
     }
 
         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]) . ' line ' . htmlspecialchars($regs[2]) ;
+                echo 'Irregular output! check the file '.htmlspecialchars($regs[1]).' line '.htmlspecialchars($regs[2]);
             } else {
                 echo 'Irregular output! check language files etc.';
             }
-            return ;
+            return;
         }
 // end of class
     }
 
 // create a instance in global scope
-$GLOBALS['xoopsGTicket'] = new XoopsGTicket() ;
+$GLOBALS['xoopsGTicket'] = new XoopsGTicket();
 }
 
-if (! function_exists('admin_refcheck')) {
+if (!function_exists('admin_refcheck')) {
 
 //Admin Referer Check By Marijuana(Rev.011)
 function admin_refcheck($chkref = '')
 {
     if (empty($_SERVER['HTTP_REFERER'])) {
-        return true ;
+        return true;
     } else {
         $ref = $_SERVER['HTTP_REFERER'];
     }

xoops_trust_path/libs/altsys/include/Text_Diff.php

Doc Comments +5 added lines

@@ -441,6 +441,7 @@ 
      * the two files do not match, and likewise that the last lines do not
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
+     * @param double $nchunks
      */
     public function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
@@ -561,6 +562,10 @@ 
      *
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
+     * @param integer $xoff
+     * @param integer $xlim
+     * @param integer $yoff
+     * @param integer $ylim
      */
     public function _compareseq($xoff, $xlim, $yoff, $ylim)
     {

Spacing +3 added lines, -3 removed lines

@@ -465,7 +465,7 @@ 
         }
 
         $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
+        $this->seq[0] = $yoff - 1;
         $this->in_seq = array();
         $ymids[0] = array();
 
@@ -478,7 +478,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];
                 if (empty($ymatches[$line])) {
@@ -646,7 +646,7 @@ 
                 $j++;
             }
 
-            while ($i < $len && ! $changed[$i]) {
+            while ($i < $len && !$changed[$i]) {
                 assert('$j < $other_len && ! $other_changed[$j]');
                 $i++;
                 $j++;

xoops_trust_path/libs/altsys/include/Text_Diff_Renderer.php

Doc Comments +9 added lines

@@ -125,6 +125,12 @@ 
         return $output . $this->_endDiff();
     }
 
+    /**
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
+     */
     public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
@@ -174,6 +180,9 @@ 
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     public function _startBlock($header)
     {
         return $header . "\n";

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
     public function __construct($params = array())
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
             if (isset($this->$v)) {
                 $this->$v = $value;
             }
@@ -122,7 +122,7 @@ 
                                      $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     public function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -149,7 +149,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     public function _startDiff()
@@ -165,18 +165,18 @@ 
     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;
     }
 
     public function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     public function _endBlock()
@@ -186,7 +186,7 @@ 
 
     public function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     public function _context($lines)
@@ -206,6 +206,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 +6 added lines

@@ -63,6 +63,9 @@ 
         return $header;
     }
 
+    /**
+     * @param string[] $lines
+     */
     public function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
@@ -128,6 +131,9 @@ 
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
     }
 
+    /**
+     * @param string $string
+     */
     public function _splitOnWords($string, $newlineEscape = "\n")
     {
         $words = array();

Spacing +5 added lines, -5 removed lines

@@ -72,14 +72,14 @@ 
         if ($this->_split_level == 'words') {
             return implode('', $lines);
         } else {
-            return implode("\n", $lines) . "\n";
+            return implode("\n", $lines)."\n";
         }
     }
 
     public function _added($lines)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -87,7 +87,7 @@ 
     public function _deleted($lines, $words = false)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -105,7 +105,7 @@ 
                 $orig[0] = substr($orig[0], 1);
                 $final[0] = substr($final[0], 1);
             }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -125,7 +125,7 @@ 
                                                                array('split_level' => 'words')));
 
         /* 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";
     }
 
     public function _splitOnWords($string, $newlineEscape = "\n")