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/MyBlocksAdmin.class.php

Doc Comments +24 added lines

@@ -488,6 +488,12 @@ 
     }
 
 
+    /**
+     * @param integer $bside
+     * @param integer $bweight
+     * @param integer $bvisible
+     * @param integer $bcachetime
+     */
     public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options=array())
     {
         global $xoopsConfig;
@@ -646,6 +652,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_delete($bid)
     {
         $bid = intval($bid) ;
@@ -671,6 +680,9 @@ 
     }
 
 //HACK add by domifara
+/**
+ * @param integer $bid
+ */
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = intval($bid) ;
@@ -679,6 +691,9 @@ 
     $this->db->query($sql) ;
 }
 
+    /**
+     * @param integer $bid
+     */
     public function form_delete($bid)
     {
         $bid = intval($bid) ;
@@ -708,6 +723,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_clone($bid)
     {
         $bid = intval($bid) ;
@@ -786,6 +804,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_edit($bid)
     {
         $bid = intval($bid) ;
@@ -829,6 +850,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function form_edit($bid, $mode = 'edit')
     {
         $bid = intval($bid) ;

Switch Indentation +66 added lines, -66 removed lines

@@ -308,30 +308,30 @@ 
         $scoln = 'disabled';
     } else {
         switch ($side) {
-        case XOOPS_SIDEBLOCK_LEFT :
-            $ssel0 = " checked='checked'";
-            $scol0 = 'selected';
-            break ;
-        case XOOPS_SIDEBLOCK_RIGHT :
-            $ssel1 = " checked='checked'";
-            $scol1 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_LEFT :
-            $ssel2 = " checked='checked'";
-            $scol2 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_RIGHT :
-            $ssel4 = " checked='checked'";
-            $scol4 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_CENTER :
-            $ssel3 = " checked='checked'";
-            $scol3 = 'selected';
-            break ;
-        default :
-            $value4extra_side = $side ;
-            $stextbox = 'selected';
-            break ;
+            case XOOPS_SIDEBLOCK_LEFT :
+                $ssel0 = " checked='checked'";
+                $scol0 = 'selected';
+                break ;
+            case XOOPS_SIDEBLOCK_RIGHT :
+                $ssel1 = " checked='checked'";
+                $scol1 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_LEFT :
+                $ssel2 = " checked='checked'";
+                $scol2 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_RIGHT :
+                $ssel4 = " checked='checked'";
+                $scol4 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_CENTER :
+                $ssel3 = " checked='checked'";
+                $scol3 = 'selected';
+                break ;
+            default :
+                $value4extra_side = $side ;
+                $stextbox = 'selected';
+                break ;
     }
     }
 
@@ -851,31 +851,31 @@ 
         }
 
         switch ($mode) {
-        case 'clone' :
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
-            // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
-        case 'new' :
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
-            // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
-        case 'edit' :
-        default :
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
-            // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            case 'clone' :
+                $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
+                $next_op = 'clone_ok' ;
+                // breadcrumbs
+                $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
+                break ;
+            case 'new' :
+                $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
+                $next_op = 'new_ok' ;
+                // breadcrumbs
+                $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
+                break ;
+            case 'edit' :
+            default :
+                $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
+                $next_op = 'edit_ok' ;
+                // breadcrumbs
+                $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
+                break ;
     }
 
         $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
@@ -1051,23 +1051,23 @@ 
     {
         $bid = (int)(@$_GET['bid']);
         switch (@$_GET['op']) {
-        case 'clone' :
-            $this->form_edit($bid, 'clone') ;
-            break ;
-        case 'new' :
-        case 'edit' :
-            $this->form_edit($bid, 'edit') ;
-            break ;
-        case 'delete' :
-            $this->form_delete($bid) ;
-            break ;
-        case 'list' :
-        default :
-            // the first form (blocks)
-            $this->list_blocks() ;
-            // the second form (groups)
-            $this->list_groups() ;
-            break ;
+            case 'clone' :
+                $this->form_edit($bid, 'clone') ;
+                break ;
+            case 'new' :
+            case 'edit' :
+                $this->form_edit($bid, 'edit') ;
+                break ;
+            case 'delete' :
+                $this->form_delete($bid) ;
+                break ;
+            case 'list' :
+            default :
+                // the first form (blocks)
+                $this->list_blocks() ;
+                // the second form (groups)
+                $this->list_groups() ;
+                break ;
     }
     }
 }

Spacing +353 added lines, -353 removed lines

@@ -4,16 +4,16 @@ 
 class MyBlocksAdmin
 {
 
-    public $db ;
-    public $lang ;
-    public $cachetime_options = array() ;
-    public $ctype_options = array() ;
-    public $type_options = array() ;
-    public $target_mid = 0 ;
-    public $target_dirname = '' ;
-    public $target_mname = '' ;
-    public $block_configs = array() ;
-    public $preview_request = array() ;
+    public $db;
+    public $lang;
+    public $cachetime_options = array();
+    public $ctype_options = array();
+    public $type_options = array();
+    public $target_mid = 0;
+    public $target_dirname = '';
+    public $target_mname = '';
+    public $block_configs = array();
+    public $preview_request = array();
 
     public function MyBlocksAadmin()
     {
@@ -22,37 +22,37 @@ 
 
     public function construct()
     {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection() ;
-        $this->lang = @$GLOBALS['xoopsConfig']['language'] ;
+        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+        $this->lang = @$GLOBALS['xoopsConfig']['language'];
 
         $this->cachetime_options = array(
-        0 => _NOCACHE ,
-        30 => sprintf(_SECONDS, 30) ,
-        60 => _MINUTE ,
-        300 => sprintf(_MINUTES, 5) ,
-        1800 => sprintf(_MINUTES, 30) ,
-        3600 => _HOUR ,
-        18000 => sprintf(_HOURS, 5) ,
-        86400 => _DAY ,
-        259200 => sprintf(_DAYS, 3) ,
-        604800 => _WEEK ,
+        0 => _NOCACHE,
+        30 => sprintf(_SECONDS, 30),
+        60 => _MINUTE,
+        300 => sprintf(_MINUTES, 5),
+        1800 => sprintf(_MINUTES, 30),
+        3600 => _HOUR,
+        18000 => sprintf(_HOURS, 5),
+        86400 => _DAY,
+        259200 => sprintf(_DAYS, 3),
+        604800 => _WEEK,
         2592000 => _MONTH
     );
 
         $this->ctype_options = array(
-        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML ,
-        'T' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE ,
-        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ,
+        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML,
+        'T' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE,
+        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE,
         'P' => _MD_A_MYBLOCKSADMIN_CTYPE_PHP
-    ) ;
+    );
 
         $this->type_options = array(
-        'C' => 'custom block' ,
-        'E' => 'cloned custom block' ,
-        'M' => 'module\'s block' ,
-        'D' => 'cloned module\'s block' ,
+        'C' => 'custom block',
+        'E' => 'cloned custom block',
+        'M' => 'module\'s block',
+        'D' => 'cloned module\'s block',
         'S' => 'system block'
-    ) ;
+    );
     }
 
 //HACK by domifara for php5.3+
@@ -61,8 +61,8 @@ 
 {
     static $instance;
     if (!isset($instance)) {
-        $instance = new MyBlocksAdmin() ;
-        $instance->construct() ;
+        $instance = new MyBlocksAdmin();
+        $instance->construct();
     }
     return $instance;
 }
@@ -72,11 +72,11 @@ 
 public function checkPermission()
 {
     // only groups have 'module_admin' of 'altsys' can do that.
-    $module_handler = xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
-    $moduleperm_handler = xoops_gethandler('groupperm') ;
-    if (! is_object(@$GLOBALS['xoopsUser']) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
-        die('only admin of altsys can access this area') ;
+    $module_handler = xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
+    $moduleperm_handler = xoops_gethandler('groupperm');
+    if (!is_object(@$GLOBALS['xoopsUser']) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
+        die('only admin of altsys can access this area');
     }
 }
 
@@ -87,52 +87,52 @@ 
     if ($xoopsModule->getVar('dirname') == 'altsys') {
         // set target_module if specified by $_GET['dirname']
         $module_handler = xoops_gethandler('module');
-        if (! empty($_GET['dirname'])) {
-            $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-            $target_module =& $module_handler->getByDirname($dirname) ;
+        if (!empty($_GET['dirname'])) {
+            $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+            $target_module = & $module_handler->getByDirname($dirname);
         }
 
         if (is_object(@$target_module)) {
             // module's blocks
-            $this->target_mid = $target_module->getVar('mid') ;
-            $this->target_mname = $target_module->getVar('name') . ' ' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
-            $this->target_dirname = $target_module->getVar('dirname') ;
-            $modinfo = $target_module->getInfo() ;
+            $this->target_mid = $target_module->getVar('mid');
+            $this->target_mname = $target_module->getVar('name').' '.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
+            $this->target_dirname = $target_module->getVar('dirname');
+            $modinfo = $target_module->getInfo();
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN') ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname) ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname);
         } else {
             // custom blocks
-            $this->target_mid = 0 ;
-            $this->target_mname = _MI_ALTSYS_MENU_CUSTOMBLOCKS ;
-            $this->target_dirname = '__CustomBlocks__' ;
+            $this->target_mid = 0;
+            $this->target_mname = _MI_ALTSYS_MENU_CUSTOMBLOCKS;
+            $this->target_dirname = '__CustomBlocks__';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN') ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS') ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS');
         }
     } else {
         // myblocksadmin as a library
-        $this->target_mid = $xoopsModule->getVar('mid') ;
-        $this->target_mname = $xoopsModule->getVar('name') . ' ' . sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0) ;
-        $this->target_dirname = $xoopsModule->getVar('dirname') ;
-        $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname') ;
-        $modinfo = $xoopsModule->getInfo() ;
-        $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname) ;
-        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN) ;
+        $this->target_mid = $xoopsModule->getVar('mid');
+        $this->target_mname = $xoopsModule->getVar('name').' '.sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0);
+        $this->target_dirname = $xoopsModule->getVar('dirname');
+        $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname');
+        $modinfo = $xoopsModule->getInfo();
+        $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname);
+        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN);
     }
 
     // read xoops_version.php of the target
-    $this->block_configs = $this->get_block_configs() ;
+    $this->block_configs = $this->get_block_configs();
     }
 
 
 // virtual
 public function canEdit($block)
 {
-    return true ;
+    return true;
 }
 
 
@@ -141,9 +141,9 @@ 
 {
     // can delete if it is a cloned block
     if ($block->getVar('block_type') == 'D' || $block->getVar('block_type') == 'C') {
-        return true ;
+        return true;
     } else {
-        return false ;
+        return false;
     }
 }
 
@@ -156,23 +156,23 @@ 
 {
     // can clone link if it is marked as cloneable block
     if ($block->getVar('block_type') == 'D' || $block->getVar('block_type') == 'C') {
-        return 2 ;
+        return 2;
     } else {
         // $modversion['blocks'][n]['can_clone']
         foreach ($this->block_configs as $bconf) {
             if ($block->getVar('show_func') == @$bconf['show_func'] && $block->getVar('func_file') == @$bconf['file'] && (empty($bconf['template']) || $block->getVar('template') == @$bconf['template'])) {
-                if (! empty($bconf['can_clone'])) {
-                    return 2 ;
+                if (!empty($bconf['can_clone'])) {
+                    return 2;
                 }
             }
         }
     }
 
-    if (! empty($GLOBALS['altsysModuleConfig']['enable_force_clone'])) {
-        return 1 ;
+    if (!empty($GLOBALS['altsysModuleConfig']['enable_force_clone'])) {
+        return 1;
     }
 
-    return 0 ;
+    return 0;
 }
 
 
@@ -185,12 +185,12 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
-    return $block->getOptions() ;
+    return $block->getOptions();
 }
 
 
@@ -203,16 +203,16 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_mids = $block_data['bmodule'] ;
+        $selected_mids = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_mids = array();
         while (list($selected_mid) = $this->db->fetchRow($result)) {
             $selected_mids[] = (int)$selected_mid;
         }
         if (empty($selected_mids)) {
-            $selected_mids = array( 0 ) ;
+            $selected_mids = array(0);
         } // all pages
     }
 
@@ -221,25 +221,25 @@ 
     $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
     $criteria->add(new Criteria('isactive', 1));
     $module_list = $module_handler->getList($criteria);
-    $module_list= array( -1 => _MD_A_MYBLOCKSADMIN_TOPPAGE , 0 => _MD_A_MYBLOCKSADMIN_ALLPAGES ) + $module_list ;
+    $module_list = array( -1 => _MD_A_MYBLOCKSADMIN_TOPPAGE, 0 => _MD_A_MYBLOCKSADMIN_ALLPAGES ) + $module_list;
 
     // build options
-    $module_options = '' ;
+    $module_options = '';
     foreach ($module_list as $mid => $mname) {
-        $mname = htmlspecialchars($mname) ;
+        $mname = htmlspecialchars($mname);
         if (in_array($mid, $selected_mids)) {
-            $module_options .= "<option value='$mid' selected='selected'>$mname</option>\n" ;
+            $module_options .= "<option value='$mid' selected='selected'>$mname</option>\n";
         } else {
-            $module_options .= "<option value='$mid'>$mname</option>\n" ;
+            $module_options .= "<option value='$mid'>$mname</option>\n";
         }
     }
 
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
 					$module_options
-				</select>" ;
+				</select>";
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -252,41 +252,41 @@ 
     // get selected targets
     if (is_array(@$block_data['bgroup'])) {
         // bgroup origined from request (preview etc.)
-        $selected_gids = $block_data['bgroup'] ;
+        $selected_gids = $block_data['bgroup'];
     } else {
         // origined from the table of `group_perm`
-        $result = $this->db->query('SELECT gperm_groupid FROM ' . $this->db->prefix('group_permission') . " WHERE gperm_itemid='$bid' AND gperm_name='block_read'") ;
+        $result = $this->db->query('SELECT gperm_groupid FROM '.$this->db->prefix('group_permission')." WHERE gperm_itemid='$bid' AND gperm_name='block_read'");
         $selected_gids = array();
         while (list($selected_gid) = $this->db->fetchRow($result)) {
             $selected_gids[] = (int)$selected_gid;
         }
         if ($bid == 0 && empty($selected_gids)) {
-            $selected_gids = $GLOBALS['xoopsUser']->getGroups() ;
+            $selected_gids = $GLOBALS['xoopsUser']->getGroups();
         }
     }
 
     // get all targets
     $group_handler = xoops_gethandler('group');
-    $groups = $group_handler->getObjects() ;
+    $groups = $group_handler->getObjects();
 
     // build options
-    $group_options = '' ;
+    $group_options = '';
     foreach ($groups as $group) {
-        $gid = $group->getVar('groupid') ;
-        $gname = $group->getVar('name', 's') ;
+        $gid = $group->getVar('groupid');
+        $gname = $group->getVar('name', 's');
         if (in_array($gid, $selected_gids)) {
-            $group_options .= "<option value='$gid' selected='selected'>$gname</option>\n" ;
+            $group_options .= "<option value='$gid' selected='selected'>$gname</option>\n";
         } else {
-            $group_options .= "<option value='$gid'>$gname</option>\n" ;
+            $group_options .= "<option value='$gid'>$gname</option>\n";
         }
     }
 
     $ret = "
 				<select name='bgroups[$bid][]' size='5' multiple='multiple'>
 					$group_options
-				</select>" ;
+				</select>";
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -301,7 +301,7 @@ 
     $sseln = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = '';
     $scoln = $scol0 = $scol1 = $scol2 = $scol3 = $scol4 = 'unselected';
     $stextbox = 'unselected';
-    $value4extra_side = '' ;
+    $value4extra_side = '';
 
     if ($visible != 1) {
         $sseln = " checked='checked'";
@@ -311,27 +311,27 @@ 
         case XOOPS_SIDEBLOCK_LEFT :
             $ssel0 = " checked='checked'";
             $scol0 = 'selected';
-            break ;
+            break;
         case XOOPS_SIDEBLOCK_RIGHT :
             $ssel1 = " checked='checked'";
             $scol1 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_LEFT :
             $ssel2 = " checked='checked'";
             $scol2 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_RIGHT :
             $ssel4 = " checked='checked'";
             $scol4 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_CENTER :
             $ssel3 = " checked='checked'";
             $scol3 = 'selected';
-            break ;
+            break;
         default :
-            $value4extra_side = $side ;
+            $value4extra_side = $side;
             $stextbox = 'selected';
-            break ;
+            break;
     }
     }
 
@@ -361,7 +361,7 @@ 
 				<div class='blockposition $scoln'>
 					<input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;' />
 				</div>
-                <div style='float:"._GLOBAL_LEFT.";'>"._NONE . '</div>
+                <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div>
     ';
 }
 
@@ -369,58 +369,58 @@ 
 // public
 public function list_blocks()
 {
-    global $xoopsGTicket ;
+    global $xoopsGTicket;
 
     // main query
-    $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight" ;
-    $result = $this->db->query($sql) ;
-    $block_arr = array() ;
+    $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+    $result = $this->db->query($sql);
+    $block_arr = array();
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler = xoops_gethandler('block');//add
+        $handler = xoops_gethandler('block'); //add
     }
     while ($myrow = $this->db->fetchArray($result)) {
 
 //HACK by domifara
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $block_one =& $handler->create(false) ;
+            $block_one = & $handler->create(false);
             $block_one->assignVars($myrow);
-            $block_arr[] =& $block_one ;
+            $block_arr[] = & $block_one;
         } else {
-            $block_arr[] = new XoopsBlock($myrow) ;
+            $block_arr[] = new XoopsBlock($myrow);
         }
     }
     if (empty($block_arr)) {
-        return ;
+        return;
     }
 
     // blocks rendering loop
