mambax7 / altsys

xoops_trust_path/libs/altsys/class/MyBlocksAdminForX25.class.php

Spacing +103 added lines, -103 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForX25 extends MyBlocksAdmin
 {
@@ -12,9 +12,9 @@ 
 
     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';
     }
 
 //HACK by domifara for php5.3+
@@ -24,7 +24,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForX25();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -40,7 +40,7 @@ 
     $sseln = $ssel0 = $ssel1 = $ssel3 = $ssel4 = $ssel5 = $ssel7 = $ssel8 = $ssel9 = '';
     $scoln = $scol0 = $scol1 = $scol3 = $scol4 = $scol5 = $scol7 = $scol8 = $scol9 = 'unselected';
     $stextbox = 'unselected';
-    $value4extra_side = '' ;
+    $value4extra_side = '';
 
     if ($visible != 1) {
         $sseln = " checked='checked'";
@@ -50,39 +50,39 @@ 
         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 :
             $ssel3 = " checked='checked'";
             $scol3 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_RIGHT :
             $ssel4 = " checked='checked'";
             $scol4 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_CENTER :
             $ssel5 = " checked='checked'";
             $scol5 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOMLEFT :
             $ssel7 = " checked='checked'";
             $scol7 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOMRIGHT :
             $ssel8 = " checked='checked'";
             $scol8 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_BOTTOM :
             $ssel9 = " checked='checked'";
             $scol9 = 'selected';
-            break ;
+            break;
         default :
-            $value4extra_side = $side ;
+            $value4extra_side = $side;
             $stextbox = 'selected';
-            break ;
+            break;
     }
     }
 
@@ -143,7 +143,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>
 			</td>
 		</tr>
 	</table>
@@ -155,53 +155,53 @@ 
         $bid = (int)$bid;
 
 //HACK by domifara
-    $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
 /*
@@ -210,41 +210,41 @@ 
     }
 */
     $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();
 //dhtml
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-        if ($block_data['ctype']=='H' || empty($block_data['ctype'])) {
-            $editor_configs=array();
+        if ($block_data['ctype'] == 'H' || empty($block_data['ctype'])) {
+            $editor_configs = array();
             $editor_configs['name']   = 'content_block';
             $editor_configs['value']  = $block_data['content'];
             $editor_configs['rows']   = 20;
@@ -254,12 +254,12 @@ 
             $editor_configs['editor'] = xoops_getModuleOption('blocks_editor', 'system');
             $form                     = new XoopsFormEditor('', 'textarea_content', $editor_configs);
             $rendered = $form->render();
-            $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ;
+            $tpl->assign('altsys_x25_dhtmltextarea', $rendered);
         } else {
             $form = new XoopsFormDhtmlTextArea('', 'textarea_content', $block_data['content'], 80, 20);
             $rendered = $form->render();
-            $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array( '<textarea', '</textarea><br />' ), array( '</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">' ), $rendered) . '</div>' ;
-            $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ;
+            $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array('<textarea', '</textarea><br />'), array('</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">'), $rendered).'</div>';
+            $tpl->assign('altsys_x25_dhtmltextarea', $rendered);
         }
 
         $tpl->assign(array(
@@ -274,91 +274,91 @@ 
         'submit_button' => $button_value,
         'common_fck_installed' => file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'),
         'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
+    ));
 //HACK by domifara
-    $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html') ;
+    $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html');
 
-        return ;
+        return;
     }
     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['textarea_content']) ,
-        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) ,
+        'visible' => $visible,
+        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]),
+        'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']),
+        '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()
-    ) ;
+    );
     }
 
     public function previewContent($block_data)
     {
         $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);
 
         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) ;
+        restore_error_handler();
+        $original_level = error_reporting(E_ALL);
 
 //	$ret = $block->getContent( 'S' , $block_data['ctype'] ) ;
 
     $c_type = $block_data['ctype'];
         if ($c_type == 'H') {
-            $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
         } elseif ($c_type == 'P') {
             ob_start();
             echo eval($block->getVar('content', 'N'));
             $content = ob_get_contents();
             ob_end_clean();
-            $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+            $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
         } elseif ($c_type == 'S') {
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
             $ret = $myts->displayTarea($content, 1, 1);
         } else {
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N'));
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N'));
             $ret = $myts->displayTarea($content, 1, 0);
         }
 
-        error_reporting($original_level) ;
+        error_reporting($original_level);
 
-        return $ret ;
+        return $ret;
     }
 }

xoops_trust_path/libs/altsys/mylangadmin.php

Spacing +114 added lines, -114 removed lines

@@ -5,170 +5,170 @@ 
 //                       GIJOE <http://www.peak.ne.jp/>                      //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__.'/include/lang_functions.php' ;
-include_once __DIR__.'/class/D3LanguageManager.class.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/lang_functions.php';
+include_once __DIR__.'/class/D3LanguageManager.class.php';
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler = xoops_gethandler('module') ;
-$module =& $module_handler->getByDirname('altsys') ;
-if (! is_object($module)) {
-    die('install altsys') ;
+$module_handler = xoops_gethandler('module');
+$module = & $module_handler->getByDirname('altsys');
+if (!is_object($module)) {
+    die('install altsys');
 }
-$moduleperm_handler = xoops_gethandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$moduleperm_handler = xoops_gethandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 
 // initials
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
-$langman =& D3LanguageManager::getInstance() ;
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+$langman = & D3LanguageManager::getInstance();
 
 // language file of this controller
-altsys_include_language_file('mylangadmin') ;
+altsys_include_language_file('mylangadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // 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 (! empty($target_module) && is_object($target_module)) {
+if (!empty($target_module) && is_object($target_module)) {
     // specified by dirname (for langadmin as an independent module)
-    $target_mid = $target_module->getVar('mid') ;
-    $target_dirname = $target_module->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $target_module->getVar('name') . '&nbsp;' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
+    $target_mid = $target_module->getVar('mid');
+    $target_dirname = $target_module->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $target_module->getVar('name').'&nbsp;'.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
     //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } else {
     // not specified by dirname (for 3rd party modules as mylangadmin)
-    $target_mid = $xoopsModule->getVar('mid') ;
-    $target_dirname = $xoopsModule->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $xoopsModule->getVar('name') ;
+    $target_mid = $xoopsModule->getVar('mid');
+    $target_dirname = $xoopsModule->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $xoopsModule->getVar('name');
     //$query4redirect = '' ;
 }
 
 // basic GET variables
-$target_lang = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['target_lang']) ;
+$target_lang = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['target_lang']);
 if (empty($target_lang)) {
-    $target_lang = $GLOBALS['xoopsConfig']['language'] ;
+    $target_lang = $GLOBALS['xoopsConfig']['language'];
 }
-$target_lang4sql = addslashes($target_lang) ;
-$target_file = preg_replace('/[^0-9a-zA-Z_.-]/', '', @$_GET['target_file']) ;
+$target_lang4sql = addslashes($target_lang);
+$target_file = preg_replace('/[^0-9a-zA-Z_.-]/', '', @$_GET['target_file']);
 if (empty($target_file)) {
-    $target_file = 'main.php' ;
+    $target_file = 'main.php';
 }
 
 // get $target_trustdirname
-$mytrustdirname = '' ;
+$mytrustdirname = '';
 if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php')) {
-    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php' ;
+    require XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/mytrustdirname.php';
 }
-$target_trustdirname = $mytrustdirname ;
+$target_trustdirname = $mytrustdirname;
 
 // get base directory
 if (empty($target_trustdirname)) {
     // conventinal module
-    $base_dir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language' ;
+    $base_dir = XOOPS_ROOT_PATH.'/modules/'.$target_dirname.'/language';
 } else {
     // D3 module
-    $base_dir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language' ;
+    $base_dir = XOOPS_TRUST_PATH.'/modules/'.$target_trustdirname.'/language';
 }
 
 // make list of language and check $target_lang
-$languages = array() ;
-$languages4disp = array() ;
-if (! is_dir($base_dir)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODNOLANGUAGE) ;
+$languages = array();
+$languages4disp = array();
+if (!is_dir($base_dir)) {
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODNOLANGUAGE);
 }
-$dh = opendir($base_dir) ;
+$dh = opendir($base_dir);
 if ($dh) {
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if (is_dir("$base_dir/$file")) {
-            list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='" . addslashes($file) . "'")) ;
-            $languages[] = $file ;
-            $languages4disp[] = $file . " ($count)" ;
+            list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='".addslashes($file)."'"));
+            $languages[] = $file;
+            $languages4disp[] = $file." ($count)";
         }
     }
 }