-    $blocks4assign = array() ;
+    $blocks4assign = array();
     foreach ($block_arr as $i => $block) {
         $block_data = array(
             'bid' => (int)$block->getVar('bid'),
-            'name' => $block->getVar('name', 'n') ,
-            'title' => $block->getVar('title', 'n') ,
+            'name' => $block->getVar('name', 'n'),
+            'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-            'can_edit' => $this->canEdit($block) ,
-            'can_delete' => $this->canDelete($block) ,
+            'can_edit' => $this->canEdit($block),
+            'can_delete' => $this->canDelete($block),
             'can_clone' => $this->canClone($block)
-        ) ;
+        );
         $blocks4assign[] = array(
-            'name_raw' => $block_data['name'] ,
-            'title_raw' => $block_data['title'] ,
-            'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-            'cell_module_link' =>  $this->renderCell4BlockModuleLink($block_data) ,
+            'name_raw' => $block_data['name'],
+            'title_raw' => $block_data['title'],
+            'cell_position' => $this->renderCell4BlockPosition($block_data),
+            'cell_module_link' =>  $this->renderCell4BlockModuleLink($block_data),
             'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data)
-        ) + $block_data ;
+        ) + $block_data;
     }
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-    $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+    $tpl = new D3Tpl();
     $tpl->assign(array(
         'target_mid' => $this->target_mid,
         'target_dirname' => $this->target_dirname,
@@ -429,22 +429,22 @@ 
         'cachetime_options' => $this->cachetime_options,
         'blocks' => $blocks4assign,
         'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
-    $tpl->display('db:altsys_main_myblocksadmin_list.html') ;
+    ));
+    $tpl->display('db:altsys_main_myblocksadmin_list.html');
 }
 
 
     public function get_block_configs()
     {
         if ($this->target_mid <= 0) {
-            return array() ;
+            return array();
         }
-        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php' ;
+        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php';
 
         if (empty($modversion['blocks'])) {
-            return array() ;
+            return array();
         } else {
-            return $modversion['blocks'] ;
+            return $modversion['blocks'];
         }
     }
 
@@ -452,51 +452,51 @@ 
     public function list_groups()
     {
         // query for getting blocks
-    $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight" ;
-        $result = $this->db->query($sql) ;
-        $block_arr = array() ;
+    $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+        $result = $this->db->query($sql);
+        $block_arr = array();
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler = xoops_gethandler('block');//add
+        $handler = xoops_gethandler('block'); //add
     }
         while ($myrow = $this->db->fetchArray($result)) {
             //HACK by domifara
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $block_one =& $handler->create(false) ;
+            $block_one = & $handler->create(false);
             $block_one->assignVars($myrow);
-            $block_arr[] =& $block_one ;
+            $block_arr[] = & $block_one;
         } else {
-            $block_arr[] = new XoopsBlock($myrow) ;
+            $block_arr[] = new XoopsBlock($myrow);
         }
         }
 
-        $item_list = array() ;
+        $item_list = array();
         foreach (array_keys($block_arr) as $i) {
-            $item_list[ $block_arr[$i]->getVar('bid') ] = $block_arr[$i]->getVar('title') ;
+            $item_list[$block_arr[$i]->getVar('bid')] = $block_arr[$i]->getVar('title');
         }
 
-        $form = new MyXoopsGroupPermForm(_MD_A_MYBLOCKSADMIN_PERMFORM, 1, 'block_read', '') ;
+        $form = new MyXoopsGroupPermForm(_MD_A_MYBLOCKSADMIN_PERMFORM, 1, 'block_read', '');
     // skip system (TODO)
     if ($this->target_mid > 1) {
-        $form->addAppendix('module_admin', $this->target_mid, $this->target_mname . ' ' . _MD_A_MYBLOCKSADMIN_PERM_MADMIN) ;
-        $form->addAppendix('module_read', $this->target_mid, $this->target_mname .' ' . _MD_A_MYBLOCKSADMIN_PERM_MREAD) ;
+        $form->addAppendix('module_admin', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MADMIN);
+        $form->addAppendix('module_read', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MREAD);
     }
         foreach ($item_list as $item_id => $item_name) {
-            $form->addItem($item_id, $item_name) ;
+            $form->addItem($item_id, $item_name);
         }
-        echo $form->render() ;
+        echo $form->render();
     }
 
 
-    public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options=array())
+    public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options = array())
     {
         global $xoopsConfig;
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
         $block = new XoopsBlock($bid);
     }
@@ -515,10 +515,10 @@ 
         }
         $block->setVar('bcachetime', $bcachetime);
         if (is_array($options) && count($options) > 0) {
-            $block->setVar('options', implode('|', $options)) ;
+            $block->setVar('options', implode('|', $options));
         }
         if ($block->getVar('block_type') == 'C') {
-            $name = $this->get_blockname_from_ctype($block->getVar('c_type')) ;
+            $name = $this->get_blockname_from_ctype($block->getVar('c_type'));
             $block->setVar('name', $name);
         }
         $msg = _MD_A_MYBLOCKSADMIN_DBUPDATED;
@@ -542,7 +542,7 @@ 
         } else {
             $msg = 'Failed update of block. ID:'.$bid;
         }
-        return $msg ;
+        return $msg;
     }
 
 
@@ -550,14 +550,14 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
         $mid = (int)$mid;
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)";
+        $this->db->query($sql);
     }
 }
 
@@ -566,83 +566,83 @@ 
 public function updateBlockReadGroupPerm($bid, $req_gids)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('group_permission') ;
-    $req_gids = array_map('intval', $req_gids) ;
-    sort($req_gids) ;
+    $table = $this->db->prefix('group_permission');
+    $req_gids = array_map('intval', $req_gids);
+    sort($req_gids);
 
     // compare group ids from request and the records.
-    $sql = "SELECT `gperm_groupid` FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $result = $this->db->query($sql) ;
-    $db_gids = array() ;
+    $sql = "SELECT `gperm_groupid` FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $result = $this->db->query($sql);
+    $db_gids = array();
     while (list($gid) = $this->db->fetchRow($result)) {
-        $db_gids[] = $gid ;
+        $db_gids[] = $gid;
     }
-    $db_gids = array_map('intval', $db_gids) ;
-    sort($db_gids) ;
+    $db_gids = array_map('intval', $db_gids);
+    sort($db_gids);
 
     // if they are identical, just return (prevent increase of gperm_id)
     if (serialize($req_gids) == serialize($db_gids)) {
-        return ;
+        return;
     }
 
-    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $this->db->query($sql);
     foreach ($req_gids as $gid) {
         $gid = (int)$gid;
-        $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')";
+        $this->db->query($sql);
     }
 }
 
 
     public function do_order()
     {
-        $sides = is_array(@$_POST['sides']) ? $_POST['sides'] : array() ;
+        $sides = is_array(@$_POST['sides']) ? $_POST['sides'] : array();
         foreach (array_keys($sides) as $bid) {
-            $request = $this->fetchRequest4Block($bid) ;
+            $request = $this->fetchRequest4Block($bid);
 
         // update the block
-        $this->update_block($request['bid'], $request['side'], $request['weight'], $request['visible'], $request['title'], null, null, $request['bcachetime'], array()) ;
+        $this->update_block($request['bid'], $request['side'], $request['weight'], $request['visible'], $request['title'], null, null, $request['bcachetime'], array());
 
         // block_module_link update
-        $this->updateBlockModuleLink($bid, $request['bmodule']) ;
+        $this->updateBlockModuleLink($bid, $request['bmodule']);
 
         // group_permission update
-        $this->updateBlockReadGroupPerm($bid, $request['bgroup']) ;
+        $this->updateBlockReadGroupPerm($bid, $request['bgroup']);
         }
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 
     public function fetchRequest4Block($bid)
     {
         $bid = (int)$bid;
-        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
         if (@$_POST['extra_sides'][$bid] > 0) {
             $_POST['sides'][$bid] = (int)$_POST['extra_sides'][$bid];
         }
 
         if (@$_POST['sides'][$bid] < 0) {
-            $visible = 0 ;
-            $_POST['sides'][$bid] = -1 ;
+            $visible = 0;
+            $_POST['sides'][$bid] = -1;
         } else {
-            $visible = 1 ;
+            $visible = 1;
         }
 
         return array(
-        'bid' => $bid ,
+        'bid' => $bid,
             'side' => (int)(@$_POST['sides'][$bid]),
             'weight' => (int)(@$_POST['weights'][$bid]),
-        'visible' => $visible ,
-        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]) ,
-        'content' => $myts->stripSlashesGPC(@$_POST['contents'][$bid]) ,
-        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) ,
+        'visible' => $visible,
+        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]),
+        'content' => $myts->stripSlashesGPC(@$_POST['contents'][$bid]),
+        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]),
             'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]),
-        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array( 0 ) ,
-        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array() ,
+        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array(0),
+        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array(),
         'options' => is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : array()
-    ) ;
+    );
     }
 
 
@@ -653,30 +653,30 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! is_object($block)) {
-            die('Invalid bid') ;
+        if (!is_object($block)) {
+            die('Invalid bid');
         }
-        if (! $this->canDelete($block)) {
-            die('Cannot delete this block') ;
+        if (!$this->canDelete($block)) {
+            die('Cannot delete this block');
         }
         $this->do_deleteBlockReadGroupPerm($bid); //HACK add by domifara
-    $block->delete() ;
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+    $block->delete();
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 //HACK add by domifara
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('group_permission') ;
-    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $this->db->query($sql) ;
+    $table = $this->db->prefix('group_permission');
+    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $this->db->query($sql);
 }
 
     public function form_delete($bid)
@@ -687,24 +687,24 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! is_object($block)) {
-            die('Invalid bid') ;
+        if (!is_object($block)) {
+            die('Invalid bid');
         }
-        if (! $this->canDelete($block)) {
-            die('Cannot delete this block') ;
+        if (!$this->canDelete($block)) {
+            die('Cannot delete this block');
         }
 
     // breadcrumbs
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-        $breadcrumbsObj->appendPath('', _DELETE) ;
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+        $breadcrumbsObj->appendPath('', _DELETE);
 
-        xoops_confirm(array( 'op' => 'delete_ok' ) + $GLOBALS['xoopsGTicket']->getTicketArray(__LINE__, 1800, 'myblocksadmin'), "?mode=admin&amp;lib=altsys&amp;page=myblocksadmin&amp;dirname=$this->target_dirname&amp;bid=$bid", sprintf(_MD_A_MYBLOCKSADMIN_FMT_REMOVEBLOCK, $block->getVar('title'))) ;
+        xoops_confirm(array('op' => 'delete_ok') + $GLOBALS['xoopsGTicket']->getTicketArray(__LINE__, 1800, 'myblocksadmin'), "?mode=admin&amp;lib=altsys&amp;page=myblocksadmin&amp;dirname=$this->target_dirname&amp;bid=$bid", sprintf(_MD_A_MYBLOCKSADMIN_FMT_REMOVEBLOCK, $block->getVar('title')));
     }
 
 
@@ -712,30 +712,30 @@ 
     {
         $bid = (int)$bid;
 
-        $request = $this->fetchRequest4Block($bid) ;
+        $request = $this->fetchRequest4Block($bid);
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! $block->getVar('bid')) {
-            die('Invalid bid') ;
+        if (!$block->getVar('bid')) {
+            die('Invalid bid');
         }
-        if (! $this->canClone($block)) {
-            die('Invalid block_type') ;
+        if (!$this->canClone($block)) {
+            die('Invalid block_type');
         }
 
         if (empty($_POST['options'])) {
-            $options = array() ;
+            $options = array();
         } elseif (is_array($_POST['options'])) {
-            $options = $_POST['options'] ;
+            $options = $_POST['options'];
         } else {
-            $options = explode('|', $_POST['options']) ;
+            $options = explode('|', $_POST['options']);
         }
 
     // for backward compatibility
@@ -743,46 +743,46 @@ 
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $cblock =& $handler->create(false) ;
+        $cblock = & $handler->create(false);
     } else {
-        $cblock = new XoopsBlock() ;
+        $cblock = new XoopsBlock();
     }
 
         foreach ($block->vars as $k => $v) {
-            $cblock->assignVar($k, $v['value']) ;
+            $cblock->assignVar($k, $v['value']);
         }
         $cblock->setNew();
         $cblock->setVar('bid', 0);
         $cblock->setVar('block_type', $block->getVar('block_type') == 'C' ? 'C' : 'D');
-        $cblock->setVar('func_num', $this->find_func_num_vacancy($block->getVar('mid'))) ;
+        $cblock->setVar('func_num', $this->find_func_num_vacancy($block->getVar('mid')));
     // store the block into DB as a new one
-    $newbid = $cblock->store() ;
-        if (! $newbid) {
-            return $cblock->getHtmlErrors() ;
+    $newbid = $cblock->store();
+        if (!$newbid) {
+            return $cblock->getHtmlErrors();
         }
 
     // update the block by the request
-    $this->update_block($newbid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array()) ;
+    $this->update_block($newbid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array());
 
     // block_module_link update
-    $this->updateBlockModuleLink($newbid, $request['bmodule']) ;
+    $this->updateBlockModuleLink($newbid, $request['bmodule']);
 
     // group_permission update
-    $this->updateBlockReadGroupPerm($newbid, $request['bgroup']) ;
+    $this->updateBlockReadGroupPerm($newbid, $request['bgroup']);
 
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 
     public function find_func_num_vacancy($mid)
     {
-        $func_num = 256 ;
+        $func_num = 256;
         do {
-            $func_num -- ;
-            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM ' . $this->db->prefix('newblocks') . ' WHERE mid=' . (int)$mid . ' AND func_num=' . $func_num)) ;
-        } while ($count > 0) ;
+            $func_num--;
+            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM '.$this->db->prefix('newblocks').' WHERE mid='.(int)$mid.' AND func_num='.$func_num));
+        } while ($count > 0);
 
-        return $func_num > 128 ? $func_num : 255 ;
+        return $func_num > 128 ? $func_num : 255;
     }
 
 
@@ -796,36 +796,36 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $new_block =& $handler->create(false) ;
+        $new_block = & $handler->create(false);
     } else {
-        $new_block = new XoopsBlock() ;
+        $new_block = new XoopsBlock();
     }
 
-            $new_block->setNew() ;
-            $new_block->setVar('name', $this->get_blockname_from_ctype('C')) ;
-            $new_block->setVar('block_type', 'C') ;
-            $new_block->setVar('func_num', 0) ;
-            $bid = $new_block->store() ;
-            $request = $this->fetchRequest4Block(0) ;
+            $new_block->setNew();
+            $new_block->setVar('name', $this->get_blockname_from_ctype('C'));
+            $new_block->setVar('block_type', 'C');
+            $new_block->setVar('func_num', 0);
+            $bid = $new_block->store();
+            $request = $this->fetchRequest4Block(0);
         // permission copy
         foreach ($GLOBALS['xoopsUser']->getGroups() as $gid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
+            $sql = 'INSERT INTO '.$this->db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
             $this->db->query($sql);
         }
         } else {
-            $request = $this->fetchRequest4Block($bid) ;
+            $request = $this->fetchRequest4Block($bid);
         }
 
     // update the block by the request
-    $msg = $this->update_block($bid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array()) ;
+    $msg = $this->update_block($bid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array());
 
     // block_module_link update
-    $this->updateBlockModuleLink($bid, $request['bmodule']) ;
+    $this->updateBlockModuleLink($bid, $request['bmodule']);
 
     // group_permission update
-    $this->updateBlockReadGroupPerm($bid, $request['bgroup']) ;
+    $this->updateBlockReadGroupPerm($bid, $request['bgroup']);
 
-        return $msg ;
+        return $msg;
     }
 
 
@@ -836,57 +836,57 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_gethandler('block');
-        $block =& $handler->create(false) ;
-        $block->load($bid) ;
+        $block = & $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! $block->getVar('bid')) {
+        if (!$block->getVar('bid')) {
             // new defaults
-        $bid = 0 ;
-            $mode = 'new' ;
-            $block->setVar('mid', 0) ;
-            $block->setVar('block_type', 'C') ;
+        $bid = 0;
+            $mode = 'new';
+            $block->setVar('mid', 0);
+            $block->setVar('block_type', 'C');
         }
 
         switch ($mode) {
         case 'clone' :
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE;
+            $next_op = 'clone_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM);
+            break;
         case 'new' :
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW;
+            $next_op = 'new_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM);
+            break;
         case 'edit' :
         default :
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT;
+            $next_op = 'edit_ok';
             // breadcrumbs
-            $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM);
+            break;
     }
 
-        $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
-        $block_template =& $block->getVar('template', 'n') ;
-        $block_template_tplset = '' ;
+        $is_custom = in_array($block->getVar('block_type'), array('C', 'E')) ? true : false;
+        $block_template = & $block->getVar('template', 'n');
+        $block_template_tplset = '';
 
-        if (! $is_custom && $block_template) {
+        if (!$is_custom && $block_template) {
             // find template of the block
         $tplfile_handler = xoops_gethandler('tplfile');
-            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template) ;
-            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default' ;
+            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template);
+            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default';
         }
 //HACK by domifara
 /*
@@ -895,43 +895,43 @@ 
     }
 */
     $block_data = $this->preview_request + array(
-        'bid' => $bid ,
-        'name' => $block->getVar('name', 'n') ,
-        'title' => $block->getVar('title', 'n') ,
+        'bid' => $bid,
+        'name' => $block->getVar('name', 'n'),
+        'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-        'template' => $block_template ,
-        'template_tplset' => $block_template_tplset ,
-        'options' => $block->getVar('options') ,
-        'content' => $block->getVar('content', 'n') ,
-        'is_custom' => $is_custom ,
-        'type' => $block->getVar('block_type') ,
+        'template' => $block_template,
+        'template_tplset' => $block_template_tplset,
+        'options' => $block->getVar('options'),
+        'content' => $block->getVar('content', 'n'),
+        'is_custom' => $is_custom,
+        'type' => $block->getVar('block_type'),
         'ctype' => $block->getVar('c_type')
-    ) ;
+    );
 
         $block4assign = array(
-        'name_raw' => $block_data['name'] ,
-        'title_raw' => $block_data['title'] ,
-        'content_raw' => $block_data['content'] ,
-        'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data) ,
-        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data) ,
-        'cell_options' => $this->renderCell4BlockOptions($block_data) ,
+        'name_raw' => $block_data['name'],
+        'title_raw' => $block_data['title'],
+        'content_raw' => $block_data['content'],
+        'cell_position' => $this->renderCell4BlockPosition($block_data),
+        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
+        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data),
+        'cell_options' => $this->renderCell4BlockOptions($block_data),
         'content_preview' => $this->previewContent($block_data)
-    ) + $block_data ;
+    ) + $block_data;
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-        $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+        $tpl = new D3Tpl();
 
     //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $tpl->assign('xoops_cube_legacy', true) ;
+        $tpl->assign('xoops_cube_legacy', true);
         include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     } else {
-        $tpl->assign('xoops_cube_legacy', false) ;
+        $tpl->assign('xoops_cube_legacy', false);
     }
 
         $tpl->assign(array(
@@ -946,14 +946,14 @@ 
         'submit_button' => $button_value,
         'common_fck_installed' => $this->checkFck(),
         'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
+    ));
 
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html') ;
+            $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html');
         } else {
-            $tpl->display('db:altsys_main_myblocksadmin_edit.html') ;
+            $tpl->display('db:altsys_main_myblocksadmin_edit.html');
         }
-        return ;
+        return;
     }
 
     public function checkFck()
@@ -965,16 +965,16 @@ 
     {
         $bid = (int)$block_data['bid'];
 
-        if (! $block_data['is_custom']) {
-            return '' ;
+        if (!$block_data['is_custom']) {
+            return '';
         }
         if (empty($this->preview_request)) {
-            return '' ;
+            return '';
         }
 
 //HACK by domifara
 //TODO : need no hook block at this
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 /*
     $handler = xoops_gethandler('block');
     $block =& $handler->create(false) ;
@@ -982,68 +982,68 @@ 
 */
 
     if ($block->getVar('mid')) {
-        return '' ;
+        return '';
     }
 
-        $block->setVar('title', $block_data['title']) ;
-        $block->setVar('content', $block_data['content']) ;
+        $block->setVar('title', $block_data['title']);
+        $block->setVar('content', $block_data['content']);
 
-        restore_error_handler() ;
-        $original_level = error_reporting(E_ALL) ;
-        $ret =& $block->getContent('S', $block_data['ctype']) ;
-        error_reporting($original_level) ;
+        restore_error_handler();
+        $original_level = error_reporting(E_ALL);
+        $ret = & $block->getContent('S', $block_data['ctype']);
+        error_reporting($original_level);
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function get_blockname_from_ctype($bctype)
     {
         $ctypes = array(
-        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML ,
-        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ,
-        'N' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE ,
+        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML,
+        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE,
+        'N' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE,
         'P' => _MD_A_MYBLOCKSADMIN_CTYPE_PHP
-    ) ;
+    );
 
-        return isset($ctypes[$bctype]) ? $ctypes[$bctype] : _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ;
+        return isset($ctypes[$bctype]) ? $ctypes[$bctype] : _MD_A_MYBLOCKSADMIN_CTYPE_SMILE;
     }
 
 
     public function processPost()
     {
         // Ticket Check
-    if (! $GLOBALS['xoopsGTicket']->check(true, 'myblocksadmin')) {
+    if (!$GLOBALS['xoopsGTicket']->check(true, 'myblocksadmin')) {
         redirect_header(XOOPS_URL.'/', 3, $GLOBALS['xoopsGTicket']->getErrors());
     }
 
-        $msg = '' ;
+        $msg = '';
         $bid = (int)(@$_GET['bid']);
-        if (! empty($_POST['preview'])) {
+        if (!empty($_POST['preview'])) {
             // preview
-        $this->preview_request = $this->fetchRequest4Block($bid) ;
-            $_GET['op'] = str_replace('_ok', '', @$_POST['op']) ;
-            return ; // continue ;
+        $this->preview_request = $this->fetchRequest4Block($bid);
+            $_GET['op'] = str_replace('_ok', '', @$_POST['op']);
+            return; // continue ;
         } elseif (@$_POST['op'] == 'order') {
             // order ok
-        $msg = $this->do_order() ;
+        $msg = $this->do_order();
         } elseif (@$_POST['op'] == 'delete_ok') {
             // delete ok
-        $msg = $this->do_delete($bid) ;
+        $msg = $this->do_delete($bid);
         } elseif (@$_POST['op'] == 'clone_ok') {
             // clone ok
-        $msg = $this->do_clone($bid) ;
+        $msg = $this->do_clone($bid);
         } elseif (@$_POST['op'] == 'edit_ok' || @$_POST['op'] == 'new_ok') {
             // edit ok
-        $msg = $this->do_edit($bid) ;
-        } elseif (! empty($_POST['submit'])) {
+        $msg = $this->do_edit($bid);
+        } elseif (!empty($_POST['submit'])) {
             // update module_admin,module_read,block_read
-        include dirname(__DIR__).'/include/mygroupperm.php' ;
-            $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED ;
+        include dirname(__DIR__).'/include/mygroupperm.php';
+            $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED;
         }
 
-        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg);
+        exit;
     }
 
 
@@ -1052,22 +1052,22 @@ 
         $bid = (int)(@$_GET['bid']);
         switch (@$_GET['op']) {
         case 'clone' :
-            $this->form_edit($bid, 'clone') ;
-            break ;
+            $this->form_edit($bid, 'clone');
+            break;
         case 'new' :
         case 'edit' :
-            $this->form_edit($bid, 'edit') ;
-            break ;
+            $this->form_edit($bid, 'edit');
+            break;
         case 'delete' :
-            $this->form_delete($bid) ;
-            break ;
+            $this->form_delete($bid);
+            break;
         case 'list' :
         default :
             // the first form (blocks)
-            $this->list_blocks() ;
+            $this->list_blocks();
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
+            $this->list_groups();
+            break;
     }
     }
 }

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/altsys_functions.php

Doc Comments +6 added lines

@@ -103,6 +103,12 @@
 }
 
 
+/**
+ * @param integer $mid
+ * @param integer $coretype
+ *
+ * @return string
+ */
 function altsys_get_link2modpreferences($mid, $coretype)
 {
     switch ($coretype) {

Spacing +56 added lines, -56 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 
-altsys_set_module_config() ;
+altsys_set_module_config();
 
 function altsys_set_module_config()
 {
-    global $altsysModuleConfig , $altsysModuleId ;
+    global $altsysModuleConfig, $altsysModuleId;
 
-    $module_handler = xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
+    $module_handler = xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
     if (is_object($module)) {
-        $config_handler = xoops_gethandler('config') ;
-        $altsysModuleConfig = $config_handler->getConfigList($module->getVar('mid')) ;
-        $altsysModuleId = $module->getVar('mid') ;
+        $config_handler = xoops_gethandler('config');
+        $altsysModuleConfig = $config_handler->getConfigList($module->getVar('mid'));
+        $altsysModuleId = $module->getVar('mid');
     } else {
-        $altsysModuleConfig = array() ;
-        $altsysModuleId = 0 ;
+        $altsysModuleConfig = array();
+        $altsysModuleId = 0;
     }
 
     // for RTL users
-    @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left') ;
-    @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right') ;
+    @define('_GLOBAL_LEFT', @_ADM_USE_RTL == 1 ? 'right' : 'left');
+    @define('_GLOBAL_RIGHT', @_ADM_USE_RTL == 1 ? 'left' : 'right');
 }
 
 
 function altsys_include_mymenu()
 {
-    global $xoopsModule , $xoopsConfig , $mydirname , $mydirpath , $mytrustdirname , $mytrustdirpath , $mymenu_fake_uri ;
+    global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
 
     $mymenu_find_paths = array(
-        $mydirpath.'/admin/mymenu.php' ,
-        $mydirpath.'/mymenu.php' ,
-        $mytrustdirpath.'/admin/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 (file_exists($mymenu_find_path)) {
-            include $mymenu_find_path ;
-            include_once __DIR__.'/adminmenu_functions.php' ;
-            altsys_adminmenu_insert_mymenu($xoopsModule) ;
-            altsys_adminmenu_hack_ft() ;
-            break ;
+            include $mymenu_find_path;
+            include_once __DIR__.'/adminmenu_functions.php';
+            altsys_adminmenu_insert_mymenu($xoopsModule);
+            altsys_adminmenu_hack_ft();
+            break;
         }
     }
 }
@@ -48,58 +48,58 @@ 
 
 function altsys_include_language_file($type)
 {
-    $mylang = $GLOBALS['xoopsConfig']['language'] ;
+    $mylang = $GLOBALS['xoopsConfig']['language'];
 
     if (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
-        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php' ;
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
     } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
-        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php' ;
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
     } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
-        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php' ;
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
     } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
-        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php' ;
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
     }
 }
 
 
-define('ALTSYS_CORE_TYPE_X20', 1) ; // 2.0.0-2.0.13 and 2.0.x-JP
-define('ALTSYS_CORE_TYPE_X20S', 2) ; // 2.0.14- from xoops.org (Skalpa's S)
-define('ALTSYS_CORE_TYPE_ORE', 4) ; // ORETEKI by marijuana
-define('ALTSYS_CORE_TYPE_X22', 8) ; // 2.2 from xoops.org
-define('ALTSYS_CORE_TYPE_X23P', 10) ; // 2.3 from xoops.org (phppp's P)
-define('ALTSYS_CORE_TYPE_X25', 11) ; // 2.5 from xoops.org
-define('ALTSYS_CORE_TYPE_ICMS', 12) ; // ImpressCMS
-define('ALTSYS_CORE_TYPE_XCL21', 16) ; // XOOPS Cube 2.1 Legacy
+define('ALTSYS_CORE_TYPE_X20', 1); // 2.0.0-2.0.13 and 2.0.x-JP
+define('ALTSYS_CORE_TYPE_X20S', 2); // 2.0.14- from xoops.org (Skalpa's S)
+define('ALTSYS_CORE_TYPE_ORE', 4); // ORETEKI by marijuana
+define('ALTSYS_CORE_TYPE_X22', 8); // 2.2 from xoops.org
+define('ALTSYS_CORE_TYPE_X23P', 10); // 2.3 from xoops.org (phppp's P)
+define('ALTSYS_CORE_TYPE_X25', 11); // 2.5 from xoops.org
+define('ALTSYS_CORE_TYPE_ICMS', 12); // ImpressCMS
+define('ALTSYS_CORE_TYPE_XCL21', 16); // XOOPS Cube 2.1 Legacy
 
 function altsys_get_core_type()
 {
-    static $result = null ;
+    static $result = null;
 
     if (empty($result)) {
         if (defined('XOOPS_ORETEKI')) {
-            $result = ALTSYS_CORE_TYPE_ORE ;
+            $result = ALTSYS_CORE_TYPE_ORE;
         } elseif (defined('XOOPS_CUBE_LEGACY')) {
-            $result = ALTSYS_CORE_TYPE_XCL21 ;
+            $result = ALTSYS_CORE_TYPE_XCL21;
         } elseif (defined('ICMS_VERSION_NAME')) {
-            $result = ALTSYS_CORE_TYPE_ICMS ;
+            $result = ALTSYS_CORE_TYPE_ICMS;
         } elseif (strstr(XOOPS_VERSION, 'JP')) {
-            $result = ALTSYS_CORE_TYPE_X20 ;
+            $result = ALTSYS_CORE_TYPE_X20;
         } else {
-            $versions = array_map('intval', explode('.', preg_replace('/[^0-9.]/', '', XOOPS_VERSION))) ;
+            $versions = array_map('intval', explode('.', preg_replace('/[^0-9.]/', '', XOOPS_VERSION)));
             if ($versions[0] == 2 && $versions[1] == 2) {
-                $result = ALTSYS_CORE_TYPE_X22 ;
+                $result = ALTSYS_CORE_TYPE_X22;
             } elseif ($versions[0] == 2 && $versions[1] == 0 && $versions[2] > 13) {
-                $result = ALTSYS_CORE_TYPE_X20S ;
+                $result = ALTSYS_CORE_TYPE_X20S;
             } elseif ($versions[0] == 2 && $versions[1] >= 5) {
-                $result = ALTSYS_CORE_TYPE_X25 ;
+                $result = ALTSYS_CORE_TYPE_X25;
             } elseif ($versions[0] == 2 && $versions[1] > 2) {
-                $result = ALTSYS_CORE_TYPE_X23P ;
+                $result = ALTSYS_CORE_TYPE_X23P;
             } else {
-                $result = ALTSYS_CORE_TYPE_X20 ;
+                $result = ALTSYS_CORE_TYPE_X20;
             }
         }
     }
-    return $result ;
+    return $result;
 }
 
 