-closedir($dh) ;
-if (! in_array($target_lang, $languages)) {
-    $target_lang = $languages[0] ;
+closedir($dh);
+if (!in_array($target_lang, $languages)) {
+    $target_lang = $languages[0];
 }
 
 // get base directory seleced language
-$lang_base_dir = $base_dir.'/'.$target_lang ;
-if (! is_dir($lang_base_dir)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE) ;
+$lang_base_dir = $base_dir.'/'.$target_lang;
+if (!is_dir($lang_base_dir)) {
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODLANGINCOMPATIBLE);
 }
 
 // make list of files and check $target_file
-$lang_files = array() ;
-$dh = opendir($lang_base_dir) ;
+$lang_files = array();
+$dh = opendir($lang_base_dir);
 if ($dh) {
     while ($file = readdir($dh)) {
         if (substr($file, 0, 1) == '.') {
-            continue ;
+            continue;
         }
         if ($file == 'index.html') {
-            continue ;
+            continue;
         }
     //if( $file == 'modinfo.php' ) continue ; // TODO(?)
     //if( $file == 'global.php' ) continue ; // TODO(?)
     if (is_file("$lang_base_dir/$file")) {
-        $lang_files[] = $file ;
+        $lang_files[] = $file;
     }
     }
 }
-closedir($dh) ;
+closedir($dh);
 if (empty($lang_files)) {
-    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODEMPTYLANGDIR) ;
+    altsys_mylangadmin_errordie($target_mname, _MYLANGADMIN_ERR_MODEMPTYLANGDIR);
 }
-if (! in_array($target_file, $lang_files)) {
-    $target_file = $lang_files[0] ;
+if (!in_array($target_file, $lang_files)) {
+    $target_file = $lang_files[0];
 }
 
 // get unique path of language_file
-$langfile_unique_path = "$lang_base_dir/$target_file" ;
+$langfile_unique_path = "$lang_base_dir/$target_file";
 
 // get constants defined by the target_file
-list($langfile_names, $constpref, $already_read) = altsys_mylangadmin_get_constant_names($langfile_unique_path, $target_dirname) ;
+list($langfile_names, $constpref, $already_read) = altsys_mylangadmin_get_constant_names($langfile_unique_path, $target_dirname);
 
 // get user_values should be overridden
-$langfile_constants = array() ;
+$langfile_constants = array();
 foreach ($langfile_names as $name) {
-    list($value) = $db->fetchRow($db->query('SELECT value FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='$target_lang4sql' AND name='" . addslashes($name) . "'")) ;
-    $langfile_constants[ $name ] = $value ;
+    list($value) = $db->fetchRow($db->query('SELECT value FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'"));
+    $langfile_constants[$name] = $value;
 }
 
 // constants defined in XOOPS_ROOT_PATH/my_language/(dirname)/...
 if ($langman->my_language) {
-    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file ;
-    $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path)) ;
+    $mylang_unique_path = $langman->my_language.'/modules/'.$target_dirname.'/'.$target_lang.'/'.$target_file;
+    $mylang_constants = array_map('htmlspecialchars', altsys_mylangadmin_get_constants_by_pcre($mylang_unique_path));
     foreach ($mylang_constants as $key => $val) {
-        if (! in_array($key, array_keys($langfile_constants))) {
-            $langfile_constants[ $key ] = null ;
-            define($key, _MYLANGADMIN_NOTE_ADDEDBYMYLANG) ;
+        if (!in_array($key, array_keys($langfile_constants))) {
+            $langfile_constants[$key] = null;
+            define($key, _MYLANGADMIN_NOTE_ADDEDBYMYLANG);
         }
     }
 } else {
-    $mylang_unique_path = '' ;
-    $mylang_constants = array() ;
+    $mylang_unique_path = '';
+    $mylang_constants = array();
 }
 
 
@@ -177,57 +177,57 @@ 
 //
 
 // Update language table and cache file
-if (! empty($_POST['do_update'])) {
+if (!empty($_POST['do_update'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check(true, 'altsys')) {
+    if (!$xoopsGTicket->check(true, 'altsys')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     // read original file
-    $file_contents = file_get_contents($langfile_unique_path) ;
+    $file_contents = file_get_contents($langfile_unique_path);
 
     // insert fingerprint of langfile_unique_path
-    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path) ;
-    $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents) ;
+    $langfile_fingerprint = '_MYLANGADMIN_'.md5($langfile_unique_path);
+    $file_contents = str_replace('<?php', "<?php\nif(!defined('$langfile_fingerprint'))define('$langfile_fingerprint',1);", $file_contents);
 
     // constants loop
-    $overrides_counter = 0 ;
+    $overrides_counter = 0;
     foreach (array_reverse($langfile_names) as $name) {
-        $user_value = $myts->stripSlashesGPC(@$_POST[$name]) ;
-        $db->query('DELETE FROM ' . $db->prefix('altsys_language_constants') . " WHERE mid=$target_mid AND language='$target_lang4sql' AND name='" . addslashes($name) . "'") ;
+        $user_value = $myts->stripSlashesGPC(@$_POST[$name]);
+        $db->query('DELETE FROM '.$db->prefix('altsys_language_constants')." WHERE mid=$target_mid AND language='$target_lang4sql' AND name='".addslashes($name)."'");
         if ($user_value !== '') {
-            $overrides_counter ++ ;
+            $overrides_counter++;
             // Update table
-            $db->query('INSERT INTO ' . $db->prefix('altsys_language_constants') . " (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','" . addslashes($name) . "','" . addslashes($user_value) . "')") ;
+            $db->query('INSERT INTO '.$db->prefix('altsys_language_constants')." (mid,language,name,value) VALUES ($target_mid,'$target_lang4sql','".addslashes($name)."','".addslashes($user_value)."')");
             // rewrite script for cache
             // comment-out the line of define()
             if (empty($constpref)) {
-                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/' ;
+                $from = '/.*define\s?\(\s*(["\'])'.preg_quote($name).'(\\1).*\;.*/';
             } else {
-                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(substr($name, strlen($constpref))).'(\\1).*\;.*/' ;
+                $from = '/.*define\s?\(\s*\$constpref\s*\.\s*(["\'])'.preg_quote(substr($name, strlen($constpref))).'(\\1).*\;.*/';
             }
-            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');" ;
-            $file_contents = preg_replace($from, $to, $file_contents) ;
+            $to = '//$0'."\ndefine('".addslashes($name)."','".addslashes($user_value)."');";
+            $file_contents = preg_replace($from, $to, $file_contents);
         }
     }
 
     // get the file name for caching
-    $cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang) ;
+    $cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang);
 
     // Create language cache file
     if ($overrides_counter > 0) {
-        $fp = fopen($cache_file_name, 'wb') ;
-        if (! $fp) {
-            die('Invalid Cache Directory. (Set XOOPS_TRUST_PATH/cache writable)') ;
+        $fp = fopen($cache_file_name, 'wb');
+        if (!$fp) {
+            die('Invalid Cache Directory. (Set XOOPS_TRUST_PATH/cache writable)');
         }
-        fwrite($fp, $file_contents) ;
-        fclose($fp) ;
+        fwrite($fp, $file_contents);
+        fclose($fp);
     } else {
-        unlink($cache_file_name) ;
+        unlink($cache_file_name);
     }
 
-    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED) ;
-    exit ;
+    redirect_header('?mode=admin&lib=altsys&page=mylangadmin&dirname='.$target_dirname.'&target_lang='.rawurlencode($target_lang).'&target_file='.rawurlencode($target_file), 1, _MYLANGADMIN_CACHEUPDATED);
+    exit;
 }
 
 
@@ -236,22 +236,22 @@ 
 //
 
 // check cache file
-$cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang) ;
-$cache_file_mtime = file_exists($cache_file_name) ? filemtime($cache_file_name) : 0 ;
+$cache_file_name = $langman->getCacheFileName($target_file, $target_dirname, $target_lang);
+$cache_file_mtime = file_exists($cache_file_name) ? filemtime($cache_file_name) : 0;
 
 // check core version and generate message to enable D3LanguageManager
 if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
     // XoopsCube Legacy without preload
     if (class_exists('AltsysLangMgr_LanguageManager')) {
         // the preload enabled
-        $notice4disp = _MYLANGADMIN_MSG_D3LANGMANENABLED ;
+        $notice4disp = _MYLANGADMIN_MSG_D3LANGMANENABLED;
     } else {
         // the preload disabled
-        $notice4disp = sprintf(_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL, 'SetupAltsysLangMgr.class.php', 'XOOPS_ROOT_PATH/preload') ;
+        $notice4disp = sprintf(_MYLANGADMIN_FMT_HOWTOENABLED3LANGMAN4XCL, 'SetupAltsysLangMgr.class.php', 'XOOPS_ROOT_PATH/preload');
     }
 } else {
     // X2 core etc.
-    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />' ;
+    $notice4disp = _MYLANGADMIN_MSG_HOWTOENABLED3LANGMAN4X2.'<br />';
     $notice4disp .= '
 		<h4>include/common.php</h4>
 		<pre>
@@ -275,20 +275,20 @@ 
 //
 
 
-xoops_cp_header() ;
+xoops_cp_header();
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
 // breadcrumbs
-$breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+$breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
 if ($breadcrumbsObj->hasPaths()) {
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN) ;
-    $breadcrumbsObj->appendPath('', $target_mname) ;
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mylangadmin', _MI_ALTSYS_MENU_MYLANGADMIN);
+    $breadcrumbsObj->appendPath('', $target_mname);
 }
 
-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_dirname' => $target_dirname,
     'target_mname' => $target_mname,
@@ -307,8 +307,8 @@ 
     'notice' => $notice4disp,
     'already_read' => $already_read,
     'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'altsys')
-)) ;
-$tpl->display('db:altsys_main_mylangadmin.html') ;
+));
+$tpl->display('db:altsys_main_mylangadmin.html');
 