@@ -113,36 +113,36 @@ 
         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;
     }
 }
 
 
 function altsys_template_touch($tpl_id)
 {
-    if (in_array(altsys_get_core_type(), array( ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P, ALTSYS_CORE_TYPE_X25 ))) {
+    if (in_array(altsys_get_core_type(), array(ALTSYS_CORE_TYPE_X20S, ALTSYS_CORE_TYPE_X23P, ALTSYS_CORE_TYPE_X25))) {
         // need to delete all files under templates_c/
-        altsys_clear_templates_c() ;
+        altsys_clear_templates_c();
     } else {
         // just touch the template
-        xoops_template_touch($tpl_id) ;
+        xoops_template_touch($tpl_id);
     }
 }
 
 
 function altsys_clear_templates_c()
 {
-    $dh = opendir(XOOPS_COMPILE_PATH) ;
+    $dh = opendir(XOOPS_COMPILE_PATH);
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if (substr($file, -4) != '.php') {
-            continue ;
+            continue;
         }
-        @unlink(XOOPS_COMPILE_PATH.'/'.$file) ;
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
     }
-    closedir($dh) ;
+    closedir($dh);
 }

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) == '\\')) {

Indentation +1705 added lines, -1705 removed lines

@@ -27,63 +27,63 @@ 
 
 //  require_once 'PEAR.php'; // GIJ
 
-  // ----- Constants
-  define('ARCHIVE_ZIP_READ_BLOCK_SIZE', 2048);
-
-  // ----- File list separator
-  define('ARCHIVE_ZIP_SEPARATOR', ',');
-
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  define('ARCHIVE_ZIP_TEMPORARY_DIR', '');
-
-  // ----- Error codes
-  define('ARCHIVE_ZIP_ERR_NO_ERROR', 0);
-  define('ARCHIVE_ZIP_ERR_WRITE_OPEN_FAIL', -1);
-  define('ARCHIVE_ZIP_ERR_READ_OPEN_FAIL', -2);
-  define('ARCHIVE_ZIP_ERR_INVALID_PARAMETER', -3);
-  define('ARCHIVE_ZIP_ERR_MISSING_FILE', -4);
-  define('ARCHIVE_ZIP_ERR_FILENAME_TOO_LONG', -5);
-  define('ARCHIVE_ZIP_ERR_INVALID_ZIP', -6);
-  define('ARCHIVE_ZIP_ERR_BAD_EXTRACTED_FILE', -7);
-  define('ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL', -8);
-  define('ARCHIVE_ZIP_ERR_BAD_EXTENSION', -9);
-  define('ARCHIVE_ZIP_ERR_BAD_FORMAT', -10);
-  define('ARCHIVE_ZIP_ERR_DELETE_FILE_FAIL', -11);
-  define('ARCHIVE_ZIP_ERR_RENAME_FILE_FAIL', -12);
-  define('ARCHIVE_ZIP_ERR_BAD_CHECKSUM', -13);
-  define('ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
-  define('ARCHIVE_ZIP_ERR_MISSING_OPTION_VALUE', -15);
-  define('ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE', -16);
-
-  // ----- Warning codes
-  define('ARCHIVE_ZIP_WARN_NO_WARNING', 0);
-  define('ARCHIVE_ZIP_WARN_FILE_EXIST', 1);
-
-  // ----- Methods parameters
-  define('ARCHIVE_ZIP_PARAM_PATH', 'path');
-  define('ARCHIVE_ZIP_PARAM_ADD_PATH', 'add_path');
-  define('ARCHIVE_ZIP_PARAM_REMOVE_PATH', 'remove_path');
-  define('ARCHIVE_ZIP_PARAM_REMOVE_ALL_PATH', 'remove_all_path');
-  define('ARCHIVE_ZIP_PARAM_SET_CHMOD', 'set_chmod');
-  define('ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING', 'extract_as_string');
-  define('ARCHIVE_ZIP_PARAM_NO_COMPRESSION', 'no_compression');
-  define('ARCHIVE_ZIP_PARAM_BY_NAME', 'by_name');
-  define('ARCHIVE_ZIP_PARAM_BY_INDEX', 'by_index');
-  define('ARCHIVE_ZIP_PARAM_BY_EREG', 'by_ereg');
-  define('ARCHIVE_ZIP_PARAM_BY_PREG', 'by_preg');
-
-  define('ARCHIVE_ZIP_PARAM_PRE_EXTRACT', 'callback_pre_extract');
-  define('ARCHIVE_ZIP_PARAM_POST_EXTRACT', 'callback_post_extract');
-  define('ARCHIVE_ZIP_PARAM_PRE_ADD', 'callback_pre_add');
-  define('ARCHIVE_ZIP_PARAM_POST_ADD', 'callback_post_add');
+    // ----- Constants
+    define('ARCHIVE_ZIP_READ_BLOCK_SIZE', 2048);
+
+    // ----- File list separator
+    define('ARCHIVE_ZIP_SEPARATOR', ',');
+
+    // ----- Optional static temporary directory
+    //       By default temporary files are generated in the script current
+    //       path.
+    //       If defined :
+    //       - MUST BE terminated by a '/'.
+    //       - MUST be a valid, already created directory
+    //       Samples :
+    // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', '/temp/' );
+    // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', 'C:/Temp/' );
+    define('ARCHIVE_ZIP_TEMPORARY_DIR', '');
+
+    // ----- Error codes
+    define('ARCHIVE_ZIP_ERR_NO_ERROR', 0);
+    define('ARCHIVE_ZIP_ERR_WRITE_OPEN_FAIL', -1);
+    define('ARCHIVE_ZIP_ERR_READ_OPEN_FAIL', -2);
+    define('ARCHIVE_ZIP_ERR_INVALID_PARAMETER', -3);
+    define('ARCHIVE_ZIP_ERR_MISSING_FILE', -4);
+    define('ARCHIVE_ZIP_ERR_FILENAME_TOO_LONG', -5);
+    define('ARCHIVE_ZIP_ERR_INVALID_ZIP', -6);
+    define('ARCHIVE_ZIP_ERR_BAD_EXTRACTED_FILE', -7);
+    define('ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL', -8);
+    define('ARCHIVE_ZIP_ERR_BAD_EXTENSION', -9);
+    define('ARCHIVE_ZIP_ERR_BAD_FORMAT', -10);
+    define('ARCHIVE_ZIP_ERR_DELETE_FILE_FAIL', -11);
+    define('ARCHIVE_ZIP_ERR_RENAME_FILE_FAIL', -12);
+    define('ARCHIVE_ZIP_ERR_BAD_CHECKSUM', -13);
+    define('ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+    define('ARCHIVE_ZIP_ERR_MISSING_OPTION_VALUE', -15);
+    define('ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE', -16);
+
+    // ----- Warning codes
+    define('ARCHIVE_ZIP_WARN_NO_WARNING', 0);
+    define('ARCHIVE_ZIP_WARN_FILE_EXIST', 1);
+
+    // ----- Methods parameters
+    define('ARCHIVE_ZIP_PARAM_PATH', 'path');
+    define('ARCHIVE_ZIP_PARAM_ADD_PATH', 'add_path');
+    define('ARCHIVE_ZIP_PARAM_REMOVE_PATH', 'remove_path');
+    define('ARCHIVE_ZIP_PARAM_REMOVE_ALL_PATH', 'remove_all_path');
+    define('ARCHIVE_ZIP_PARAM_SET_CHMOD', 'set_chmod');
+    define('ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING', 'extract_as_string');
+    define('ARCHIVE_ZIP_PARAM_NO_COMPRESSION', 'no_compression');
+    define('ARCHIVE_ZIP_PARAM_BY_NAME', 'by_name');
+    define('ARCHIVE_ZIP_PARAM_BY_INDEX', 'by_index');
+    define('ARCHIVE_ZIP_PARAM_BY_EREG', 'by_ereg');
+    define('ARCHIVE_ZIP_PARAM_BY_PREG', 'by_preg');
+
+    define('ARCHIVE_ZIP_PARAM_PRE_EXTRACT', 'callback_pre_extract');
+    define('ARCHIVE_ZIP_PARAM_POST_EXTRACT', 'callback_post_extract');
+    define('ARCHIVE_ZIP_PARAM_PRE_ADD', 'callback_pre_add');
+    define('ARCHIVE_ZIP_PARAM_POST_ADD', 'callback_post_add');
 
 
 
@@ -102,55 +102,55 @@ 
 class Archive_Zip
 {
     /**
-    * The filename of the zip archive.
-    *
-    * @var string Name of the Zip file
-    */
+     * The filename of the zip archive.
+     *
+     * @var string Name of the Zip file
+     */
     public $_zipname='';
 
     /**
-    * File descriptor of the opened Zip file.
-    *
-    * @var int Internal zip file descriptor
-    */
+     * File descriptor of the opened Zip file.
+     *
+     * @var int Internal zip file descriptor
+     */
     public $_zip_fd=0;
 
     /**
-    * @var int last error code
-    */
+     * @var int last error code
+     */
     public $_error_code=1;
 
     /**
-    * @var string Last error description
-    */
+     * @var string Last error description
+     */
     public $_error_string='';
 
     // {{{ constructor
     /**
-    * Archive_Zip Class constructor. This flavour of the constructor only
-    * declare a new Archive_Zip object, identifying it by the name of the
-    * zip file.
-    *
-    * @param    string  $p_zipname  The name of the zip archive to create
-    * @access public
-    */
+     * Archive_Zip Class constructor. This flavour of the constructor only
+     * declare a new Archive_Zip object, identifying it by the name of the
+     * zip file.
+     *
+     * @param    string  $p_zipname  The name of the zip archive to create
+     * @access public
+     */
 //HACK by domifara
 //  function Archive_Zip($p_zipname)
     public function __construct($p_zipname)
     {
 
-      // ----- Check the zlib
+        // ----- Check the zlib
 /*      if (!extension_loaded('zlib')) {
           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 ' .
-              "with 'zlib' support.\n");
-          return false;
-      }
-
-      // ----- Set the attributes
-      $this->_zipname = $p_zipname;
+        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");
+            return false;
+        }
+
+        // ----- Set the attributes
+        $this->_zipname = $p_zipname;
         $this->_zip_fd = 0;
 
         return;
@@ -159,27 +159,27 @@ 
 
     // {{{ create()
     /**
-    * This method creates a Zip Archive with the filename set with
-    * the constructor.
-    * The files and directories indicated in $p_filelist
-    * are added in the archive.
-    * When a directory is in the list, the directory and its content is added
-    * in the archive.
-    * The methods takes a variable list of parameters in $p_params.
-    * The supported parameters for this method are :
-    *   'add_path' : Add a path to the archived files.
-    *   'remove_path' : Remove the specified 'root' path of the archived files.
-    *   'remove_all_path' : Remove all the path of the archived files.
-    *   'no_compression' : The archived files will not be compressed.
-    *
-    * @access public
-    * @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.
-    * @return mixed An array of file description on success,
-    *               an error code on error
-    */
+     * This method creates a Zip Archive with the filename set with
+     * the constructor.
+     * The files and directories indicated in $p_filelist
+     * are added in the archive.
+     * When a directory is in the list, the directory and its content is added
+     * in the archive.
+     * The methods takes a variable list of parameters in $p_params.
+     * The supported parameters for this method are :
+     *   'add_path' : Add a path to the archived files.
+     *   'remove_path' : Remove the specified 'root' path of the archived files.
+     *   'remove_all_path' : Remove all the path of the archived files.
+     *   'no_compression' : The archived files will not be compressed.
+     *
+     * @access public
+     * @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.
+     * @return mixed An array of file description on success,
+     *               an error code on error
+     */
     public function create($p_filelist, $p_params=0)
     {
         $this->_errorReset();
@@ -189,10 +189,10 @@ 
             $p_params = array();
         }
         if ($this->_check_parameters($p_params,
-                                     array('no_compression' => false,
-                                           'add_path' => '',
-                                           'remove_path' => '',
-                                           'remove_all_path' => false)) != 1) {
+                                        array('no_compression' => false,
+                                            'add_path' => '',
+                                            'remove_path' => '',
+                                            'remove_all_path' => false)) != 1) {
             return 0;
         }
 
@@ -213,7 +213,7 @@ 
         // ----- Invalid variable
         else {
             $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-                             'Invalid variable type p_filelist');
+                                'Invalid variable type p_filelist');
             $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER;
         }
 
@@ -227,30 +227,30 @@ 
 
     // {{{ add()
     /**
-    * This method add files or directory in an existing Zip Archive.
-    * If the Zip Archive does not exist it is created.
-    * The files and directories to add are indicated in $p_filelist.
-    * When a directory is in the list, the directory and its content is added
-    * in the archive.
-    * The methods takes a variable list of parameters in $p_params.
-    * The supported parameters for this method are :
-    *   'add_path' : Add a path to the archived files.
-    *   'remove_path' : Remove the specified 'root' path of the archived files.
-    *   'remove_all_path' : Remove all the path of the archived files.
-    *   'no_compression' : The archived files will not be compressed.
-    *   'callback_pre_add' : A callback function that will be called before
-    *                        each entry archiving.
-    *   'callback_post_add' : A callback function that will be called after
-    *                         each entry archiving.
-    *
-    * @access public
-    * @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.
-    * @return mixed An array of file description on success,
-    *               0 on an unrecoverable failure, an error code is logged.
-    */
+     * This method add files or directory in an existing Zip Archive.
+     * If the Zip Archive does not exist it is created.
+     * The files and directories to add are indicated in $p_filelist.
+     * When a directory is in the list, the directory and its content is added
+     * in the archive.
+     * The methods takes a variable list of parameters in $p_params.
+     * The supported parameters for this method are :
+     *   'add_path' : Add a path to the archived files.
+     *   'remove_path' : Remove the specified 'root' path of the archived files.
+     *   'remove_all_path' : Remove all the path of the archived files.
+     *   'no_compression' : The archived files will not be compressed.
+     *   'callback_pre_add' : A callback function that will be called before
+     *                        each entry archiving.
+     *   'callback_post_add' : A callback function that will be called after
+     *                         each entry archiving.
+     *
+     * @access public
+     * @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.
+     * @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)
     {
         $this->_errorReset();
@@ -260,11 +260,11 @@ 
             $p_params = array();
         }
         if ($this->_check_parameters($p_params,
-                                     array('no_compression' => false,
+                                        array('no_compression' => false,
                                             'add_path' => '',
                                             'remove_path' => '',
                                             'remove_all_path' => false,
-                                             'callback_pre_add' => '',
+                                                'callback_pre_add' => '',
                                             'callback_post_add' => '')) != 1) {
             return 0;
         }
@@ -302,48 +302,48 @@ 
 
     // {{{ listContent()
     /**
-    * This method gives the names and properties of the files and directories
-    * which are present in the zip archive.
-    * The properties of each entries in the list are :
-    *   filename : Name of the file.
-    *              For create() or add() it's the filename given by the user.
-    *              For an extract() it's the filename of the extracted file.
-    *   stored_filename : Name of the file / directory stored in the archive.
-    *   size : Size of the stored file.
-    *   compressed_size : Size of the file's data compressed in the archive
-    *                     (without the zip headers overhead)
-    *   mtime : Last known modification date of the file (UNIX timestamp)
-    *   comment : Comment associated with the file
-    *   folder : true | false (indicates if the entry is a folder)
-    *   index : index of the file in the archive (-1 when not available)
-    *   status : status of the action on the entry (depending of the action) :
-    *            Values are :
-    *              ok : OK !
-    *              filtered : the file/dir was not extracted (filtered by user)
-    *              already_a_directory : the file can't be extracted because a
-    *                                    directory with the same name already
-    *                                    exists
-    *              write_protected : the file can't be extracted because a file
-    *                                with the same name already exists and is
-    *                                write protected
-    *              newer_exist : the file was not extracted because a newer
-    *                            file already exists
-    *              path_creation_fail : the file is not extracted because the
-    *                                   folder does not exists and can't be
-    *                                   created
-    *              write_error : the file was not extracted because there was a
-    *                            error while writing the file
-    *              read_error : the file was not extracted because there was a
-    *                           error while reading the file
-    *              invalid_header : the file was not extracted because of an
-    *                               archive format error (bad file header)
-    * Note that each time a method can continue operating when there
-    * is an error on a single file, the error is only logged in the file status.
-    *
-    * @access public
-    * @return mixed An array of file description on success,
-    *               0 on an unrecoverable failure, an error code is logged.
-    */
+     * This method gives the names and properties of the files and directories
+     * which are present in the zip archive.
+     * The properties of each entries in the list are :
+     *   filename : Name of the file.
+     *              For create() or add() it's the filename given by the user.
+     *              For an extract() it's the filename of the extracted file.
+     *   stored_filename : Name of the file / directory stored in the archive.
+     *   size : Size of the stored file.
+     *   compressed_size : Size of the file's data compressed in the archive
+     *                     (without the zip headers overhead)
+     *   mtime : Last known modification date of the file (UNIX timestamp)
+     *   comment : Comment associated with the file
+     *   folder : true | false (indicates if the entry is a folder)
+     *   index : index of the file in the archive (-1 when not available)
+     *   status : status of the action on the entry (depending of the action) :
+     *            Values are :
+     *              ok : OK !
+     *              filtered : the file/dir was not extracted (filtered by user)
+     *              already_a_directory : the file can't be extracted because a
+     *                                    directory with the same name already
+     *                                    exists
+     *              write_protected : the file can't be extracted because a file
+     *                                with the same name already exists and is
+     *                                write protected
+     *              newer_exist : the file was not extracted because a newer
+     *                            file already exists
+     *              path_creation_fail : the file is not extracted because the
+     *                                   folder does not exists and can't be
+     *                                   created
+     *              write_error : the file was not extracted because there was a
+     *                            error while writing the file
+     *              read_error : the file was not extracted because there was a
+     *                           error while reading the file
+     *              invalid_header : the file was not extracted because of an
+     *                               archive format error (bad file header)
+     * Note that each time a method can continue operating when there
+     * is an error on a single file, the error is only logged in the file status.
+     *
+     * @access public
+     * @return mixed An array of file description on success,
+     *               0 on an unrecoverable failure, an error code is logged.
+     */
     public function listContent()
     {
         $this->_errorReset();
@@ -365,42 +365,42 @@ 
 
     // {{{ extract()
     /**
-    * This method extract the files and folders which are in the zip archive.
-    * It can extract all the archive or a part of the archive by using filter
-    * feature (extract by name, by index, by ereg, by preg). The extraction
-    * can occur in the current path or an other path.
-    * All the advanced features are activated by the use of variable
-    * parameters.
-    * The return value is an array of entry descriptions which gives
-    * information on extracted files (See listContent()).
-    * The method may return a success value (an array) even if some files
-    * are not correctly extracted (see the file status in listContent()).
-    * The supported variable parameters for this method are :
-    *   'add_path' : Path where the files and directories are to be extracted
-    *   'remove_path' : First part ('root' part) of the memorized path
-    *                   (if similar) to remove while extracting.
-    *   'remove_all_path' : Remove all the memorized path while extracting.
-    *   'extract_as_string' :
-    *   'set_chmod' : After the extraction of the file the indicated mode
-    *                 will be set.
-    *   'by_name' : It can be a string with file/dir names separated by ',',
-    *               or an array of file/dir names to extract from the archive.
-    *   'by_index' : A string with range of indexes separated by ',',
-    *                (sample "1,3-5,12").
-    *   'by_ereg' : A regular expression (ereg) that must match the extracted
-    *               filename.
-    *   'by_preg' : A regular expression (preg) that must match the extracted
-    *               filename.
-    *   'callback_pre_extract' : A callback function that will be called before
-    *                            each entry extraction.
-    *   'callback_post_extract' : A callback function that will be called after
-    *                            each entry extraction.
-    *
-    * @access public
-    * @param    mixed  $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.
-    */
+     * This method extract the files and folders which are in the zip archive.
+     * It can extract all the archive or a part of the archive by using filter
+     * feature (extract by name, by index, by ereg, by preg). The extraction
+     * can occur in the current path or an other path.
+     * All the advanced features are activated by the use of variable
+     * parameters.
+     * The return value is an array of entry descriptions which gives
+     * information on extracted files (See listContent()).
+     * The method may return a success value (an array) even if some files
+     * are not correctly extracted (see the file status in listContent()).
+     * The supported variable parameters for this method are :
+     *   'add_path' : Path where the files and directories are to be extracted
+     *   'remove_path' : First part ('root' part) of the memorized path
+     *                   (if similar) to remove while extracting.
+     *   'remove_all_path' : Remove all the memorized path while extracting.
+     *   'extract_as_string' :
+     *   'set_chmod' : After the extraction of the file the indicated mode
+     *                 will be set.
+     *   'by_name' : It can be a string with file/dir names separated by ',',
+     *               or an array of file/dir names to extract from the archive.
+     *   'by_index' : A string with range of indexes separated by ',',
+     *                (sample "1,3-5,12").
+     *   'by_ereg' : A regular expression (ereg) that must match the extracted
+     *               filename.
+     *   'by_preg' : A regular expression (preg) that must match the extracted
+     *               filename.
+     *   'callback_pre_extract' : A callback function that will be called before
+     *                            each entry extraction.
+     *   'callback_post_extract' : A callback function that will be called after
+     *                            each entry extraction.
+     *
+     * @access public
+     * @param    mixed  $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.
+     */
     public function extract($p_params=0)
     {
         $this->_errorReset();
@@ -415,11 +415,11 @@ 
             $p_params = array();
         }
         if ($this->_check_parameters($p_params,
-                                     array('extract_as_string' => false,
+                                        array('extract_as_string' => false,
                                             'add_path' => '',
                                             'remove_path' => '',
                                             'remove_all_path' => false,
-                                             'callback_pre_extract' => '',
+                                                'callback_pre_extract' => '',
                                             'callback_post_extract' => '',
                                             'set_chmod' => 0,
                                             'by_name' => '',
@@ -443,26 +443,26 @@ 
 
     // {{{ delete()
     /**
-    * This methods delete archive entries in the zip archive.
-    * Notice that at least one filtering rule (set by the variable parameter
-    * list) must be set.
-    * Also notice that if you delete a folder entry, only the folder entry
-    * is deleted, not all the files bellonging to this folder.
-    * The supported variable parameters for this method are :
-    *   'by_name' : It can be a string with file/dir names separated by ',',
-    *               or an array of file/dir names to delete from the archive.
-    *   'by_index' : A string with range of indexes separated by ',',
-    *                (sample "1,3-5,12").
-    *   'by_ereg' : A regular expression (ereg) that must match the extracted
-    *               filename.
-    *   'by_preg' : A regular expression (preg) that must match the extracted
-    *               filename.
-    *
-    * @access public
-    * @param    mixed  $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.
-    */
+     * This methods delete archive entries in the zip archive.
+     * Notice that at least one filtering rule (set by the variable parameter
+     * list) must be set.
+     * Also notice that if you delete a folder entry, only the folder entry
+     * is deleted, not all the files bellonging to this folder.
+     * The supported variable parameters for this method are :
+     *   'by_name' : It can be a string with file/dir names separated by ',',
+     *               or an array of file/dir names to delete from the archive.
+     *   'by_index' : A string with range of indexes separated by ',',
+     *                (sample "1,3-5,12").
+     *   'by_ereg' : A regular expression (ereg) that must match the extracted
+     *               filename.
+     *   'by_preg' : A regular expression (preg) that must match the extracted
+     *               filename.
+     *
+     * @access public
+     * @param    mixed  $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.
+     */
     public function delete($p_params)
     {
         $this->_errorReset();
@@ -474,7 +474,7 @@ 
 
         // ----- Set default values
         if ($this->_check_parameters($p_params,
-                                     array('by_name' => '',
+                                        array('by_name' => '',
                                             'by_index' => '',
                                             'by_ereg' => '',
                                             'by_preg' => '')) != 1) {
@@ -487,8 +487,8 @@ 
             && ($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');
+                                'At least one filtering rule must'
+                                .' be set as parameter');
             return 0;
         }
 
@@ -505,16 +505,16 @@ 
 
     // {{{ properties()
     /**
-    * This method gives the global properties of the archive.
-    *  The properties are :
-    *    nb : Number of files in the archive
-    *    comment : Comment associated with the archive file
-    *    status : not_exist, ok
-    *
-    * @access public
-    * @param    mixed  $p_params  {Description}
-    * @return mixed An array with the global properties or 0 on error.
-    */
+     * This method gives the global properties of the archive.
+     *  The properties are :
+     *    nb : Number of files in the archive
+     *    comment : Comment associated with the archive file
+     *    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()
     {
         $this->_errorReset();
@@ -535,8 +535,8 @@ 
             // ----- Open the zip file
             if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
                 $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                                 'Unable to open archive \''.$this->_zipname
-                                 .'\' in binary read mode');
+                                    'Unable to open archive \''.$this->_zipname
+                                    .'\' in binary read mode');
                 return 0;
             }
 
@@ -561,15 +561,15 @@ 
 
     // {{{ duplicate()
     /**
-    * This method creates an archive by copying the content of an other one.
-    * If the archive already exist, it is replaced by the new one without
-    * any warning.
-    *
-    * @access public
-    * @param  mixed  $p_archive  It can be a valid Archive_Zip object or
-    *                            the filename of a valid zip archive.
-    * @return integer 1 on success, 0 on failure.
-    */
+     * This method creates an archive by copying the content of an other one.
+     * If the archive already exist, it is replaced by the new one without
+     * any warning.
+     *
+     * @access public
+     * @param  mixed  $p_archive  It can be a valid Archive_Zip object or
+     *                            the filename of a valid zip archive.
+     * @return integer 1 on success, 0 on failure.
+     */
     public function duplicate($p_archive)
     {
         $this->_errorReset();
@@ -586,7 +586,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."'");
+                                    "No file with filename '".$p_archive."'");
                 $v_result = ARCHIVE_ZIP_ERR_MISSING_FILE;
             } else {
                 $v_result = $this->_duplicate($p_archive);
@@ -605,16 +605,16 @@ 
 
     // {{{ merge()
     /**
-    *  This method merge a valid zip archive at the end of the
-    *  archive identified by the Archive_Zip object.
-    *  If the archive ($this) does not exist, the merge becomes a duplicate.
-    *  If the archive to add does not exist, the merge is a success.
-    *
-    * @access public
-    * @param mixed $p_archive_to_add  It can be a valid Archive_Zip object or
-    *                                 the filename of a valid zip archive.
-    * @return integer 1 on success, 0 on failure.
-    */
+     *  This method merge a valid zip archive at the end of the
+     *  archive identified by the Archive_Zip object.
+     *  If the archive ($this) does not exist, the merge becomes a duplicate.
+     *  If the archive to add does not exist, the merge is a success.
+     *
+     * @access public
+     * @param mixed $p_archive_to_add  It can be a valid Archive_Zip object or
+     *                                 the filename of a valid zip archive.
+     * @return integer 1 on success, 0 on failure.
+     */
     public function merge($p_archive_to_add)
     {
         $v_result = 1;
@@ -652,11 +652,11 @@ 
 
     // {{{ errorCode()
     /**
-    * Method that gives the lastest error code.
-    *
-    * @access public
-    * @return integer The error code value.
-    */
+     * Method that gives the lastest error code.
+     *
+     * @access public
+     * @return integer The error code value.
+     */
     public function errorCode()
     {
         return $this->_error_code;
@@ -665,19 +665,19 @@ 
 
     // {{{ errorName()
     /**
-    * This method gives the latest error code name.
-    *
-    * @access public
-    * @param  boolean $p_with_code  If true, gives the name and the int value.
-    * @return string The error name.
-    */
+     * This method gives the latest error code name.
+     *
+     * @access public
+     * @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)
     {
         $v_const_list = get_defined_constants();
 
-          // ----- Extract error constants from all const.
+            // ----- Extract error constants from all const.
         for (reset($v_const_list);
-             list($v_key, $v_value) = each($v_const_list);) {
+                list($v_key, $v_value) = each($v_const_list);) {
             if (substr($v_key, 0, strlen('ARCHIVE_ZIP_ERR_'))
                 =='ARCHIVE_ZIP_ERR_') {
                 $v_error_list[$v_key] = $v_value;
@@ -702,15 +702,15 @@ 
 
     // {{{ errorInfo()
     /**
-    * This method returns the description associated with the latest error.
-    *
-    * @access public
-    * @param  boolean $p_full If set to true gives the description with the
-    *                         error code, the name and the description.
-    *                         If set to false gives only the description
-    *                         and the error code.
-    * @return string The error description.
-    */
+     * This method returns the description associated with the latest error.
+     *
+     * @access public
+     * @param  boolean $p_full If set to true gives the description with the
+     *                         error code, the name and the description.
+     *                         If set to false gives only the description
+     *                         and the error code.
+     * @return string The error description.
+     */
     public function errorInfo($p_full=false)
     {
         if ($p_full) {
@@ -728,30 +728,30 @@ 
 // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
 // -----------------------------------------------------------------------------
 
-  // ---------------------------------------------------------------------------
-  // Function : _checkFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_checkFormat()
-  *
-  * { Description }
-  *
-  * @param integer $p_level
-  */
-  public function _checkFormat($p_level=0)
-  {
-      $v_result = true;
+    // ---------------------------------------------------------------------------
+    // Function : _checkFormat()
+    // Description :
+    //   This method check that the archive exists and is a valid zip archive.
+    //   Several level of check exists. (futur)
+    // Parameters :
+    //   $p_level : Level of check. Default 0.
+    //              0 : Check the first bytes (magic codes) (default value))
+    //              1 : 0 + Check the central directory (futur)
+    //              2 : 1 + Check each file header (futur)
+    // Return Values :
+    //   true on success,
+    //   false on error, the error code is set.
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_checkFormat()
+     *
+     * { Description }
+     *
+     * @param integer $p_level
+     */
+    public function _checkFormat($p_level=0)
+    {
+        $v_result = true;
 
     // ----- Reset the error handler
     $this->_errorReset();
@@ -759,16 +759,16 @@ 
     // ----- Look if the file exits
     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;
     }
 
     // ----- Check that the file is readeable
     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;
     }
 
@@ -783,34 +783,34 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _create()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_create()
-  *
-  * { Description }
-  *
-  */
-  public function _create($p_list, &$p_result_list, &$p_params)
-  {
-      $v_result=1;
-      $v_list_detail = array();
-
-      $p_add_dir = $p_params['add_path'];
-      $p_remove_dir = $p_params['remove_path'];
-      $p_remove_all_dir = $p_params['remove_all_path'];
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _create()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_create()
+     *
+     * { Description }
+     *
+     */
+    public function _create($p_list, &$p_result_list, &$p_params)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        $p_add_dir = $p_params['add_path'];
+        $p_remove_dir = $p_params['remove_path'];
+        $p_remove_all_dir = $p_params['remove_all_path'];
 
     // ----- Open the file in write mode
     if (($v_result = $this->_openFd('wb')) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
     // ----- Add the list of files
@@ -821,29 +821,29 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _add()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_add()
-  *
-  * { Description }
-  *
-  */
-  public function _add($p_list, &$p_result_list, &$p_params)
-  {
-      $v_result=1;
-      $v_list_detail = array();
-
-      $p_add_dir = $p_params['add_path'];
-      $p_remove_dir = $p_params['remove_path'];
-      $p_remove_all_dir = $p_params['remove_all_path'];
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _add()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_add()
+     *
+     * { Description }
+     *
+     */
+    public function _add($p_list, &$p_result_list, &$p_params)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        $p_add_dir = $p_params['add_path'];
+        $p_remove_dir = $p_params['remove_path'];
+        $p_remove_all_dir = $p_params['remove_all_path'];
 
     // ----- Look if the archive exists or is empty and need to be created
     if ((!is_file($this->_zipname)) || (filesize($this->_zipname) == 0)) {
@@ -858,10 +858,10 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          $this->_closeFd();
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            $this->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($this->_zip_fd);
@@ -874,8 +874,8 @@ 
         $this->_closeFd();
 
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open temporary file \''
-                       .$v_zip_temp_name.'\' in binary write mode');
+                        'Unable to open temporary file \''
+                        .$v_zip_temp_name.'\' in binary write mode');
         return Archive_Zip::errorCode();
     }
 
@@ -883,64 +883,64 @@ 
     // TBC : Here I should better append the file and go back to erase the
     // central dir
     $v_size = $v_central_dir['offset'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = fread($this->_zip_fd, $v_read_size);
-          @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = fread($this->_zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to
     // use the following methods on the temporary fil and not the real archive
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Add the files
     $v_header_list = array();
-      if (($v_result = $this->_addFileList($p_list, $v_header_list,
-                                         $p_add_dir, $p_remove_dir,
-                                         $p_remove_all_dir, $p_params)) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->_closeFd();
-          @unlink($v_zip_temp_name);
+        if (($v_result = $this->_addFileList($p_list, $v_header_list,
+                                            $p_add_dir, $p_remove_dir,
+                                            $p_remove_all_dir, $p_params)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->_closeFd();
+            @unlink($v_zip_temp_name);
 
-      // ----- Return
-      return $v_result;
-      }
+        // ----- Return
+        return $v_result;
+        }
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($this->_zip_fd);
 
     // ----- Copy the block of file headers from the old archive
     $v_size = $v_central_dir['size'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-          @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Create the Central Dir files header
     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) {
-              fclose($v_zip_temp_fd);
-              $this->_closeFd();
-              @unlink($v_zip_temp_name);
+        if ($v_header_list[$i]['status'] == 'ok') {
+            if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
+                fclose($v_zip_temp_fd);
+                $this->_closeFd();
+                @unlink($v_zip_temp_name);
 
-          // ----- Return
-          return $v_result;
-          }
-          $v_count++;
-      }
+            // ----- Return
+            return $v_result;
+            }
+            $v_count++;
+        }
 
-      // ----- Transform the header to a 'usable' info
-      $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        // ----- Transform the header to a 'usable' info
+        $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
     }
 
     // ----- Zip file comment
@@ -955,16 +955,16 @@ 
                                                 $v_size, $v_offset,
                                                 $v_comment)) != 1) {
         // ----- Reset the file list
-      unset($v_header_list);
+        unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
+        // ----- Return
+        return $v_result;
     }
 
     // ----- Swap back the file descriptor
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Close
     $this->_closeFd();
@@ -983,100 +983,100 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _openFd()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_openFd()
-  *
-  * { Description }
-  *
-  */
-  public function _openFd($p_mode)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _openFd()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_openFd()
+     *
+     * { Description }
+     *
+     */
+    public function _openFd($p_mode)
+    {
+        $v_result=1;
 
     // ----- Look if already open
     if ($this->_zip_fd != 0) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Zip file \''.$this->_zipname.'\' already open');
+                        'Zip file \''.$this->_zipname.'\' already open');
         return Archive_Zip::errorCode();
     }
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, $p_mode)) == 0) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open archive \''.$this->_zipname
-                       .'\' in '.$p_mode.' mode');
+                        'Unable to open archive \''.$this->_zipname
+                        .'\' in '.$p_mode.' mode');
         return Archive_Zip::errorCode();
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _closeFd()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_closeFd()
-  *
-  * { Description }
-  *
-  */
-  public function _closeFd()
-  {
-      $v_result=1;
-
-      if ($this->_zip_fd != 0) {
-          @fclose($this->_zip_fd);
-      }
-      $this->_zip_fd = 0;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _closeFd()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_closeFd()
+     *
+     * { Description }
+     *
+     */
+    public function _closeFd()
+    {
+        $v_result=1;
+
+        if ($this->_zip_fd != 0) {
+            @fclose($this->_zip_fd);
+        }
+        $this->_zip_fd = 0;
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addList()
-  *
-  * { Description }
-  *
-  */
-  public function _addList($p_list, &$p_result_list,
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _addList()
+    // Description :
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //   different from the real path of the file. This is usefull if you want to have PclTar
+    //   running in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //   $p_list : An array containing the file or directory names to add in the tar
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    //   $p_add_dir : Path to add in the filename path archived
+    //   $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_addList()
+     *
+     * { Description }
+     *
+     */
+    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();
-      if (($v_result = $this->_addFileList($p_list, $v_header_list,
-                                         $p_add_dir, $p_remove_dir,
-                                         $p_remove_all_dir, $p_params)) != 1) {
-          return $v_result;
-      }
+        if (($v_result = $this->_addFileList($p_list, $v_header_list,
+                                            $p_add_dir, $p_remove_dir,
+                                            $p_remove_all_dir, $p_params)) != 1) {
+            return $v_result;
+        }
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($this->_zip_fd);
@@ -1084,15 +1084,15 @@ 
     // ----- Create the Central Dir files header
     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) {
-              return $v_result;
-          }
-          $v_count++;
-      }
+        if ($v_header_list[$i]['status'] == 'ok') {
+            if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
+                return $v_result;
+            }
+            $v_count++;
+        }
 
-      // ----- Transform the header to a 'usable' info
-      $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        // ----- Transform the header to a 'usable' info
+        $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
     }
 
     // ----- Zip file comment
@@ -1105,42 +1105,42 @@ 
     if (($v_result = $this->_writeCentralHeader($v_count, $v_size, $v_offset,
                                                 $v_comment)) != 1) {
         // ----- Reset the file list
-      unset($v_header_list);
+        unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
+        // ----- Return
+        return $v_result;
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addFileList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to
-  //   run the lib in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addFileList()
-  *
-  * { Description }
-  *
-  */
-  public function _addFileList($p_list, &$p_result_list,
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _addFileList()
+    // Description :
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //   different from the real path of the file. This is usefull if you want to
+    //   run the lib in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //   $p_list : An array containing the file or directory names to add in the tar
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    //   $p_add_dir : Path to add in the filename path archived
+    //   $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_addFileList()
+     *
+     * { Description }
+     *
+     */
+    public function _addFileList($p_list, &$p_result_list,
                         $p_add_dir, $p_remove_dir, $p_remove_all_dir,
                         &$p_params)
-  {
-      $v_result=1;
-      $v_header = array();
+    {
+        $v_result=1;
+        $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = count($p_result_list);
@@ -1148,34 +1148,34 @@ 
     // ----- Loop on the files
     for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++) {
         // ----- Recuperate the filename
-      $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
-
-      // ----- Skip empty file names
-      if ($p_filename == '') {
-          continue;
-      }
-
-      // ----- Check the filename
-      if (!file_exists($p_filename)) {
-          $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-                         "File '$p_filename' does not exists");
-          return Archive_Zip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all pathnre move
-      if (is_file($p_filename) || (is_dir($p_filename) && !$p_remove_all_dir)) {
-          // ----- Add the file
+        $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
+
+        // ----- Skip empty file names
+        if ($p_filename == '') {
+            continue;
+        }
+
+        // ----- Check the filename
+        if (!file_exists($p_filename)) {
+            $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
+                            "File '$p_filename' does not exists");
+            return Archive_Zip::errorCode();
+        }
+
+        // ----- Look if it is a file or a dir with no all pathnre move
+        if (is_file($p_filename) || (is_dir($p_filename) && !$p_remove_all_dir)) {
+            // ----- Add the file
         if (($v_result = $this->_addFile($p_filename, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1) {
             // ----- Return status
-          return $v_result;
+            return $v_result;
         }
 
         // ----- Store the file infos
         $p_result_list[$v_nb++] = $v_header;
-      }
+        }
 
-      // ----- Look for directory
-      if (is_dir($p_filename)) {
+        // ----- Look for directory
+        if (is_dir($p_filename)) {
 
         // ----- Look for path
         if ($p_filename != '.') {
@@ -1186,67 +1186,67 @@ 
 
         // ----- Read the directory for files and sub-directories
         $p_hdir = opendir($p_filename);
-          $p_hitem = readdir($p_hdir); // '.' directory
+            $p_hitem = readdir($p_hdir); // '.' directory
         $p_hitem = readdir($p_hdir); // '..' directory
         while ($p_hitem = readdir($p_hdir)) {
 
-          // ----- Look for a file
-          if (is_file($v_path.$p_hitem)) {
+            // ----- Look for a file
+            if (is_file($v_path.$p_hitem)) {
 
             // ----- Add the file
             if (($v_result = $this->_addFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1) {
                 // ----- Return status
-              return $v_result;
+                return $v_result;
             }
 
             // ----- Store the file infos
             $p_result_list[$v_nb++] = $v_header;
-          }
+            }
 
-          // ----- Recursive call to _addFileList()
-          else {
+            // ----- Recursive call to _addFileList()
+            else {
 
             // ----- Need an array as parameter
             $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);
+                $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
 
             // ----- Update the number of elements of the list
             $v_nb = count($p_result_list);
-          }
+            }
         }
 
         // ----- Free memory for the recursive loop
         unset($p_temp_list, $p_hdir, $p_hitem);
-      }
-    }
-
-      return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addFile()
-  *
-  * { Description }
-  *
-  */
-  public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
-  {
-      $v_result=1;
-
-      if ($p_filename == '') {
-          // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Invalid file list parameter (invalid or empty list)');
+        }
+    }
 
-      // ----- Return
-      return Archive_Zip::errorCode();
-      }
+        return $v_result;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _addFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_addFile()
+     *
+     * { Description }
+     *
+     */
+    public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
+    {
+        $v_result=1;
+
+        if ($p_filename == '') {
+            // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Invalid file list parameter (invalid or empty list)');
+
+        // ----- Return
+        return Archive_Zip::errorCode();
+        }
 
     // ----- Calculate the stored filename
     $v_stored_filename = $p_filename;
@@ -1309,51 +1309,51 @@ 
 
     // ----- Set the file properties
     clearstatcache();
-      $p_header['version'] = 20;
-      $p_header['version_extracted'] = 10;
-      $p_header['flag'] = 0;
-      $p_header['compression'] = 0;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['crc'] = 0;
-      $p_header['compressed_size'] = 0;
-      $p_header['size'] = filesize($p_filename);
-      $p_header['filename_len'] = strlen($p_filename);
-      $p_header['extra_len'] = 0;
-      $p_header['comment_len'] = 0;
-      $p_header['disk'] = 0;
-      $p_header['internal'] = 0;
-      $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;
-      $p_header['extra'] = '';
-      $p_header['comment'] = '';
-      $p_header['status'] = 'ok';
-      $p_header['index'] = -1;
+        $p_header['version'] = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag'] = 0;
+        $p_header['compression'] = 0;
+        $p_header['mtime'] = filemtime($p_filename);
+        $p_header['crc'] = 0;
+        $p_header['compressed_size'] = 0;
+        $p_header['size'] = filesize($p_filename);
+        $p_header['filename_len'] = strlen($p_filename);
+        $p_header['extra_len'] = 0;
+        $p_header['comment_len'] = 0;
+        $p_header['disk'] = 0;
+        $p_header['internal'] = 0;
+        $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;
+        $p_header['extra'] = '';
+        $p_header['comment'] = '';
+        $p_header['status'] = 'ok';
+        $p_header['index'] = -1;
 
     // ----- Look for pre-add callback
     if (isset($p_params[ARCHIVE_ZIP_PARAM_PRE_ADD])
         && ($p_params[ARCHIVE_ZIP_PARAM_PRE_ADD] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($p_header, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
+        // ----- Call the callback
+        // Here I do not use call_user_func() because I need to send a reference to the
+        // header.
+        eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
         if ($v_result == 0) {
             // ----- Change the file status
         $p_header['status'] = 'skipped';
             $v_result = 1;
         }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-          $p_header['stored_filename'] = $this->_tool_PathReduction($v_local_header['stored_filename']);
-      }
+        // ----- Update the informations
+        // Only some fields can be modified
+        if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+            $p_header['stored_filename'] = $this->_tool_PathReduction($v_local_header['stored_filename']);
+        }
     }
 
     // ----- Look for empty stored filename
@@ -1369,34 +1369,34 @@ 
     // ----- Look if no error, or file not skipped
     if ($p_header['status'] == 'ok') {
 
-      // ----- Look for a file
-      if (is_file($p_filename)) {
-          // ----- Open the source file
+        // ----- Look for a file
+        if (is_file($p_filename)) {
+            // ----- Open the source file
         if (($v_file = @fopen($p_filename, 'rb')) == 0) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
             return Archive_Zip::errorCode();
         }
 
-          if ($p_params['no_compression']) {
-              // ----- Read the file content
-          $v_content_compressed = @fread($v_file, $p_header['size']);
+            if ($p_params['no_compression']) {
+                // ----- Read the file content
+            $v_content_compressed = @fread($v_file, $p_header['size']);
 
-          // ----- Calculate the CRC
-          $p_header['crc'] = crc32($v_content_compressed);
-          } else {
-              // ----- Read the file content
-          $v_content = @fread($v_file, $p_header['size']);
+            // ----- Calculate the CRC
+            $p_header['crc'] = crc32($v_content_compressed);
+            } else {
+                // ----- Read the file content
+            $v_content = @fread($v_file, $p_header['size']);
 
-          // ----- Calculate the CRC
-          $p_header['crc'] = crc32($v_content);
+            // ----- Calculate the CRC
+            $p_header['crc'] = crc32($v_content);
 
-          // ----- Compress the file
-          $v_content_compressed = gzdeflate($v_content);
-          }
+            // ----- Compress the file
+            $v_content_compressed = gzdeflate($v_content);
+            }
 
         // ----- Set header parameters
         $p_header['compressed_size'] = strlen($v_content_compressed);
-          $p_header['compression'] = 8;
+            $p_header['compression'] = 8;
 
         // ----- Call the header generation
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
@@ -1406,68 +1406,68 @@ 
 
         // ----- Write the compressed content
         $v_binary_data = pack('a'.$p_header['compressed_size'], $v_content_compressed);
-          @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
+            @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
 
         // ----- Close the file
         @fclose($v_file);
-      }
+        }
 
-      // ----- Look for a directory
-      else {
-          // ----- Set the file properties
+        // ----- Look for a directory
+        else {
+            // ----- Set the file properties
         $p_header['filename'] .= '/';
-          $p_header['filename_len']++;
-          $p_header['size'] = 0;
-          $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+            $p_header['filename_len']++;
+            $p_header['size'] = 0;
+            $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
             return $v_result;
         }
-      }
+        }
     }
 
     // ----- Look for pre-add callback
     if (isset($p_params[ARCHIVE_ZIP_PARAM_POST_ADD])
         && ($p_params[ARCHIVE_ZIP_PARAM_POST_ADD] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($p_header, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
+        // ----- Call the callback
+        // Here I do not use call_user_func() because I need to send a reference to the
+        // header.
+        eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
         if ($v_result == 0) {
             // ----- Ignored
         $v_result = 1;
         }
 
-      // ----- Update the informations
-      // Nothing can be modified
+        // ----- Update the informations
+        // Nothing can be modified
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _writeFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _writeFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_writeFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _writeFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1478,14 +1478,14 @@ 
 
     // ----- 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'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']), $p_header['extra_len']);
+                            $p_header['compression'], $v_mtime, $v_mdate,
+                            $p_header['crc'], $p_header['compressed_size'], $p_header['size'],
+                            strlen($p_header['stored_filename']), $p_header['extra_len']);
 
     // ----- Write the first 148 bytes of the header in the archive
     fwrite($this->_zip_fd, $v_binary_data, 30);
@@ -1494,30 +1494,30 @@ 
     if (strlen($p_header['stored_filename']) != 0) {
         fwrite($this->_zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
     }
-      if ($p_header['extra_len'] != 0) {
-          fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
-      }
+        if ($p_header['extra_len'] != 0) {
+            fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeCentralFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _writeCentralFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _writeCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_writeCentralFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _writeCentralFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1525,15 +1525,15 @@ 
 
     // ----- 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'],
-                          $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+                            $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'],
+                            $p_header['compressed_size'], $p_header['size'],
+                            strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'],
+                            $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
 
     // ----- Write the 42 bytes of the header in the zip file
     fwrite($this->_zip_fd, $v_binary_data, 46);
@@ -1542,33 +1542,33 @@ 
     if (strlen($p_header['stored_filename']) != 0) {
         fwrite($this->_zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
     }
-      if ($p_header['extra_len'] != 0) {
-          fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
-      }
-      if ($p_header['comment_len'] != 0) {
-          fwrite($this->_zip_fd, $p_header['comment'], $p_header['comment_len']);
-      }
+        if ($p_header['extra_len'] != 0) {
+            fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fwrite($this->_zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeCentralHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _writeCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_writeCentralHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+    {
+        $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));
@@ -1583,60 +1583,60 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _list()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_list()
-  *
-  * { Description }
-  *
-  */
-  public function _list(&$p_list)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _list()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_list()
+     *
+     * { Description }
+     *
+     */
+    public function _list(&$p_list)
+    {
+        $v_result=1;
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
         // ----- 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
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            return $v_result;
+        }
 
     // ----- Go to beginning of Central Dir
     @rewind($this->_zip_fd);
-      if (@fseek($this->_zip_fd, $v_central_dir['offset'])) {
-          // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+        if (@fseek($this->_zip_fd, $v_central_dir['offset'])) {
+            // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
-      }
+        // ----- Return
+        return Archive_Zip::errorCode();
+        }
 
     // ----- Read each entry
     for ($i=0; $i<$v_central_dir['entries']; $i++) {
         // ----- Read the file header
-      if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
-          return $v_result;
-      }
+        if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
         $v_header['index'] = $i;
 
-      // ----- Get the only interesting attributes
-      $this->_convertHeader2FileInfo($v_header, $p_list[$i]);
+        // ----- Get the only interesting attributes
+        $this->_convertHeader2FileInfo($v_header, $p_list[$i]);
         unset($v_header);
     }
 
@@ -1645,82 +1645,82 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _convertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_convertHeader2FileInfo()
-  *
-  * { Description }
-  *
-  */
-  public function _convertHeader2FileInfo($p_header, &$p_info)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _convertHeader2FileInfo()
+    // Description :
+    //   This function takes the file informations from the central directory
+    //   entries and extract the interesting parameters that will be given back.
+    //   The resulting file infos are set in the array $p_info
+    //     $p_info['filename'] : Filename with full path. Given by user (add),
+    //                           extracted in the filesystem (extract).
+    //     $p_info['stored_filename'] : Stored filename in the archive.
+    //     $p_info['size'] = Size of the file.
+    //     $p_info['compressed_size'] = Compressed size of the file.
+    //     $p_info['mtime'] = Last modification date of the file.
+    //     $p_info['comment'] = Comment associated with the file.
+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+    //     $p_info['status'] = status of the action on the file.
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_convertHeader2FileInfo()
+     *
+     * { Description }
+     *
+     */
+    public function _convertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result=1;
 
     // ----- Get the interesting attributes
     $p_info['filename'] = $p_header['filename'];
-      $p_info['stored_filename'] = $p_header['stored_filename'];
-      $p_info['size'] = $p_header['size'];
-      $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['index'] = $p_header['index'];
-      $p_info['status'] = $p_header['status'];
+        $p_info['stored_filename'] = $p_header['stored_filename'];
+        $p_info['size'] = $p_header['size'];
+        $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['index'] = $p_header['index'];
+        $p_info['status'] = $p_header['status'];
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractByRule()
-  *
-  * { Description }
-  *
-  */
-  public function _extractByRule(&$p_file_list, &$p_params)
-  {
-      $v_result=1;
-
-      $p_path = $p_params['add_path'];
-      $p_remove_path = $p_params['remove_path'];
-      $p_remove_all_path = $p_params['remove_all_path'];
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _extractByRule()
+    // Description :
+    //   Extract a file or directory depending of rules (by index, by name, ...)
+    // Parameters :
+    //   $p_file_list : An array where will be placed the properties of each
+    //                  extracted file
+    //   $p_path : Path to add while writing the extracted files
+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+    //                    extracted files. If the path does not match the file path,
+    //                    the file is extracted with its memorized path.
+    //                    $p_remove_path does not apply to 'list' mode.
+    //                    $p_path and $p_remove_path are commulative.
+    // Return Values :
+    //   1 on success,0 or less on error (see error code list)
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_extractByRule()
+     *
+     * { Description }
+     *
+     */
+    public function _extractByRule(&$p_file_list, &$p_params)
+    {
+        $v_result=1;
+
+        $p_path = $p_params['add_path'];
+        $p_remove_path = $p_params['remove_path'];
+        $p_remove_all_path = $p_params['remove_all_path'];
 
     // ----- Check the path
     if (($p_path == '')
@@ -1732,16 +1732,16 @@ 
     // ----- 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);
-      }
+        while (substr($p_path, -1) == '/') {
+            $p_path = substr($p_path, 0, strlen($p_path)-1);
+        }
     }
 
     // ----- Look for path to remove format (should end by /)
     if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
         $p_remove_path .= '/';
     }
-      $p_remove_path_size = strlen($p_remove_path);
+        $p_remove_path_size = strlen($p_remove_path);
 
     // ----- Open the zip file
     if (($v_result = $this->_openFd('rb')) != 1) {
@@ -1750,202 +1750,202 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          // ----- Close the zip file
-      $this->_closeFd();
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+        $this->_closeFd();
 
-          return $v_result;
-      }
+            return $v_result;
+        }
 
     // ----- Start at beginning of Central Dir
     $v_pos_entry = $v_central_dir['offset'];
 
     // ----- Read each entry
     $j_start = 0;
-      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)) {
-              $this->_closeFd();
+        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)) {
+                $this->_closeFd();
 
-              $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-                         'Invalid archive size');
+                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
+                            'Invalid archive size');
 
-              return Archive_Zip::errorCode();
-          }
+                return Archive_Zip::errorCode();
+            }
 
-      // ----- Read the file header
-      $v_header = array();
-          if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
-              $this->_closeFd();
+        // ----- Read the file header
+        $v_header = array();
+            if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
+                $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-      // ----- Store the index
-      $v_header['index'] = $i;
+        // ----- Store the index
+        $v_header['index'] = $i;
 
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->_zip_fd);
+        // ----- Store the file position
+        $v_pos_entry = ftell($this->_zip_fd);
 
-      // ----- Look for the specific extract rules
-      $v_extract = false;
+        // ----- Look for the specific extract rules
+        $v_extract = false;
 
-      // ----- Look for extract by name rule
-      if (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME])
+        // ----- Look for extract by name rule
+        if (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME])
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0;
-                  ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
+            // ----- Look if the filename is in the list
+            for ($j=0;
+                    ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                && (!$v_extract);
-               $j++) {
+                $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
+                // ----- Look for a directory
+                if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
 
-                  // ----- Look if the directory is in the filename path
-                  if ((strlen($v_header['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
+                    // ----- Look if the directory is in the filename path
+                    if ((strlen($v_header['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
                       && (substr($v_header['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
+                        $v_extract = true;
+                    }
+                }
+                // ----- Look for a filename
+                elseif ($v_header['stored_filename'] == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
+                    $v_extract = true;
+                }
+            }
+        }
+
+        // ----- Look for extract by ereg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_EREG] != '')) {
-          if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+            if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG], $v_header['stored_filename'])) {
+                $v_extract = true;
+            }
+        }
 
-      // ----- Look for extract by preg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
+        // ----- Look for extract by preg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_PREG] != '')) {
-          if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+            if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG], $v_header['stored_filename'])) {
+                $v_extract = true;
+            }
+        }
 
-      // ----- Look for extract by index rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
+        // ----- Look for extract by index rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
               && ($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'])) {
-                  $v_extract = true;
-              }
-              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) {
-                  break;
-              }
-          }
-      }
+            // ----- 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'])) {
+                    $v_extract = true;
+                }
+                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) {
+                    break;
+                }
+            }
+        }
 
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
+        // ----- Look for no rule, which means extract all the archive
+        else {
+            $v_extract = true;
+        }
 
 
-      // ----- Look for real extraction
-      if ($v_extract) {
+        // ----- Look for real extraction
+        if ($v_extract) {
 
         // ----- Go to the file position
         @rewind($this->_zip_fd);
-          if (@fseek($this->_zip_fd, $v_header['offset'])) {
-              // ----- Close the zip file
-          $this->_closeFd();
+            if (@fseek($this->_zip_fd, $v_header['offset'])) {
+                // ----- Close the zip file
+            $this->_closeFd();
 
-          // ----- Error log
-          $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+            // ----- Error log
+            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-          // ----- Return
-          return Archive_Zip::errorCode();
-          }
+            // ----- Return
+            return Archive_Zip::errorCode();
+            }
 
         // ----- Look for extraction as string
         if ($p_params[ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING]) {
 
-          // ----- Extracting the file
-          if (($v_result = $this->_extractFileAsString($v_header, $v_string)) != 1) {
-              // ----- Close the zip file
+            // ----- Extracting the file
+            if (($v_result = $this->_extractFileAsString($v_header, $v_string)) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
-              // ----- Close the zip file
+            // ----- Get the only interesting attributes
+            if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+            // ----- Set the file content
+            $p_file_list[$v_nb_extracted]['content'] = $v_string;
 
-          // ----- Next extracted file
-          $v_nb_extracted++;
+            // ----- Next extracted file
+            $v_nb_extracted++;
         } else {
             // ----- Extracting the file
-          if (($v_result = $this->_extractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_params)) != 1) {
-              // ----- Close the zip file
+            if (($v_result = $this->_extractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_params)) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-              // ----- Close the zip file
+            // ----- Get the only interesting attributes
+            if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
+        }
+        }
         }
-      }
-      }
 
     // ----- Close the zip file
     $this->_closeFd();
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractFile()
-  *
-  * { Description }
-  *
-  */
-  public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _extractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_extractFile()
+     *
+     * { Description }
+     *
+     */
+    public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
+    {
+        $v_result=1;
 
     // ----- Read the file header
     if (($v_result = $this->_readFileHeader($v_header)) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
 
@@ -1961,14 +1961,14 @@ 
     // ----- Look for path to remove
     elseif ($p_remove_path != '') {
         //if (strcmp($p_remove_path, $p_entry['filename'])==0)
-      if ($this->_tool_PathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+        if ($this->_tool_PathInclusion($p_remove_path, $p_entry['filename']) == 2) {
 
         // ----- Change the file status
         $p_entry['status'] = 'filtered';
 
         // ----- Return
         return $v_result;
-      }
+        }
 
         $p_remove_path_size = strlen($p_remove_path);
         if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
@@ -1987,23 +1987,23 @@ 
     if (isset($p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT])
         && ($p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
+        // ----- Call the callback
+        // Here I do not use call_user_func() because I need to send a reference to the
+        // header.
+        eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
         if ($v_result == 0) {
             // ----- Change the file status
         $p_entry['status'] = 'skipped';
             $v_result = 1;
         }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
+        // ----- Update the informations
+        // Only some fields can be modified
+        $p_entry['filename'] = $v_local_header['filename'];
     }
 
     // ----- Trace
@@ -2014,34 +2014,34 @@ 
     // ----- Look for specific actions while the file exist
     if (file_exists($p_entry['filename'])) {
 
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename'])) {
+        // ----- Look if file is a directory
+        if (is_dir($p_entry['filename'])) {
 
         // ----- Change the file status
         $p_entry['status'] = 'already_a_directory';
 
         // ----- Return
         //return $v_result;
-      }
-      // ----- Look if file is write protected
-      elseif (!is_writable($p_entry['filename'])) {
+        }
+        // ----- Look if file is write protected
+        elseif (!is_writable($p_entry['filename'])) {
 
         // ----- Change the file status
         $p_entry['status'] = 'write_protected';
 
         // ----- Return
         //return $v_result;
-      }
+        }
 
-      // ----- Look if the extracted file is older
-      elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+        // ----- Look if the extracted file is older
+        elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
 
         // ----- Change the file status
         $p_entry['status'] = 'newer_exist';
 
         // ----- Return
         //return $v_result;
-      }
+        }
     }
 
     // ----- Check the directory availability and create it if necessary