-xoops_cp_footer() ;
-exit ;
+xoops_cp_footer();
+exit;

xoops_trust_path/libs/altsys/include/adminmenu_functions.php

Spacing +132 added lines, -132 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-require_once dirname(__DIR__).'/class/altsysUtils.class.php' ;
+require_once dirname(__DIR__).'/class/altsysUtils.class.php';
 
-define('ALTSYS_ADMINMENU_FILE', XOOPS_CACHE_PATH.'/adminmenu.php') ;
-define('ALTSYS_ADMINMENU_HACK_NONE', 0) ;
-define('ALTSYS_ADMINMENU_HACK_2COL', 1) ;
-define('ALTSYS_ADMINMENU_HACK_NOIMG', 2) ;
-define('ALTSYS_ADMINMENU_HACK_XCSTY', 3) ;
+define('ALTSYS_ADMINMENU_FILE', XOOPS_CACHE_PATH.'/adminmenu.php');
+define('ALTSYS_ADMINMENU_HACK_NONE', 0);
+define('ALTSYS_ADMINMENU_HACK_2COL', 1);
+define('ALTSYS_ADMINMENU_HACK_NOIMG', 2);
+define('ALTSYS_ADMINMENU_HACK_XCSTY', 3);
 
 
 //
@@ -13,73 +13,73 @@ 
 //
 function altsys_adminmenu_insert_mymenu(&$module)
 {
-    global $altsysModuleConfig ;
+    global $altsysModuleConfig;
 
     if (empty($altsysModuleConfig['adminmenu_insert_mymenu'])) {
-        return ;
+        return;
     }
 
     if (altsys_get_core_type() < ALTSYS_CORE_TYPE_ORE) {
-        altsys_adminmenu_insert_mymenu_x20($module) ;
+        altsys_adminmenu_insert_mymenu_x20($module);
     }
 }
 
 function altsys_adminmenu_insert_mymenu_x20(&$module)
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
-    $dirname = $module->getVar('dirname') ;
-    $mid = $module->getVar('mid') ;
-    $anchor = '<!-- ALTSYS ANCHOR '.$dirname.' -->' ;
+    $dirname = $module->getVar('dirname');
+    $mid = $module->getVar('mid');
+    $anchor = '<!-- ALTSYS ANCHOR '.$dirname.' -->';
 
     // fetch popup_no
     if (empty($xoops_admin_menu_ft[$mid])) {
-        return ;
+        return;
     }
-    if (! preg_match('/popUpL(\d+)/', $xoops_admin_menu_ft[$mid], $regs)) {
-        return ;
+    if (!preg_match('/popUpL(\d+)/', $xoops_admin_menu_ft[$mid], $regs)) {
+        return;
     }
     $popup_no = (int)$regs[1];
 
     // replace
-    $search  = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mid.'\'' ;
-    $replace = $anchor.'<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences\'' ;
+    $search  = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod='.$mid.'\'';
+    $replace = $anchor.'<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences\'';
 
     // do replacement
-    $new_xoops_admin_menu_dv = preg_replace('#'.preg_quote($search).'#', $replace, $xoops_admin_menu_dv) ;
+    $new_xoops_admin_menu_dv = preg_replace('#'.preg_quote($search).'#', $replace, $xoops_admin_menu_dv);
 
     if ($xoops_admin_menu_dv == $new_xoops_admin_menu_dv) {
-        return ;
+        return;
     }
-    $xoops_admin_menu_dv = $new_xoops_admin_menu_dv ;
+    $xoops_admin_menu_dv = $new_xoops_admin_menu_dv;
 
-    $insert = '' ;
+    $insert = '';
 
     // insert blocksadmin
     if ($dirname != 'altsys') {
-        $blocksadmin_title = defined('_MD_A_MYMENU_MYBLOCKSADMIN') ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin' ;
-        $insert .= '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=myblocksadmin\'>'.$blocksadmin_title.'</a><br />'."\n" ;
+        $blocksadmin_title = defined('_MD_A_MYMENU_MYBLOCKSADMIN') ? _MD_A_MYMENU_MYBLOCKSADMIN : 'blocksadmin';
+        $insert .= '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=myblocksadmin\'>'.$blocksadmin_title.'</a><br />'."\n";
     }
 
     // insert tplsadmin
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
-    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_module='$dirname'")) ;
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
+    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_module='$dirname'"));
     if ($count > 0) {
-        $tplsadmin_title = defined('_MD_A_MYMENU_MYTPLSADMIN') ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin' ;
-        $insert = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin\'>'.$tplsadmin_title.'</a><br />'."\n".$insert ;
+        $tplsadmin_title = defined('_MD_A_MYMENU_MYTPLSADMIN') ? _MD_A_MYMENU_MYTPLSADMIN : 'tplsadmin';
+        $insert = '<img src=\''.XOOPS_URL.'/images/pointer.gif\' width=\'8\' height=\'8\' alt=\'\' />&nbsp;<a href=\''.XOOPS_URL.'/modules/'.$dirname.'/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin\'>'.$tplsadmin_title.'</a><br />'."\n".$insert;
     }
 
     // do insertion
-    $xoops_admin_menu_dv = preg_replace('#'.preg_quote($anchor).'#', $anchor.$insert, $xoops_admin_menu_dv) ;
+    $xoops_admin_menu_dv = preg_replace('#'.preg_quote($anchor).'#', $anchor.$insert, $xoops_admin_menu_dv);
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked), 'altsys_adminmenu_dv_updated' => true )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => (int)(@$altsys_adminmenu_ft_hacked), 'altsys_adminmenu_dv_updated' => true));
 }
 
 //
@@ -87,184 +87,184 @@ 
 //
 function altsys_adminmenu_hack_ft()
 {
-    global $altsysModuleConfig ;
+    global $altsysModuleConfig;
 
     if (altsys_get_core_type() >= ALTSYS_CORE_TYPE_ORE) {
-        return ;
+        return;
     }
     if (empty($altsysModuleConfig['adminmenu_hack_ft'])) {
-        return ;
+        return;
     }
 
     if ($altsysModuleConfig['adminmenu_hack_ft'] == ALTSYS_ADMINMENU_HACK_2COL) {
-        altsys_adminmenu_hack_ft_2col_x20() ;
+        altsys_adminmenu_hack_ft_2col_x20();
     } elseif ($altsysModuleConfig['adminmenu_hack_ft'] == ALTSYS_ADMINMENU_HACK_NOIMG) {
-        altsys_adminmenu_hack_ft_noimg_x20() ;
+        altsys_adminmenu_hack_ft_noimg_x20();
     } elseif ($altsysModuleConfig['adminmenu_hack_ft'] == ALTSYS_ADMINMENU_HACK_XCSTY) {
-        altsys_adminmenu_hack_ft_xcsty_x20() ;
+        altsys_adminmenu_hack_ft_xcsty_x20();
     }
 }
 
 function altsys_adminmenu_hack_ft_2col_x20()
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
     // check previous hack