@@ -2069,25 +2069,25 @@ 
     // ----- Look if extraction should be done
     if ($p_entry['status'] == 'ok') {
 
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+        // ----- Do the extraction (if not a folder)
+        if (!(($p_entry['external']&0x00000010)==0x00000010)) {
 
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
-          // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            // ----- Opening destination file
+            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
 
             // ----- Change the file status
             $p_entry['status'] = 'write_error';
 
             // ----- Return
             return $v_result;
-          }
+            }
 
 
-          // ----- Read the file by ARCHIVE_ZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
+            // ----- Read the file by ARCHIVE_ZIP_READ_BLOCK_SIZE octets blocks
+            $v_size = $p_entry['compressed_size'];
             while ($v_size != 0) {
                 $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
                 $v_buffer = fread($this->_zip_fd, $v_read_size);
@@ -2096,93 +2096,93 @@ 
                 $v_size -= $v_read_size;
             }
 
-          // ----- Closing the destination file
-          fclose($v_dest_file);
+            // ----- Closing the destination file
+            fclose($v_dest_file);
 
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
+            // ----- Change the file mtime
+            touch($p_entry['filename'], $p_entry['mtime']);
         } else {
             // ----- Trace
 
-          // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            // ----- Opening destination file
+            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
 
             // ----- Change the file status
             $p_entry['status'] = 'write_error';
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->_zip_fd, $p_entry['compressed_size']);
+            // ----- Read the compressed file in a buffer (one shot)
+            $v_buffer = @fread($this->_zip_fd, $p_entry['compressed_size']);
 
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
+            // ----- Decompress the file
+            $v_file_content = gzinflate($v_buffer);
             unset($v_buffer);
 