-    if (! empty($altsys_adminmenu_ft_hacked)) {
+    if (!empty($altsys_adminmenu_ft_hacked)) {
         if ($altsys_adminmenu_ft_hacked == ALTSYS_ADMINMENU_HACK_2COL) {
             // skip
-            return ;
+            return;
         } else {
             // rebuild adminmenu
-            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
-            xoops_module_write_admin_menu(xoops_module_get_admin_menu()) ;
+            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+            xoops_module_write_admin_menu(xoops_module_get_admin_menu());
             // backup $xoops_admin_menu_dv
-            $backup_admin_menu_dv = $xoops_admin_menu_dv ;
+            $backup_admin_menu_dv = $xoops_admin_menu_dv;
             // include new adminmenu
-            include ALTSYS_ADMINMENU_FILE ;
+            include ALTSYS_ADMINMENU_FILE;
             // restore $xoops_admin_menu_dv
-            $xoops_admin_menu_dv = $backup_admin_menu_dv ;
+            $xoops_admin_menu_dv = $backup_admin_menu_dv;
         }
     }
 
-    $search  = ' alt=\'\' /></a><br />' ;
-    $replace_fmt = ' alt="%s" /></a>' ;
+    $search  = ' alt=\'\' /></a><br />';
+    $replace_fmt = ' alt="%s" /></a>';
 
-    $is_left = true ;
-    $module_handler = xoops_gethandler('module') ;
-    $mids = array_keys($xoops_admin_menu_ft) ;
-    $last_mid = $mids[count($mids) - 1 ] ;
+    $is_left = true;
+    $module_handler = xoops_gethandler('module');
+    $mids = array_keys($xoops_admin_menu_ft);
+    $last_mid = $mids[count($mids) - 1];
     foreach ($mids as $mid) {
-        $module = $module_handler->get($mid) ;
-        $new_menu_ft = preg_replace('#'.preg_quote($search).'#', sprintf($replace_fmt, $module->getVar('name')), $xoops_admin_menu_ft[$mid]) ;
+        $module = $module_handler->get($mid);
+        $new_menu_ft = preg_replace('#'.preg_quote($search).'#', sprintf($replace_fmt, $module->getVar('name')), $xoops_admin_menu_ft[$mid]);
         if ($is_left) {
             if ($mid == $last_mid) {
-                $xoops_admin_menu_ft[$mid] = $new_menu_ft . '</td><td>' ;
+                $xoops_admin_menu_ft[$mid] = $new_menu_ft.'</td><td>';
             } else {
-                $left_body = $new_menu_ft ;
-                $left_key = $mid ;
-                $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',85);', $xoops_admin_menu_ml[$mid]) ;
+                $left_body = $new_menu_ft;
+                $left_key = $mid;
+                $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',85);', $xoops_admin_menu_ml[$mid]);
             }
         } else {
-            $xoops_admin_menu_ft[$mid] = $left_body . '</td><td>' . $new_menu_ft ;
-            unset($xoops_admin_menu_ft[$left_key]) ;
-            $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',185);', $xoops_admin_menu_ml[$mid]) ;
+            $xoops_admin_menu_ft[$mid] = $left_body.'</td><td>'.$new_menu_ft;
+            unset($xoops_admin_menu_ft[$left_key]);
+            $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',185);', $xoops_admin_menu_ml[$mid]);
         }
-        $is_left = ! $is_left ;
+        $is_left = !$is_left;
     }
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_2COL));
 }
 
 
 function altsys_adminmenu_hack_ft_noimg_x20()
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
     // check previous hack