-          // ----- Write the uncompressed data
-          @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+            // ----- Write the uncompressed data
+            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
             unset($v_file_content);
 
-          // ----- Closing the destination file
-          @fclose($v_dest_file);
+            // ----- Closing the destination file
+            @fclose($v_dest_file);
 
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
+            // ----- Change the file mtime
+            touch($p_entry['filename'], $p_entry['mtime']);
         }
 
         // ----- Look for chmod option
         if (isset($p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD])
             && ($p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD] != 0)) {
 
-          // ----- Change the mode of the file
-          chmod($p_entry['filename'], $p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD]);
+            // ----- Change the mode of the file
+            chmod($p_entry['filename'], $p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD]);
+        }
         }
-      }
     }
 
     // ----- Look for post-extract callback
     if (isset($p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT])
         && ($p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($p_entry, $v_local_header);
 
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
+        // ----- Call the callback
+        // Here I do not use call_user_func() because I need to send a reference to the
+        // header.
+        eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractFileAsString()
-  *
-  * { Description }
-  *
-  */
-  public function _extractFileAsString(&$p_entry, &$p_string)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _extractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_extractFileAsString()
+     *
+     * { Description }
+     *
+     */
+    public function _extractFileAsString(&$p_entry, &$p_string)
+    {
+        $v_result=1;
 
     // ----- Read the file header
     $v_header = array();
-      if (($v_result = $this->_readFileHeader($v_header)) != 1) {
-          // ----- Return
-      return $v_result;
-      }
+        if (($v_result = $this->_readFileHeader($v_header)) != 1) {
+            // ----- Return
+        return $v_result;
+        }
 
 
     // ----- Check that the file header is coherent with $p_entry info
@@ -2193,59 +2193,59 @@ 
     // ----- Do the extraction (if not a folder)
     if (!(($p_entry['external']&0x00000010)==0x00000010)) {
         // ----- Look for not compressed file
-      if ($p_entry['compressed_size'] == $p_entry['size']) {
-          // ----- Trace
+        if ($p_entry['compressed_size'] == $p_entry['size']) {
+            // ----- Trace
 
         // ----- Reading the file
         $p_string = fread($this->_zip_fd, $p_entry['compressed_size']);
-      } else {
-          // ----- Trace
+        } else {
+            // ----- Trace
 
         // ----- Reading the file
         $v_data = fread($this->_zip_fd, $p_entry['compressed_size']);
 
         // ----- Decompress the file
         $p_string = gzinflate($v_data);
-      }
+        }
 
-      // ----- Trace
+        // ----- Trace
     } else {
         // TBC : error : can not extract a folder in a string
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _readFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _readFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_readFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _readFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
-      $v_data = unpack('Vid', $v_binary_data);
+        $v_data = unpack('Vid', $v_binary_data);
 
     // ----- Check signature
     if ($v_data['id'] != 0x04034b50) {
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Read the first 42 bytes of the header
@@ -2256,11 +2256,11 @@ 
         $p_header['filename'] = '';
         $p_header['status'] = 'invalid_header';
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Extract the values
@@ -2278,30 +2278,30 @@ 
 
     // ----- Extract properties
     $p_header['compression'] = $v_data['compression'];
-      $p_header['size'] = $v_data['size'];
-      $p_header['compressed_size'] = $v_data['compressed_size'];
-      $p_header['crc'] = $v_data['crc'];
-      $p_header['flag'] = $v_data['flag'];
+        $p_header['size'] = $v_data['size'];
+        $p_header['compressed_size'] = $v_data['compressed_size'];
+        $p_header['crc'] = $v_data['crc'];
+        $p_header['flag'] = $v_data['flag'];
 
     // ----- Recuperate date in UNIX format
     $p_header['mdate'] = $v_data['mdate'];
-      $p_header['mtime'] = $v_data['mtime'];
-      if ($p_header['mdate'] && $p_header['mtime']) {
-          // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-          $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-          $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-          $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-          $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-      } else {
-          $p_header['mtime'] = time();
-      }
+        $p_header['mtime'] = $v_data['mtime'];
+        if ($p_header['mdate'] && $p_header['mtime']) {
+            // ----- Extract time
+        $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+        // ----- Extract date
+        $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day = $p_header['mdate'] & 0x001F;
+
+        // ----- Get UNIX date format
+        $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+        } else {
+            $p_header['mtime'] = time();
+        }
 
     // ----- Other informations
 
@@ -2317,37 +2317,37 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readCentralFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _readCentralFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _readCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_readCentralFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _readCentralFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
-      $v_data = unpack('Vid', $v_binary_data);
+        $v_data = unpack('Vid', $v_binary_data);
 
     // ----- Check signature
     if ($v_data['id'] != 0x02014b50) {
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Read the first 42 bytes of the header
@@ -2358,11 +2358,11 @@ 
         $p_header['filename'] = '';
         $p_header['status'] = 'invalid_header';
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Extract the values
@@ -2394,17 +2394,17 @@ 
     // ----- Recuperate date in UNIX format
     if ($p_header['mdate'] && $p_header['mtime']) {
         // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+        $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
         $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
         $v_seconde = ($p_header['mtime'] & 0x001F)*2;
 
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+        // ----- Extract date
+        $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
         $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
         $v_day = $p_header['mdate'] & 0x001F;
 
-      // ----- Get UNIX date format
-      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+        // ----- Get UNIX date format
+        $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
     } else {
         $p_header['mtime'] = time();
     }
@@ -2423,76 +2423,76 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readEndCentralDir()
-  *
-  * { Description }
-  *
-  */
-  public function _readEndCentralDir(&$p_central_dir)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _readEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_readEndCentralDir()
+     *
+     * { Description }
+     *
+     */
+    public function _readEndCentralDir(&$p_central_dir)
+    {
+        $v_result=1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->_zipname);
-      @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.'\'');
-          return Archive_Zip::errorCode();
-      }
+        @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.'\'');
+            return Archive_Zip::errorCode();
+        }
 
     // ----- First try : look if this is an archive with no commentaries
     // (most of the time)
     // 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)) {
-              $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                         'Unable to seek back to the middle of the archive \''
-                         .$this->_zipname.'\'');
-              return Archive_Zip::errorCode();
-          }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->_zip_fd, 4);
-          $v_data = unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-          $v_found = 1;
-      }
-
-          $v_pos = ftell($this->_zip_fd);
-      }
+        if ($v_size > 26) {
+            @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.'\'');
+                return Archive_Zip::errorCode();
+            }
+
+        // ----- Read for bytes
+        $v_binary_data = @fread($this->_zip_fd, 4);
+            $v_data = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] == 0x06054b50) {
+            $v_found = 1;
+        }
+
+            $v_pos = ftell($this->_zip_fd);
+        }
 
     // ----- Go back to the maximum possible size of the Central Dir End Record
     if (!$v_found) {
         $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size) {
-          $v_maximum_size = $v_size;
-      }
+        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)) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                         'Unable to seek back to the middle of the archive \''
-                         .$this->_zipname.'\'');
+                            'Unable to seek back to the middle of the archive \''
+                            .$this->_zipname.'\'');
             return Archive_Zip::errorCode();
         }
 
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->_zip_fd);
+        // ----- Read byte per byte in order to find the signature
+        $v_pos = ftell($this->_zip_fd);
         $v_bytes = 0x00000000;
         while ($v_pos < $v_size) {
             // ----- Read a byte
@@ -2510,11 +2510,11 @@ 
             $v_pos++;
         }
 
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size) {
-          $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to find End of Central Dir Record signature');
-          return Archive_Zip::errorCode();
-      }
+        // ----- Look if not found end of central dir
+        if ($v_pos == $v_size) {
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to find End of Central Dir Record signature');
+            return Archive_Zip::errorCode();
+        }
     }
 
     // ----- Read the first 18 bytes of the header
@@ -2523,8 +2523,8 @@ 
     // ----- Look for invalid block size
     if (strlen($v_binary_data) != 18) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                         'Invalid End of Central Dir Record size : '
-                         . strlen($v_binary_data));
+                            'Invalid End of Central Dir Record size : '
+                            . strlen($v_binary_data));
         return Archive_Zip::errorCode();
     }
 
@@ -2544,47 +2544,47 @@ 
         $p_central_dir['comment'] = '';
     }
 
-      $p_central_dir['entries'] = $v_data['entries'];
-      $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-      $p_central_dir['offset'] = $v_data['offset'];
-      $p_central_dir['size'] = $v_data['size'];
-      $p_central_dir['disk'] = $v_data['disk'];
-      $p_central_dir['disk_start'] = $v_data['disk_start'];
+        $p_central_dir['entries'] = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset'] = $v_data['offset'];
+        $p_central_dir['size'] = $v_data['size'];
+        $p_central_dir['disk'] = $v_data['disk'];
+        $p_central_dir['disk_start'] = $v_data['disk_start'];
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _deleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_deleteByRule()
-  *
-  * { Description }
-  *
-  */
-  public function _deleteByRule(&$p_result_list, &$p_params)
-  {
-      $v_result=1;
-      $v_list_detail = array();
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _deleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_deleteByRule()
+     *
+     * { Description }
+     *
+     */
+    public function _deleteByRule(&$p_result_list, &$p_params)
+    {
+        $v_result=1;
+        $v_list_detail = array();
 
     // ----- Open the zip file
     if (($v_result=$this->_openFd('rb')) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          $this->_closeFd();
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            $this->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($this->_zip_fd);
@@ -2592,123 +2592,123 @@ 
     // ----- Scan all the files
     // ----- Start at beginning of Central Dir
     $v_pos_entry = $v_central_dir['offset'];
-      @rewind($this->_zip_fd);
-      if (@fseek($this->_zip_fd, $v_pos_entry)) {
-          // ----- Clean
-      $this->_closeFd();
+        @rewind($this->_zip_fd);
+        if (@fseek($this->_zip_fd, $v_pos_entry)) {
+            // ----- Clean
+        $this->_closeFd();
 
-          $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-                       'Invalid archive size');
-          return Archive_Zip::errorCode();
-      }
+            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
+                        'Invalid archive size');
+            return Archive_Zip::errorCode();
+        }
 
     // ----- Read each entry
     $v_header_list = array();
-      $j_start = 0;
-      for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+        $j_start = 0;
+        for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
 
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-          $v_result
+        // ----- Read the file header
+        $v_header_list[$v_nb_extracted] = array();
+            $v_result
         = $this->_readCentralFileHeader($v_header_list[$v_nb_extracted]);
-          if ($v_result != 1) {
-              // ----- Clean
+            if ($v_result != 1) {
+                // ----- Clean
         $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
+        // ----- Store the index
+        $v_header_list[$v_nb_extracted]['index'] = $i;
 
-      // ----- Look for the specific extract rules
-      $v_found = false;
+        // ----- Look for the specific extract rules
+        $v_found = false;
 
-      // ----- Look for extract by name rule
-      if (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME])
+        // ----- Look for extract by name rule
+        if (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME])
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0;
-               ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
+            // ----- Look if the filename is in the list
+            for ($j=0;
+                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                  && (!$v_found);
-               $j++) {
+                $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
+                // ----- Look for a directory
+                if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
 
-                  // ----- Look if the directory is in the filename path
-                  if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
+                    // ----- Look if the directory is in the filename path
+                    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 */
+                        $v_found = true;
+                    } 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;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename']
-                      == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
+                        $v_found = true;
+                    }
+                }
+                // ----- Look for a filename
+                elseif ($v_header_list[$v_nb_extracted]['stored_filename']
+                        == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
+                    $v_found = true;
+                }
+            }
+        }
+
+        // ----- Look for extract by ereg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_EREG] != '')) {
-          if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG],
-                   $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by preg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
+            if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG],
+                    $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                $v_found = true;
+            }
+        }
+
+        // ----- Look for extract by preg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_PREG] != '')) {
-          if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG],
-                         $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
+            if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG],
+                            $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                $v_found = true;
+            }
+        }
+
+        // ----- Look for extract by index rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
               && ($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]))
+            // ----- Look if the index is in the list
+            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'])
+                $j++) {
+                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 ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for deletion
-      if ($v_found) {
-          unset($v_header_list[$v_nb_extracted]);
-      } else {
-          $v_nb_extracted++;
-      }
-      }
+                    $v_found = true;
+                }
+                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) {
+                    break;
+                }
+            }
+        }
+
+        // ----- Look for deletion
+        if ($v_found) {
+            unset($v_header_list[$v_nb_extracted]);
+        } else {
+            $v_nb_extracted++;
+        }
+        }
 
     // ----- Look if something need to be deleted
     if ($v_nb_extracted > 0) {
 
         // ----- Creates a temporay file
         $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-')
-                           .'.tmp';
+                            .'.tmp';
 
         // ----- Creates a temporary zip archive
         $v_temp_zip = new Archive_Zip($v_zip_temp_name);
@@ -2733,7 +2733,7 @@ 
                 @unlink($v_zip_temp_name);
 
                 $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-                                 'Invalid archive size');
+                                    'Invalid archive size');
                 return Archive_Zip::errorCode();
             }
 
@@ -2760,8 +2760,8 @@ 
 
             // ----- Read/write the data block
             $v_result = $this->_tool_CopyBlock($this->_zip_fd,
-                                               $v_temp_zip->_zip_fd,
-                                       $v_header_list[$i]['compressed_size']);
+                                                $v_temp_zip->_zip_fd,
+                                        $v_header_list[$i]['compressed_size']);
             if ($v_result != 1) {
                 // ----- Clean
                 $this->_closeFd();
@@ -2790,7 +2790,7 @@ 
 
             // ----- Transform the header to a 'usable' info
             $v_temp_zip->_convertHeader2FileInfo($v_header_list[$i],
-                                                 $p_result_list[$i]);
+                                                    $p_result_list[$i]);
         }
 
 
@@ -2802,8 +2802,8 @@ 
 
         // ----- Create the central dir footer
         $v_result = $v_temp_zip->_writeCentralHeader(count($v_header_list),
-                                                     $v_size, $v_offset,
-                                                     $v_comment);
+                                                        $v_size, $v_offset,
+                                                        $v_comment);
         if ($v_result != 1) {
             // ----- Clean
             unset($v_header_list);
@@ -2833,30 +2833,30 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _dirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_dirCheck()
-  *
-  * { Description }
-  *
-  * @param [type] $p_is_dir
-  */
-  public function _dirCheck($p_dir, $p_is_dir=false)
-  {
-      $v_result = 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _dirCheck()
+    // Description :
+    //   Check if a directory exists, if not it creates it and all the parents directory
+    //   which may be useful.
+    // Parameters :
+    //   $p_dir : Directory path to check.
+    // Return Values :
+    //    1 : OK
+    //   -1 : Unable to create directory
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_dirCheck()
+     *
+     * { Description }
+     *
+     * @param [type] $p_is_dir
+     */
+    public function _dirCheck($p_dir, $p_is_dir=false)
+    {
+        $v_result = 1;
 
     // ----- Remove the final '/'
     if ($p_is_dir && (substr($p_dir, -1) == '/')) {
@@ -2874,52 +2874,52 @@ 
     // ----- Just a check
     if ($p_parent_dir != $p_dir) {
         // ----- Look for parent directory
-      if ($p_parent_dir != '') {
-          if (($v_result = $this->_dirCheck($p_parent_dir)) != 1) {
-              return $v_result;
-          }
-      }
+        if ($p_parent_dir != '') {
+            if (($v_result = $this->_dirCheck($p_parent_dir)) != 1) {
+                return $v_result;
+            }
+        }
     }
 
     // ----- Create the directory
     if (!@mkdir($p_dir, 0777)) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL,
-                       "Unable to create directory '$p_dir'");
+                        "Unable to create directory '$p_dir'");
         return Archive_Zip::errorCode();
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _merge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_merge()
-  *
-  * { Description }
-  *
-  */
-  public function _merge(&$p_archive_to_add)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _merge()
+    // Description :
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_merge()
+     *
+     * { Description }
+     *
+     */
+    public function _merge(&$p_archive_to_add)
+    {
+        $v_result=1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->_zipname)) {
         // ----- Nothing to merge, so merge is a success
-      return 1;
+        return 1;
     }
 
     // ----- Look if the archive exists
     if (!is_file($this->_zipname)) {
         // ----- Do a duplicate
-      $v_result = $this->_duplicate($p_archive_to_add->_zipname);
+        $v_result = $this->_duplicate($p_archive_to_add->_zipname);
 
         return $v_result;
     }
@@ -2931,10 +2931,10 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          $this->_closeFd();
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            $this->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($this->_zip_fd);
@@ -2947,12 +2947,12 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir_to_add = array();
-      $v_result = $p_archive_to_add->_readEndCentralDir($v_central_dir_to_add);
-      if ($v_result != 1) {
-          $this->_closeFd();
-          $p_archive_to_add->_closeFd();
-          return $v_result;
-      }
+        $v_result = $p_archive_to_add->_readEndCentralDir($v_central_dir_to_add);
+        if ($v_result != 1) {
+            $this->_closeFd();
+            $p_archive_to_add->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($p_archive_to_add->_zip_fd);
@@ -2965,8 +2965,8 @@ 
         $this->_closeFd();
         $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');
+                        'Unable to open temporary file \''
+                        .$v_zip_temp_name.'\' in binary write mode');
         return Archive_Zip::errorCode();
     }
 
@@ -2974,46 +2974,46 @@ 
     // TBC : Here I should better append the file and go back to erase the
     // central dir
     $v_size = $v_central_dir['offset'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = fread($this->_zip_fd, $v_read_size);
-          @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = fread($this->_zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Copy the files from the archive_to_add into the temporary file
     $v_size = $v_central_dir_to_add['offset'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = fread($p_archive_to_add->_zip_fd, $v_read_size);
-          @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = fread($p_archive_to_add->_zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($v_zip_temp_fd);
 
     // ----- Copy the block of file headers from the old archive
     $v_size = $v_central_dir['size'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = @fread($this->_zip_fd, $v_read_size);
-          @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = @fread($this->_zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Copy the block of file headers from the archive_to_add
     $v_size = $v_central_dir_to_add['size'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = @fread($p_archive_to_add->_zip_fd, $v_read_size);
-          @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = @fread($p_archive_to_add->_zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Zip file comment
     // TBC : I should merge the two comments
@@ -3026,8 +3026,8 @@ 
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
     // the following methods on the temporary fil and not the real archive fd
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Create the central dir footer
     if (($v_result = $this->_writeCentralHeader($v_central_dir['entries']
@@ -3039,21 +3039,21 @@ 
         @fclose($v_zip_temp_fd);
         $this->_zip_fd = null;
 
-      // ----- Reset the file list
-      unset($v_header_list);
+        // ----- Reset the file list
+        unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
+        // ----- Return
+        return $v_result;
     }
 
     // ----- Swap back the file descriptor
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Close
     $this->_closeFd();
-      $p_archive_to_add->_closeFd();
+        $p_archive_to_add->_closeFd();
 
     // ----- Close the temporary file
     @fclose($v_zip_temp_fd);
@@ -3069,47 +3069,47 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _duplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_duplicate()
-  *
-  * { Description }
-  *
-  */
-  public function _duplicate($p_archive_filename)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _duplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_duplicate()
+     *
+     * { Description }
+     *
+     */
+    public function _duplicate($p_archive_filename)
+    {
+        $v_result=1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename)) {
 
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
+        // ----- Nothing to duplicate, so duplicate is a success.
+        $v_result = 1;
 
-      // ----- Return
-      return $v_result;
+        // ----- Return
+        return $v_result;
     }
 
     // ----- Open the zip file
     if (($v_result=$this->_openFd('wb')) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
     // ----- Open the temporary file in write mode
     if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
         $this->_closeFd();
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open archive file \''
-                       .$p_archive_filename.'\' in binary write mode');
+                        'Unable to open archive file \''
+                        .$p_archive_filename.'\' in binary write mode');
         return Archive_Zip::errorCode();
     }
 
@@ -3117,13 +3117,13 @@ 
     // TBC : Here I should better append the file and go back to erase the
     // central dir
     $v_size = filesize($p_archive_filename);
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-          $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-          @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
-          $v_size -= $v_read_size;
-      }
+            $v_buffer = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Close
     $this->_closeFd();
@@ -3131,25 +3131,25 @@ 
     // ----- Close the temporary file
     @fclose($v_zip_temp_fd);
 
-      return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  /**
-  * Archive_Zip::_check_parameters()
-  *
-  * { Description }
-  *
-  * @param integer $p_error_code
-  * @param string $p_error_string
-  */
-  public function _check_parameters(&$p_params, $p_default)
-  {
+        return $v_result;
+    }
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Archive_Zip::_check_parameters()
+     *
+     * { Description }
+     *
+     * @param integer $p_error_code
+     * @param string $p_error_string
+     */
+    public function _check_parameters(&$p_params, $p_default)
+    {
 
     // ----- Check that param is an array
     if (!is_array($p_params)) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-                         'Unsupported parameter, waiting for an array');
+                            'Unsupported parameter, waiting for an array');
         return Archive_Zip::errorCode();
     }
 
@@ -3157,7 +3157,7 @@ 
     for (reset($p_params); list($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.'\'');
+                                'Unsupported parameter with key \''.$v_key.'\'');
 
             return Archive_Zip::errorCode();
         }
@@ -3172,170 +3172,170 @@ 
 
     // ----- 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];
-          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."'");
-                  return Archive_Zip::errorCode();
-              }
-          }
-      }
-
-      return 1;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _errorLog()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_errorLog()
-  *
-  * { Description }
-  *
-  * @param integer $p_error_code
-  * @param string $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;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _errorReset()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_errorReset()
-  *
-  * { Description }
-  *
-  */
-  public function _errorReset()
-  {
-      $this->_error_code = 1;
-      $this->_error_string = '';
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_PathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_PathReduction()
-  *
-  * { Description }
-  *
-  */
-  public function _tool_PathReduction($p_dir)
-  {
-      $v_result = '';
+                                'callback_pre_extract', 'callback_post_extract');
+        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,
+                                    "Callback '".$p_params[$v_key]
+                                    ."()' is not an existing function for "
+                                    ."parameter '".$v_key."'");
+                    return Archive_Zip::errorCode();
+                }
+            }
+        }
+
+        return 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _errorLog()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_errorLog()
+     *
+     * { Description }
+     *
+     * @param integer $p_error_code
+     * @param string $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;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _errorReset()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_errorReset()
+     *
+     * { Description }
+     *
+     */
+    public function _errorReset()
+    {
+        $this->_error_code = 1;
+        $this->_error_string = '';
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_PathReduction()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_PathReduction()
+     *
+     * { Description }
+     *
+     */
+    public function _tool_PathReduction($p_dir)
+    {
+        $v_result = '';
 
     // ----- Look for not empty path
     if ($p_dir != '') {
         // ----- Explode path by directory names
-      $v_list = explode('/', $p_dir);
+        $v_list = explode('/', $p_dir);
 
-      // ----- Study directories from last to first
-      for ($i= count($v_list) - 1; $i >= 0; $i--) {
-          // ----- Look for current path
+        // ----- Study directories from last to first
+        for ($i= count($v_list) - 1; $i >= 0; $i--) {
+            // ----- Look for current path
         if ($v_list[$i] == '.') {
             // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
+            // Should be the first $i=0, but no check is done
         } elseif ($v_list[$i] == '..') {
             // ----- Ignore it and ignore the $i-1
-          $i--;
+            $i--;
         } elseif (($v_list[$i] == '') && ($i != (count($v_list) - 1)) && ($i != 0)) {
             // ----- Ignore only the double '//' in path,
-          // but not the first and last '/'
+            // but not the first and last '/'
         } else {
             $v_result = $v_list[$i].($i!=(count($v_list) - 1)? '/' . $v_result: '');
         }
-      }
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_PathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_PathInclusion()
-  *
-  * { Description }
-  *
-  */
-  public function _tool_PathInclusion($p_dir, $p_path)
-  {
-      $v_result = 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_PathInclusion()
+    // Description :
+    //   This function indicates if the path $p_path is under the $p_dir tree. Or,
+    //   said in an other way, if the file or sub-dir $p_path is inside the dir
+    //   $p_dir.
+    //   The function indicates also if the path is exactly the same as the dir.
+    //   This function supports path with duplicated '/' like '//', but does not
+    //   support '.' or '..' statements.
+    // Parameters :
+    // Return Values :
+    //   0 if $p_path is not inside directory $p_dir
+    //   1 if $p_path is inside directory $p_dir
+    //   2 if $p_path is exactly the same as $p_dir
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_PathInclusion()
+     *
+     * { Description }
+     *
+     */
+    public function _tool_PathInclusion($p_dir, $p_path)
+    {
+        $v_result = 1;
 
     // ----- Explode dir and path by directory separator
     $v_list_dir = explode('/', $p_dir);
-      $v_list_dir_size = count($v_list_dir);
-      $v_list_path = explode('/', $p_path);
-      $v_list_path_size = count($v_list_path);
+        $v_list_dir_size = count($v_list_dir);
+        $v_list_path = explode('/', $p_path);
+        $v_list_path_size = count($v_list_path);
 
     // ----- Study directories paths
     $i = 0;
-      $j = 0;
-      while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && $v_result) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-          $i++;
-          continue;
-      }
-          if ($v_list_path[$j] == '') {
-              $j++;
-              continue;
-          }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j])
+        $j = 0;
+        while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && $v_result) {
+
+        // ----- Look for empty dir (path reduction)
+        if ($v_list_dir[$i] == '') {
+            $i++;
+            continue;
+        }
+            if ($v_list_path[$j] == '') {
+                $j++;
+                continue;
+            }
+
+        // ----- Compare the items
+        if (($v_list_dir[$i] != $v_list_path[$j])
           && ($v_list_dir[$i] != '')
           && ($v_list_path[$j] != '')) {
-          $v_result = 0;
-      }
+            $v_result = 0;
+        }
 
-      // ----- Next items
-      $i++;
-          $j++;
-      }
+        // ----- Next items
+        $i++;
+            $j++;
+        }
 
     // ----- Look if everything seems to be the same
     if ($v_result) {
         // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
-          $j++;
-      }
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
         while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
             $i++;
         }
@@ -3351,142 +3351,142 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_CopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_CopyBlock()
-  *
-  * { Description }
-  *
-  * @param integer $p_mode
-  */
-  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-      $v_result = 1;
-
-      if ($p_mode==0) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_CopyBlock()
+    // Description :
+    // Parameters :
+    //   $p_mode : read/write compression mode
+    //             0 : src & dest normal
+    //             1 : src gzip, dest normal
+    //             2 : src normal, dest gzip
+    //             3 : src & dest gzip
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_CopyBlock()
+     *
+     * { Description }
+     *
+     * @param integer $p_mode
+     */
+    public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+    {
+        $v_result = 1;
+
+        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);
-              $v_buffer = @fread($p_src, $v_read_size);
-              @fwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      } elseif ($p_mode==1) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+                $v_buffer = @fread($p_src, $v_read_size);
+                @fwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        } 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);
-              $v_buffer = @gzread($p_src, $v_read_size);
-              @fwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      } elseif ($p_mode==2) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+                $v_buffer = @gzread($p_src, $v_read_size);
+                @fwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        } 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);
-              $v_buffer = @fread($p_src, $v_read_size);
-              @gzwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      } elseif ($p_mode==3) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+                $v_buffer = @fread($p_src, $v_read_size);
+                @gzwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        } 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);
-              $v_buffer = @gzread($p_src, $v_read_size);
-              @gzwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      }
+                $v_buffer = @gzread($p_src, $v_read_size);
+                @gzwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_Rename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_Rename()
-  *
-  * { Description }
-  *
-  */
-  public function _tool_Rename($p_src, $p_dest)
-  {
-      $v_result = 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_Rename()
+    // Description :
+    //   This function tries to do a simple rename() function. If it fails, it
+    //   tries to copy the $p_src file in a new $p_dest file and then unlink the
+    //   first one.
+    // Parameters :
+    //   $p_src : Old filename
+    //   $p_dest : New filename
+    // Return Values :
+    //   1 on success, 0 on failure.
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_Rename()
+     *
+     * { Description }
+     *
+     */
+    public function _tool_Rename($p_src, $p_dest)
+    {
+        $v_result = 1;
 
     // ----- Try to rename the files
     if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-          $v_result = 0;
-      } elseif (!@unlink($p_src)) {
-          $v_result = 0;
-      }
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_TranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_TranslateWinPath()
-  *
-  * { Description }
-  *
-  * @param [type] $p_remove_disk_letter
-  */
-  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
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_TranslateWinPath()
+    // Description :
+    //   Translate windows path by replacing '\' by '/' and optionally removing
+    //   drive letter.
+    // Parameters :
+    //   $p_path : path to translate.
+    //   $p_remove_disk_letter : true | false
+    // Return Values :
+    //   The path translated.
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_TranslateWinPath()
+     *
+     * { Description }
+     *
+     * @param [type] $p_remove_disk_letter
+     */
+    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);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-      }
-      return $p_path;
-  }
-  // ---------------------------------------------------------------------------
+            $p_path = substr($p_path, $v_position+1);
+        }
+        // ----- Change potential windows directory separator
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+            $p_path = strtr($p_path, '\\', '/');
+        }
+        }
+        return $p_path;
+    }
+    // ---------------------------------------------------------------------------
 }
-  // End of class
+    // End of class
 

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/mygrouppermform.php

Doc Comments +10 added lines

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

Indentation +2 added lines, -2 removed lines

@@ -359,7 +359,7 @@ 
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
         $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
-                 . $option['id'] . "]\" onclick=\"";
+                    . $option['id'] . "]\" onclick=\"";
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
@@ -380,7 +380,7 @@ 
             $tree .= ' checked="checked"';
         }
         $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
+                    . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

Spacing +28 added lines, -28 removed lines

@@ -29,8 +29,8 @@ 
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
@@ -60,7 +60,7 @@ 
      * Tree structure of items
      * @var array
      */
-    public $_itemTree = array() ;
+    public $_itemTree = array();
     /**
      * Name of permission
      * @var string
@@ -75,7 +75,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -115,7 +115,7 @@ 
      */
     public function addAppendix($permName, $itemId, $itemName)
     {
-        $this->_appendix[] = array('permname'=>$permName,'itemid'=>$itemId,'itemname'=>$itemName,'selected'=>false);
+        $this->_appendix[] = array('permname'=>$permName, 'itemid'=>$itemId, 'itemname'=>$itemName, 'selected'=>false);
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function render()
     {
-        global $xoopsGTicket ;
+        global $xoopsGTicket;
 
         // load all child ids for javascript codes
         foreach (array_keys($this->_itemTree) as $item_id) {
@@ -166,11 +166,11 @@ 
             $ele->setOptionTree($this->_itemTree);
 
             // GIJ start
-            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">') ;
+            $ele->setDescription('<input type="checkbox" onclick="with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].name.match(/^perms\[(module_admin|module_read|block_read)\]\[groups\]\['.$i.'\]/)){elements[i].checked=this.checked;}}};">');
             // GIJ_end
 
             foreach ($this->_appendix as $key => $append) {
-                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid) ;
+                $this->_appendix[$key]['selected'] = $gperm_handler->checkRight($append['permname'], $append['itemid'], $i, $this->_modid);
             }
             $ele->setAppendix($this->_appendix);
             $this->addElement($ele);
@@ -180,11 +180,11 @@ 
         // GIJ start
         $jstray = new XoopsFormElementTray(' &nbsp; ');
         $jsuncheckbutton = new XoopsFormButton('', 'none', _NONE, 'button');
-        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"") ;
+        $jsuncheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=false;}}}\"");
         $jscheckbutton = new XoopsFormButton('', 'all', _ALL, 'button');
-        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"") ;
-        $jstray->addElement($jsuncheckbutton) ;
-        $jstray->addElement($jscheckbutton) ;
+        $jscheckbutton->setExtra("onclick=\"with(document.groupperm_form){for(i=0;i<length;i++){if(elements[i].type=='checkbox' && (elements[i].name.indexOf('module_admin')<0 || elements[i].name.indexOf('[groups][1]')>=0)){elements[i].checked=true;}}}\"");
+        $jstray->addElement($jsuncheckbutton);
+        $jstray->addElement($jscheckbutton);
         $this->addElement($jstray);
         // GIJ end
 
@@ -195,7 +195,7 @@ 
 
         $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
         $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $elements =& $this->getElements();
+        $elements = & $this->getElements();
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
@@ -211,7 +211,7 @@ 
                 $ret .= $elements[$i]->render();
             }
         }
-        $ret .= '</table>' . $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin') . '</form>';
+        $ret .= '</table>'.$xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin').'</form>';
         return $ret;
     }
 }
@@ -247,7 +247,7 @@ 
      * Appendix
      * @var array ('permname'=>,'itemid'=>,'itemname'=>,'selected'=>)
      */
-    public $_appendix = array() ;
+    public $_appendix = array();
 
     /**
      * Constructor
@@ -287,7 +287,7 @@ 
      */
     public function setOptionTree(&$optionTree)
     {
-        $this->_optionTree =& $optionTree;
+        $this->_optionTree = & $optionTree;
     }
 
     /**
@@ -297,7 +297,7 @@ 
      */
     public function setAppendix($appendix)
     {
-        $this->_appendix = $appendix ;
+        $this->_appendix = $appendix;
     }
 
     /**
@@ -308,7 +308,7 @@ 
      */
     public function render()
     {
-        $ret = '' ;
+        $ret = '';
 
         if (count($this->_appendix) > 0) {
             $ret .= '<table class="outer"><tr>';
@@ -318,11 +318,11 @@ 
                     $ret .= '</tr><tr>';
                     $cols = 1;
                 }
-                $checked = $append['selected'] ? 'checked="checked"' : '' ;
-                $name = 'perms['.$append['permname'].']' ;
-                $itemid = $append['itemid'] ;
-                $itemid = $append['itemid'] ;
-                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>" ;
+                $checked = $append['selected'] ? 'checked="checked"' : '';
+                $name = 'perms['.$append['permname'].']';
+                $itemid = $append['itemid'];
+                $itemid = $append['itemid'];
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>";
                 $cols++;
             }
             $ret .= '</tr></table>';
@@ -330,7 +330,7 @@ 
 
         $ret .= '<table class="outer"><tr>';
         $cols = 1;
-        if (! empty($this->_optionTree[0]['children'])) {
+        if (!empty($this->_optionTree[0]['children'])) {
             foreach ($this->_optionTree[0]['children'] as $topitem) {
                 if ($cols > 4) {
                     $ret .= '</tr><tr>';
@@ -358,8 +358,8 @@ 
      */
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
-        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . ']['
-                 . $option['id'] . "]\" onclick=\"";
+        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" id=\"".$this->getName().'[groups]['.$this->_groupId.']['
+                 . $option['id']."]\" onclick=\"";
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
@@ -379,8 +379,8 @@ 
         if (isset($this->_value) && in_array($option['id'], $this->_value)) {
             $tree .= ' checked="checked"';
         }
-        $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname]['
-                 . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
+        $tree .= ' />'.$option['name']."<input type=\"hidden\" name=\"".$this->getName().'[parents]['.$option['id']."]\" value=\"".implode(':', $parentIds)."\" /><input type=\"hidden\" name=\"".$this->getName().'[itemname]['
+                 . $option['id']."]\" value=\"".htmlspecialchars($option['name'])."\" /><br />\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);