-    if (! empty($altsys_adminmenu_ft_hacked)) {
+    if (!empty($altsys_adminmenu_ft_hacked)) {
         if ($altsys_adminmenu_ft_hacked == ALTSYS_ADMINMENU_HACK_NOIMG) {
             // skip
-            return ;
+            return;
         } else {
             // rebuild adminmenu
-            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
-            xoops_module_write_admin_menu(xoops_module_get_admin_menu()) ;
+            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+            xoops_module_write_admin_menu(xoops_module_get_admin_menu());
             // backup $xoops_admin_menu_dv
-            $backup_admin_menu_dv = $xoops_admin_menu_dv ;
+            $backup_admin_menu_dv = $xoops_admin_menu_dv;
             // include new adminmenu
-            include ALTSYS_ADMINMENU_FILE ;
+            include ALTSYS_ADMINMENU_FILE;
             // restore $xoops_admin_menu_dv
-            $xoops_admin_menu_dv = $backup_admin_menu_dv ;
+            $xoops_admin_menu_dv = $backup_admin_menu_dv;
         }
     }
 
-    $module_handler = xoops_gethandler('module') ;
-    $mids = array_keys($xoops_admin_menu_ft) ;
+    $module_handler = xoops_gethandler('module');
+    $mids = array_keys($xoops_admin_menu_ft);
     foreach ($mids as $mid) {
-        $module = $module_handler->get($mid) ;
-        $xoops_admin_menu_ft[$mid] = preg_replace('/\<img src\=.*$/', $module->getVar('name').'</a>', $xoops_admin_menu_ft[$mid]) ;
-        $xoops_admin_menu_ft[$mid] = '<div style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'">'.$xoops_admin_menu_ft[$mid].'</div>' ;
-        $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',45);', $xoops_admin_menu_ml[$mid]) ;
+        $module = $module_handler->get($mid);
+        $xoops_admin_menu_ft[$mid] = preg_replace('/\<img src\=.*$/', $module->getVar('name').'</a>', $xoops_admin_menu_ft[$mid]);
+        $xoops_admin_menu_ft[$mid] = '<div style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'">'.$xoops_admin_menu_ft[$mid].'</div>';
+        $xoops_admin_menu_ml[$mid] = str_replace(',105);', ',45);', $xoops_admin_menu_ml[$mid]);
     }
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => $xoops_admin_menu_ml, 'xoops_admin_menu_sd' => $xoops_admin_menu_sd, 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_NOIMG));
 }
 
 
 function altsys_adminmenu_hack_ft_xcsty_x20()
 {
     // read
-    if (! file_exists(ALTSYS_ADMINMENU_FILE)) {
-        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu') ;
-        exit ;
+    if (!file_exists(ALTSYS_ADMINMENU_FILE)) {
+        redirect_header(XOOPS_URL.'/admin.php', 1, 'Rebuild adminmenu');
+        exit;
     }
-    $not_inside_cp_functions = true ;
-    include ALTSYS_ADMINMENU_FILE ;
+    $not_inside_cp_functions = true;
+    include ALTSYS_ADMINMENU_FILE;
 
     // check previous hack
-    if (! empty($altsys_adminmenu_ft_hacked)) {
+    if (!empty($altsys_adminmenu_ft_hacked)) {
         if ($altsys_adminmenu_ft_hacked == ALTSYS_ADMINMENU_HACK_XCSTY && empty($altsys_adminmenu_dv_updated)) {
             // skip
-            return ;
+            return;
         } else {
             // rebuild adminmenu
-            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
-            $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb') ;
-            fwrite($fp, xoops_module_get_admin_menu()) ;
-            fclose($fp) ;
+            require_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+            $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb');
+            fwrite($fp, xoops_module_get_admin_menu());
+            fclose($fp);
             // backup $xoops_admin_menu_dv
-            $backup_admin_menu_dv = $xoops_admin_menu_dv ;
+            $backup_admin_menu_dv = $xoops_admin_menu_dv;
             // include new adminmenu
-            include ALTSYS_ADMINMENU_FILE ;
+            include ALTSYS_ADMINMENU_FILE;
             // restore $xoops_admin_menu_dv
-            $xoops_admin_menu_dv = $backup_admin_menu_dv ;
+            $xoops_admin_menu_dv = $backup_admin_menu_dv;
         }
     }
 
-    $module_handler = xoops_gethandler('module') ;
-    $mids = array_keys($xoops_admin_menu_ft) ;
+    $module_handler = xoops_gethandler('module');
+    $mids = array_keys($xoops_admin_menu_ft);
     foreach ($mids as $mid) {
-        $module = $module_handler->get($mid) ;
-        $submenuitems = array() ;
+        $module = $module_handler->get($mid);
+        $submenuitems = array();
         if (preg_match('/popUpL\d+/', $xoops_admin_menu_ft[$mid], $regs)) {
-            $popup = $regs[0] ;
-            preg_match_all('#\<a href.*'.$popup.'\(\).*\</a>#U', $xoops_admin_menu_dv, $regs) ;
+            $popup = $regs[0];
+            preg_match_all('#\<a href.*'.$popup.'\(\).*\</a>#U', $xoops_admin_menu_dv, $regs);
             foreach ($regs[0] as $submenuitem) {
-                $submenuitems[] = str_replace($popup.'();', '', $submenuitem) ;
+                $submenuitems[] = str_replace($popup.'();', '', $submenuitem);
             }
         } else {
-            return ;
+            return;
         }
         // module icon
         if (preg_match('#\<img .*/\>#U', $xoops_admin_menu_ft[$mid], $regs)) {
-            $icon_img = str_replace("alt=''", 'alt="'.$module->getVar('name').'"', $regs[0]) ;
+            $icon_img = str_replace("alt=''", 'alt="'.$module->getVar('name').'"', $regs[0]);
         } else {
-            $icon_img = '' ;
+            $icon_img = '';
         }
         // version number
-        $icon_img .= '<span class="version" style="">' . sprintf('%.2f', $module->getVar('version') / 100.0) . '</span>' ;
-        $newline = preg_replace('/ onmouseover.*$/', '', $xoops_admin_menu_ft[$mid]) ;
-        $newline = "\n".'<!-- '.$popup.' --><div id="adminmenu_ft'.$mid.'" style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'"><a id="adminmenu_ftpoint'.$mid.'" href="javascript:void(0);" onclick="submenuToggle('.$mid.');">+</a> '.$newline.'>'.$module->getVar('name').'</a></div><div id="adminmenu_ftsub'.$mid.'" style="display:none;"><ul>' ;
+        $icon_img .= '<span class="version" style="">'.sprintf('%.2f', $module->getVar('version') / 100.0).'</span>';
+        $newline = preg_replace('/ onmouseover.*$/', '', $xoops_admin_menu_ft[$mid]);
+        $newline = "\n".'<!-- '.$popup.' --><div id="adminmenu_ft'.$mid.'" style="text-align:'._GLOBAL_LEFT.';background-color:#CCC;" title="'.$module->getVar('dirname').'"><a id="adminmenu_ftpoint'.$mid.'" href="javascript:void(0);" onclick="submenuToggle('.$mid.');">+</a> '.$newline.'>'.$module->getVar('name').'</a></div><div id="adminmenu_ftsub'.$mid.'" style="display:none;"><ul>';
         foreach ($submenuitems as $submenuitem) {
-            $newline .= '<li>'.$submenuitem.'</li>' ;
+            $newline .= '<li>'.$submenuitem.'</li>';
         }
-        $newline .= '</ul>'.$icon_img.'</div>' ;
-        $xoops_admin_menu_ft[$mid] = $newline ;
+        $newline .= '</ul>'.$icon_img.'</div>';
+        $xoops_admin_menu_ft[$mid] = $newline;
     }
 
     $xoops_admin_menu_js = "
@@ -280,7 +280,7 @@ 
 	}" ;
 
     // write back
-    altsys_adminmenu_save_x20(array( 'xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => array(), 'xoops_admin_menu_sd' => array(), 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY )) ;
+    altsys_adminmenu_save_x20(array('xoops_admin_menu_js' => $xoops_admin_menu_js, 'xoops_admin_menu_ml' => array(), 'xoops_admin_menu_sd' => array(), 'xoops_admin_menu_ft' => $xoops_admin_menu_ft, 'xoops_admin_menu_dv' => $xoops_admin_menu_dv, 'altsys_adminmenu_ft_hacked' => ALTSYS_ADMINMENU_HACK_XCSTY));
 }
 
 
@@ -291,18 +291,18 @@ 
 function altsys_adminmenu_save_x20($xoops_admin_vars)
 {
     // variable definitions
-    ob_start() ;
-    echo "<?php\n// modified by altsys\nif( ! defined('XOOPS_ROOT_PATH') ) exit ;\n" ;
+    ob_start();
+    echo "<?php\n// modified by altsys\nif( ! defined('XOOPS_ROOT_PATH') ) exit ;\n";
     foreach ($xoops_admin_vars as $key => $val) {
-        echo '$' . $key . " = \n" ;
-        @var_export($val) ;
-        echo " ;\n" ;
+        echo '$'.$key." = \n";
+        @var_export($val);
+        echo " ;\n";
     }
-    $output = ob_get_contents() ;
-    ob_end_clean() ;
+    $output = ob_get_contents();
+    ob_end_clean();
 
     // embedding logics
-    if (in_array(@$xoops_admin_vars['altsys_adminmenu_ft_hacked'], array( ALTSYS_ADMINMENU_HACK_NOIMG, ALTSYS_ADMINMENU_HACK_XCSTY ))) {
+    if (in_array(@$xoops_admin_vars['altsys_adminmenu_ft_hacked'], array(ALTSYS_ADMINMENU_HACK_NOIMG, ALTSYS_ADMINMENU_HACK_XCSTY))) {
         $output .= '
 
 if( is_object( @$GLOBALS["xoopsModule"] ) && empty( $not_inside_cp_functions ) ) {
@@ -317,13 +317,13 @@ 
     }
 
     // termination
-    $output .= "\n\n?>" ;
+    $output .= "\n\n?>";
 
     // replace into XOOPS_URL
-    $output = str_replace(XOOPS_URL, "'.XOOPS_URL.'", $output) ;
+    $output = str_replace(XOOPS_URL, "'.XOOPS_URL.'", $output);
 
     // output
-    $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb') ;
-    fwrite($fp, $output) ;
-    fclose($fp) ;
+    $fp = fopen(ALTSYS_ADMINMENU_FILE, 'wb');
+    fwrite($fp, $output);
+    fclose($fp);
 }

xoops_trust_path/libs/altsys/include/mygroupperm.php

Spacing +18 added lines, -18 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 function myDeleteByModule($DB, $gperm_modid, $gperm_name = null, $gperm_itemid = null)
@@ -13,7 +13,7 @@ 
             $criteria->add(new Criteria('gperm_itemid', (int)$gperm_itemid));
         }
     }
-    $sql = 'DELETE FROM ' . $DB->prefix('group_permission') . ' ' . $criteria->renderWhere();
+    $sql = 'DELETE FROM '.$DB->prefix('group_permission').' '.$criteria->renderWhere();
     if (!$result = $DB->query($sql)) {
         return false;
     }
@@ -27,27 +27,27 @@ 
 
 if ($modid == 1) {
     // check by the permission of eather 'altsys' or 'system'
-    $module_handler = xoops_gethandler('module') ;
-    $module =& $module_handler->getByDirname('altsys') ;
-    if (! is_object($module)) {
-        $module =& $module_handler->getByDirname('system') ;
-        if (! is_object($module)) {
-            die('there is no altsys nor system.') ;
+    $module_handler = xoops_gethandler('module');
+    $module = & $module_handler->getByDirname('altsys');
+    if (!is_object($module)) {
+        $module = & $module_handler->getByDirname('system');
+        if (!is_object($module)) {
+            die('there is no altsys nor system.');
         }
     }
-    $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') ;
+    $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');
     }
 } else {
     // check the permission of 'module_admin' of the module
     if ($modid <= 0 || !is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin($modid)) {
-        die(_NOPERM) ;
+        die(_NOPERM);
     }
     $module_handler = xoops_gethandler('module');
     $module = $module_handler->get($modid);
     if (!is_object($module) || !$module->getVar('isactive')) {
-        die(_MODULENOEXIST) ;
+        die(_MODULENOEXIST);
     }
 }
 
@@ -56,18 +56,18 @@ 
 if (!empty($_POST['perms']) && is_array($_POST['perms'])) {
     $gperm_handler = xoops_gethandler('groupperm');
     foreach ($_POST['perms'] as $perm_name => $perm_data) {
-        foreach ($perm_data['itemname' ] as $item_id => $item_name) {
+        foreach ($perm_data['itemname'] as $item_id => $item_name) {
             // checking code
             // echo "<pre>" ;
             // var_dump( $_POST['perms'] ) ;
             // exit ;
             if (false != myDeleteByModule($gperm_handler->db, $modid, $perm_name, $item_id)) {
                 if (empty($perm_data['groups'])) {
-                    continue ;
+                    continue;
                 }
                 foreach ($perm_data['groups'] as $group_id => $item_ids) {
                     //              foreach ($item_ids as $item_id => $selected) {
-                    $selected = isset($item_ids[ $item_id ]) ? $item_ids[ $item_id ] : 0 ;
+                    $selected = isset($item_ids[$item_id]) ? $item_ids[$item_id] : 0;
                     if ($selected == 1) {
                         // make sure that all parent ids are selected as well
                         if ($perm_data['parents'][$item_id] != '') {
@@ -80,7 +80,7 @@ 
                                 }
                             }
                         }
-                        $gperm =& $gperm_handler->create();
+                        $gperm = & $gperm_handler->create();
                         $gperm->setVar('gperm_groupid', $group_id);
                         $gperm->setVar('gperm_name', $perm_name);
                         $gperm->setVar('gperm_modid', $modid);

xoops_trust_path/libs/altsys/include/Archive_Zip.php

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

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 /**
  * Parent
  */
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php';
 
 /**
  * A checkbox field with a choice of available groups
@@ -65,7 +65,7 @@ 
      * @param   bool    $include_anon   Include group "anonymous"?
      * @param   mixed   $value          Pre-selected value (or array of them).
      */
-    public function __construct($caption, $name, $include_anon=false, $value=null)
+    public function __construct($caption, $name, $include_anon = false, $value = null)
     {
         parent::__construct($caption, $name, $value);
         $member_handler = xoops_gethandler('member');
@@ -75,7 +75,7 @@ 
             $options = $member_handler->getGroupList();
         }
         foreach ($options as $k => $v) {
-            $options[$k] = $v . '<br />';
+            $options[$k] = $v.'<br />';
         }
         $this->addOptionArray($options);
     }

xoops_trust_path/libs/altsys/index.php

Spacing +23 added lines, -23 removed lines

@@ -1,51 +1,51 @@
 <?php
 
-if (! defined('XOOPS_MODULE_PATH')) {
-    define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH . '/modules');
+if (!defined('XOOPS_MODULE_PATH')) {
+    define('XOOPS_MODULE_PATH', XOOPS_ROOT_PATH.'/modules');
 }
-if (! defined('XOOPS_MODULE_URL')) {
-    define('XOOPS_MODULE_URL', XOOPS_URL . '/modules');
+if (!defined('XOOPS_MODULE_URL')) {
+    define('XOOPS_MODULE_URL', XOOPS_URL.'/modules');
 }
 
  
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-require_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+require_once __DIR__.'/include/altsys_functions.php';
 
 
 if (empty($xoopsModule)) {
-    $moduleperm_handler = xoops_gethandler('module') ;
-    $xoopsModule =& $moduleperm_handler->getByDirname('altsys') ;
+    $moduleperm_handler = xoops_gethandler('module');
+    $xoopsModule = & $moduleperm_handler->getByDirname('altsys');
 }
 
-require XOOPS_ROOT_PATH.'/include/cp_functions.php' ;
+require XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
 // breadcrumbs
-$breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
-$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name')) ;
+$breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
+$breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php', $GLOBALS['xoopsModule']->getVar('name'));
 
 // get page
-$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']) ;
-require __DIR__.'/controllers.php' ;
-if (! in_array($page, $controllers)) {
-    $_GET['page'] = $page = 'myblocksadmin' ;
-    $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin' ;
+$page = preg_replace('/[^a-zA-Z0-9_-]/', '', @$_GET['page']);
+require __DIR__.'/controllers.php';
+if (!in_array($page, $controllers)) {
+    $_GET['page'] = $page = 'myblocksadmin';
+    $_SERVER['REQUEST_URI'] = '/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin';
 }
 
 
 // half measure ... (TODO)
 if (empty($_GET['dirname'])) {
-    $module_handler = xoops_gethandler('module') ;
-    list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1)) ;
-    $_GET['dirname'] = $top_module->getVar('dirname') ;
+    $module_handler = xoops_gethandler('module');
+    list($top_module) = $module_handler->getObjects(new Criteria('isactive', 1));
+    $_GET['dirname'] = $top_module->getVar('dirname');
 }
 
 // language file
-altsys_include_language_file($page) ;
+altsys_include_language_file($page);
 
 // branch to each pages
-$mytrustdirpath = __DIR__ ;
+$mytrustdirpath = __DIR__;
 if (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php')) {
-    include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php' ;
+    include XOOPS_TRUST_PATH.'/libs/altsys/'.$page.'.php';
 } else {
-    die('wrong request') ;
+    die('wrong request');
 }

xoops_trust_path/libs/altsys/mypreferences.php

Switch Indentation +76 added lines, -76 removed lines

@@ -76,83 +76,83 @@
         $title4tray = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? (constant($config[$i]->getVar('conf_title')).$title_icon) : (constant($config[$i]->getVar('conf_title')).$title_icon.'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>'); // GIJ
         $title = '' ; // GIJ
         switch ($config[$i]->getVar('conf_formtype')) {
-        case 'textarea':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            if ($config[$i]->getVar('conf_valuetype') == 'array') {
-                // this is exceptional.. only when value type is arrayneed a smarter way for this
-                $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
-            } else {
-                $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
-            }
-            break;
-        case 'select':
-        case 'radio':
-            if ($config[$i]->getVar('conf_formtype') === 'select') {
-                $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
-                $addBr = '';
-            } else {
-                $ele = new XoopsFormRadio($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
-                $addBr = '<br />';
-            }
-            $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
-            $opcount = count($options);
-            for ($j = 0; $j < $opcount; $j++) {
-                $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
-                $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
-                $ele->addOption($optval, $optkey.$addBr);
-            }
-            break;
-        case 'select_multi':
-        case 'checkbox':
-            if ($config[$i]->getVar('conf_formtype') === 'select_multi') {
-                $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
-                $addBr = '';
-            } else {
-                $ele = new XoopsFormCheckBox($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
-                $addBr = '<br />';
-            }
-            $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
-            $opcount = count($options);
-            for ($j = 0; $j < $opcount; $j++) {
-                $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
-                $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+            case 'textarea':
+                (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+                if ($config[$i]->getVar('conf_valuetype') == 'array') {
+                    // this is exceptional.. only when value type is arrayneed a smarter way for this
+                    $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
+                } else {
+                    $ele = new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars($config[$i]->getConfValueForOutput()), 5, 50);
+                }
+                break;
+            case 'select':
+            case 'radio':
+                if ($config[$i]->getVar('conf_formtype') === 'select') {
+                    $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+                    $addBr = '';
+                } else {
+                    $ele = new XoopsFormRadio($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+                    $addBr = '<br />';
+                }
+                $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+                $opcount = count($options);
+                for ($j = 0; $j < $opcount; $j++) {
+                    $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
+                    $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+                    $ele->addOption($optval, $optkey.$addBr);
+                }
+                break;
+            case 'select_multi':
+            case 'checkbox':
+                if ($config[$i]->getVar('conf_formtype') === 'select_multi') {
+                    $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
+                    $addBr = '';
+                } else {
+                    $ele = new XoopsFormCheckBox($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+                    $addBr = '<br />';
+                }
+                $options = $config_handler->getConfigOptions(new Criteria('conf_id', $config[$i]->getVar('conf_id')));
+                $opcount = count($options);
+                for ($j = 0; $j < $opcount; $j++) {
+                    $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
+                    $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
 
-                $ele->addOption($optval, $optkey.$addBr);
-            }
-            break;
-        case 'yesno':
-            $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
-            break;
-        case 'group':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
-            break;
-        case 'group_multi':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
-            break;
-        case 'group_checkbox':
-            include_once __DIR__.'/include/formcheckboxgroup.php';
-            $ele = new AltsysFormCheckboxGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput());
-            break;
-        // RMV-NOTIFY: added 'user' and 'user_multi'
-        case 'user':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
-            break;
-        case 'user_multi':
-            include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
-            $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
-            break;
-        case 'password':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
-            break;
-        case 'textbox':
-        default:
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
-            $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
-            break;
+                    $ele->addOption($optval, $optkey.$addBr);
+                }
+                break;
+            case 'yesno':
+                $ele = new XoopsFormRadioYN($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), _YES, _NO);
+                break;
+            case 'group':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
+                break;
+            case 'group_multi':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
+                break;
+            case 'group_checkbox':
+                include_once __DIR__.'/include/formcheckboxgroup.php';
+                $ele = new AltsysFormCheckboxGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput());
+                break;
+            // RMV-NOTIFY: added 'user' and 'user_multi'
+            case 'user':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
+                break;
+            case 'user_multi':
+                include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+                $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
+                break;
+            case 'password':
+                (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+                $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+                break;
+            case 'textbox':
+            default:
+                (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+                $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
+                break;
         }
         $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
         $ele_tray = new XoopsFormElementTray($title4tray, '') ;

Spacing +40 added lines, -40 removed lines

@@ -5,33 +5,33 @@ 
 //                     GIJOE <http://www.peak.ne.jp/>                        //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__.'/include/gtickets.php' ;
-include_once __DIR__.'/include/altsys_functions.php' ;
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
 
 // check access right (needs module_admin of this module)
-if (! is_object($xoopsUser) || ! is_object($xoopsModule) || ! $xoopsUser->isAdmin($xoopsModule->mid())) {
-    die('Access Denied') ;
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
+    die('Access Denied');
 }
 
 
 // initials
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mypreferences') ;
+altsys_include_language_file('mypreferences');
 
 
-$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']) ;
+$op = empty($_GET['op']) ? 'showmod' : preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['op']);
 
 if ($op == 'showmod') {
     $config_handler = xoops_gethandler('config');
-    $mod = $xoopsModule->mid() ;
+    $mod = $xoopsModule->mid();
     $config = $config_handler->getConfigs(new Criteria('conf_modid', $mod));
     $count = count($config);
     if ($count < 1) {
-        die('no configs') ;
+        die('no configs');
     }
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $form = new XoopsThemeForm(_MD_A_MYPREFERENCES_FORMTITLE, 'pref_form', 'index.php?mode=admin&lib=altsys&page=mypreferences&op=save');
@@ -39,30 +39,30 @@ 
     $module = $module_handler->get($mod);
 
     // language
-    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ;
+    $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'];
 
     // load modinfo.php if necessary (judged by a specific constant is defined)
-    if (! defined('_MYMENU_CONSTANT_IN_MODINFO') || ! defined(_MYMENU_CONSTANT_IN_MODINFO)) {
+    if (!defined('_MYMENU_CONSTANT_IN_MODINFO') || !defined(_MYMENU_CONSTANT_IN_MODINFO)) {
         if (file_exists("$mydirpath/language/$language/modinfo.php")) {
             // user customized language file
-            include_once "$mydirpath/language/$language/modinfo.php" ;
+            include_once "$mydirpath/language/$language/modinfo.php";
         } elseif (file_exists("$mytrustdirpath/language/$language/modinfo.php")) {
             // default language file
-            include_once "$mytrustdirpath/language/$language/modinfo.php" ;
+            include_once "$mytrustdirpath/language/$language/modinfo.php";
         } else {
             // fallback english
-            include_once "$mytrustdirpath/language/english/modinfo.php" ;
+            include_once "$mytrustdirpath/language/english/modinfo.php";
         }
     }
 
     // if has comments feature, need comment lang file
-    if ($module->getVar('hascomments') == 1 && ! defined('_CM_TITLE')) {
+    if ($module->getVar('hascomments') == 1 && !defined('_CM_TITLE')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
     }
 
     // RMV-NOTIFY
     // if has notification feature, need notification lang file
-    if ($module->getVar('hasnotification') == 1 && ! defined('_NOT_NOTIFICATIONOPTIONS')) {
+    if ($module->getVar('hasnotification') == 1 && !defined('_NOT_NOTIFICATIONOPTIONS')) {
         include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
     }
 
@@ -72,12 +72,12 @@ 
         //  $form->addElement(new XoopsFormHidden('redirect', XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$module->getInfo('adminindex')));
     // }
     for ($i = 0; $i < $count; $i++) {
-        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt')? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
+        $title_icon = ($config[$i]->getVar('conf_valuetype') === 'encrypt') ? '<img src="'.XOOPS_MODULE_URL.'/legacy/admin/theme/icons/textfield_key.png" alt="Encrypted">' : ''; // support XCL 2.2.3 'encrypt' of 'conf_valuetype'
         $title4tray = (!defined($config[$i]->getVar('conf_desc')) || constant($config[$i]->getVar('conf_desc')) == '') ? (constant($config[$i]->getVar('conf_title')).$title_icon) : (constant($config[$i]->getVar('conf_title')).$title_icon.'<br /><br /><span style="font-weight:normal;">'.constant($config[$i]->getVar('conf_desc')).'</span>'); // GIJ
-        $title = '' ; // GIJ
+        $title = ''; // GIJ
         switch ($config[$i]->getVar('conf_formtype')) {
         case 'textarea':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
             if ($config[$i]->getVar('conf_valuetype') == 'array') {
                 // this is exceptional.. only when value type is arrayneed a smarter way for this
                 $ele = ($config[$i]->getVar('conf_value') != '') ? new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $config[$i]->getConfValueForOutput())), 5, 50) : new XoopsFormTextArea($title, $config[$i]->getVar('conf_name'), '', 5, 50);
@@ -145,35 +145,35 @@ 
             $ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
             break;
         case 'password':
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
             $ele = new XoopsFormPassword($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
             break;
         case 'textbox':
         default:
-            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+            (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
             $ele = new XoopsFormText($title, $config[$i]->getVar('conf_name'), 50, 255, $myts->htmlspecialchars($config[$i]->getConfValueForOutput()));
             break;
         }
         $hidden = new XoopsFormHidden('conf_ids[]', $config[$i]->getVar('conf_id'));
-        $ele_tray = new XoopsFormElementTray($title4tray, '') ;
+        $ele_tray = new XoopsFormElementTray($title4tray, '');
         $ele_tray->addElement($ele);
         $ele_tray->addElement($hidden);
-        $form->addElement($ele_tray) ;
+        $form->addElement($ele_tray);
         unset($ele_tray, $ele, $hidden);
     }
     // $button_tray->addElement(new XoopsFormHidden('op', 'save'));
-    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences') ;
+    $xoopsGTicket->addTicketXoopsFormElement($button_tray, __LINE__, 1800, 'mypreferences');
     $button_tray->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
-    $form->addElement($button_tray) ;
+    $form->addElement($button_tray);
     xoops_cp_header();
 
     // GIJ patch start
-    altsys_include_mymenu() ;
-    $breadcrumbsObj =& AltsysBreadcrumbs::getInstance() ;
+    altsys_include_mymenu();
+    $breadcrumbsObj = & AltsysBreadcrumbs::getInstance();
     if ($breadcrumbsObj->hasPaths()) {
-        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES) ;
+        $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mypreferences', _PREFERENCES);
     }
-    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').' &nbsp; '._PREFERENCES."</h3>\n" ;
+    echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>".$module->getvar('name').' &nbsp; '._PREFERENCES."</h3>\n";
     // GIJ patch end
 
     $form->display();
@@ -185,10 +185,10 @@ 
     //if ( !admin_refcheck("/modules/$admin_mydirname/admin/") ) {
     //  exit('Invalid referer');
     //}
-    if (! $xoopsGTicket->check(true, 'mypreferences')) {
+    if (!$xoopsGTicket->check(true, 'mypreferences')) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
-    require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
 //HACK by domifara for new XOOPS and XCL etc.
 //old xoops
@@ -209,7 +209,7 @@ 
     if ($count > 0) {
         for ($i = 0; $i < $count; $i++) {
             $config = $config_handler->getConfig($conf_ids[$i]);
-            $new_value =& $_POST[$config->getVar('conf_name')];
+            $new_value = & $_POST[$config->getVar('conf_name')];
             if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {
                 // if language has been changed
                 if (!$lang_updated && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'language') {
@@ -238,13 +238,13 @@ 
                         // generate compiled files for the new theme
                         // block files only for now..
                         $tplfile_handler = xoops_gethandler('tplfile');
-                        $dtemplates =& $tplfile_handler->find('default', 'block');
+                        $dtemplates = & $tplfile_handler->find('default', 'block');
                         $dcount = count($dtemplates);
 
                         // need to do this to pass to xoops_template_touch function
                         $GLOBALS['xoopsConfig']['template_set'] = $newtplset;
 
-                        altsys_clear_templates_c() ;
+                        altsys_clear_templates_c();
 
 /*                      for ($i = 0; $i < $dcount; $i++) {
                             $found =& $tplfile_handler->find($newtplset, 'block', $dtemplates[$i]->getVar('tpl_refid'), null);
@@ -259,7 +259,7 @@ 
 
                         // generate image cache files from image binary data, save them under cache/
                         $image_handler = xoops_gethandler('imagesetimg');
-                        $imagefiles =& $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
+                        $imagefiles = & $image_handler->getObjects(new Criteria('tplset_name', $newtplset), true);
                         foreach (array_keys($imagefiles) as $i) {
                             if (!$fp = fopen(XOOPS_CACHE_PATH.'/'.$newtplset.'_'.$imagefiles[$i]->getVar('imgsetimg_file'), 'wb')) {
                             } else {
@@ -272,12 +272,12 @@ 
                 }
 
                 // add read permission for the start module to all groups
-                if (!$startmod_updated    && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
+                if (!$startmod_updated && $new_value != '--' && $config->getVar('conf_catid') == XOOPS_CONF && $config->getVar('conf_name') == 'startpage') {
                     $member_handler = xoops_gethandler('member');
-                    $groups =& $member_handler->getGroupList();
+                    $groups = & $member_handler->getGroupList();
                     $moduleperm_handler = xoops_gethandler('groupperm');
                     $module_handler = xoops_gethandler('module');
-                    $module =& $module_handler->getByDirname($new_value);
+                    $module = & $module_handler->getByDirname($new_value);
                     foreach ($groups as $groupid => $groupname) {
                         if (!$moduleperm_handler->checkRight('module_read', $module->getVar('mid'), $groupid)) {
                             $moduleperm_handler->addRight('module_read', $module->getVar('mid'), $groupid);
@@ -293,5 +293,5 @@ 
         }
     }
 
-    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED) ;
+    redirect_header('index.php?mode=admin&lib=altsys&page=mypreferences', 2, _MD_A_MYPREFERENCES_UPDATED);
 }

xoops_trust_path/libs/altsys/blocks/block_functions.php

Spacing +70 added lines, -70 removed lines

@@ -1,147 +1,147 @@
 <?php
 
-require_once dirname(__DIR__).'/include/altsys_functions.php' ;
+require_once dirname(__DIR__).'/include/altsys_functions.php';
 
 function b_altsys_admin_menu_show($options)
 {
-    global $xoopsUser ;
+    global $xoopsUser;
 
-    $mydirname = empty($options[0]) ? 'altsys' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'altsys' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
-    if (! is_object(@$xoopsUser)) {
-        return array() ;
+    if (!is_object(@$xoopsUser)) {
+        return array();
     }
 
     // coretype
-    $coretype = altsys_get_core_type() ;
+    $coretype = altsys_get_core_type();
 
     // mid_selected
     if (is_object(@$GLOBALS['xoopsModule'])) {
-        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ;
+        $mid_selected = $GLOBALS['xoopsModule']->getVar('mid');
         // for system->preferences
-        if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) {
+        if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) {
             $mid_selected = (int)$_GET['mod'];
         }
     } else {
-        $mid_selected = 0 ;
+        $mid_selected = 0;
     }
 
     $db = XoopsDatabaseFactory::getDatabaseConnection();
-    (method_exists('MyTextSanitizer', 'sGetInstance') and $myts =& MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
+    (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = & MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
     $module_handler = xoops_gethandler('module');
-    $current_module =& $module_handler->getByDirname($mydirname);
+    $current_module = & $module_handler->getByDirname($mydirname);
     $config_handler = xoops_gethandler('config');
-    $current_configs = $config_handler->getConfigList($current_module->mid()) ;
+    $current_configs = $config_handler->getConfigList($current_module->mid());
     $moduleperm_handler = xoops_gethandler('groupperm');
     $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups());
-    $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids) . ')', 'IN'), true) ;
+    $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids).')', 'IN'), true);
 
     $block = array(
-        'mydirname' => $mydirname ,
-        'mod_url' => XOOPS_URL.'/modules/'.$mydirname ,
-        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'] ,
+        'mydirname' => $mydirname,
+        'mod_url' => XOOPS_URL.'/modules/'.$mydirname,
+        'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'],
         'mod_config' => $current_configs
-    ) ;
+    );
 
     foreach ($modules as $mod) {
         $mid = (int)$mod->getVar('mid');
-        $dirname = $mod->getVar('dirname') ;
-        $modinfo = $mod->getInfo() ;
-        $submenus4assign = array() ;
-        $adminmenu = array() ;
-        $adminmenu4altsys = array() ;
-        unset($adminmenu_use_altsys) ;
-        @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'] ;
+        $dirname = $mod->getVar('dirname');
+        $modinfo = $mod->getInfo();
+        $submenus4assign = array();
+        $adminmenu = array();
+        $adminmenu4altsys = array();
+        unset($adminmenu_use_altsys);
+        @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'];
         // from admin_menu.php etc.
-        $adminmenu = array_merge($adminmenu, $adminmenu4altsys) ;
+        $adminmenu = array_merge($adminmenu, $adminmenu4altsys);
         foreach ($adminmenu as $sub) {
-            $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'] ;
+            $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'];
             if (isset($sub['show']) && $sub['show'] === false) {
-                continue ;
+                continue;
             }
             $submenus4assign[] = array(
-                'title' => $myts->makeTboxData4Show($sub['title']) ,
+                'title' => $myts->makeTboxData4Show($sub['title']),
                 'url' => XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($link, ENT_QUOTES)
-            ) ;
+            );
         }
 
         // for modules overriding Module.class.php (eg. Analyzer for XC)
-        if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['cube_style'])) {
+        if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['cube_style'])) {
             $module_handler = xoops_gethandler('module');
             $module = $module_handler->get($mid);
-            $moduleObj =& Legacy_Utils::createModule($module);
-            $modinfo['adminindex'] = $moduleObj->getAdminIndex() ;
-            $modinfo['adminindex_absolute'] = true ;
+            $moduleObj = & Legacy_Utils::createModule($module);
+            $modinfo['adminindex'] = $moduleObj->getAdminIndex();
+            $modinfo['adminindex_absolute'] = true;
             foreach ($moduleObj->getAdminMenu() as $sub) {
                 if (@$sub['show'] === false) {
-                    continue ;
+                    continue;
                 }
                 $submenus4assign[] = array(
-                    'title' => $myts->makeTboxData4Show($sub['title']) ,
+                    'title' => $myts->makeTboxData4Show($sub['title']),
                     'url' => strncmp($sub['link'], 'http', 4) === 0 ? htmlspecialchars($sub['link'], ENT_QUOTES) : XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($sub['link'], ENT_QUOTES)
-                ) ;
+                );
             }
         } elseif (empty($adminmenu4altsys)) {
 
             // add preferences
-            if ($mod->getVar('hasconfig') && ! in_array($mod->getVar('dirname'), array( 'system', 'legacy' ))) {
+            if ($mod->getVar('hasconfig') && !in_array($mod->getVar('dirname'), array('system', 'legacy'))) {
                 $submenus4assign[] = array(
-                    'title' => _PREFERENCES ,
+                    'title' => _PREFERENCES,
                     'url' => htmlspecialchars(altsys_get_link2modpreferences($mid, $coretype), ENT_QUOTES)
-                ) ;
+                );
             }
 
             // add help
-            if (defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['help'])) {
+            if (defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['help'])) {
                 $submenus4assign[] = array(
-                    'title' => _HELP ,
+                    'title' => _HELP,
                     'url' => XOOPS_URL.'/modules/legacy/admin/index.php?action=Help&amp;dirname='.$dirname
-                ) ;
+                );
             }
         }
 
         $module4assign = array(
-            'mid' => $mid ,
-            'dirname' => $dirname ,
-            'name' => $mod->getVar('name') ,
-            'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0) ,
-            'version_in_file' => sprintf('%.2f', $modinfo['version']) ,
-            'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES) ,
-            'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES) ,
-            'isactive' => $mod->getVar('isactive') ,
-            'hasmain' => $mod->getVar('hasmain') ,
-            'hasadmin' => $mod->getVar('hasadmin') ,
-            'hasconfig' => $mod->getVar('hasconfig') ,
-            'weight' => $mod->getVar('weight') ,
-            'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES) ,
-            'adminindex_absolute' => @$modinfo['adminindex_absolute'] ,
-            'submenu' => $submenus4assign ,
-            'selected' => $mid == $mid_selected ? true : false ,
+            'mid' => $mid,
+            'dirname' => $dirname,
+            'name' => $mod->getVar('name'),
+            'version_in_db' => sprintf('%.2f', $mod->getVar('version') / 100.0),
+            'version_in_file' => sprintf('%.2f', $modinfo['version']),
+            'description' => htmlspecialchars(@$modinfo['description'], ENT_QUOTES),
+            'image' => htmlspecialchars($modinfo['image'], ENT_QUOTES),
+            'isactive' => $mod->getVar('isactive'),
+            'hasmain' => $mod->getVar('hasmain'),
+            'hasadmin' => $mod->getVar('hasadmin'),
+            'hasconfig' => $mod->getVar('hasconfig'),
+            'weight' => $mod->getVar('weight'),
+            'adminindex' => htmlspecialchars(@$modinfo['adminindex'], ENT_QUOTES),
+            'adminindex_absolute' => @$modinfo['adminindex_absolute'],
+            'submenu' => $submenus4assign,
+            'selected' => $mid == $mid_selected ? true : false,
             'dot_suffix' => $mid == $mid_selected ? 'selected_opened' : 'closed'
-        ) ;
-        $block['modules'][] = $module4assign ;
+        );
+        $block['modules'][] = $module4assign;
     }
 
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-    $tpl = new D3Tpl() ;
-    $tpl->assign('block', $block) ;
-    $ret['content'] = $tpl->fetch($this_template) ;
-    return $ret ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+    $tpl = new D3Tpl();
+    $tpl->assign('block', $block);
+    $ret['content'] = $tpl->fetch($this_template);
+    return $ret;
 }
 
 
 function b_altsys_admin_menu_edit($options)
 {
-    $mydirname = empty($options[0]) ? 'd3forum' : $options[0] ;
-    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ;
+    $mydirname = empty($options[0]) ? 'd3forum' : $options[0];
+    $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]);
 
     if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) {
-        die('Invalid mydirname') ;
+        die('Invalid mydirname');
     }
 
     $form = "