mambax7 / altsys

xoops_trust_path/libs/altsys/admin_menu.php

Spacing +18 added lines, -18 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 $adminmenu = array(
     array(
-        'title' => _MI_ALTSYS_MENU_CUSTOMBLOCKS ,
+        'title' => _MI_ALTSYS_MENU_CUSTOMBLOCKS,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_NEWCUSTOMBLOCK ,
-        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit' ,
+        'title' => _MI_ALTSYS_MENU_NEWCUSTOMBLOCK,
+        'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname=__CustomBlocks__&op=edit',
         'show' => false
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYBLOCKSADMIN ,
+        'title' => _MI_ALTSYS_MENU_MYBLOCKSADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=myblocksadmin'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYTPLSADMIN ,
+        'title' => _MI_ALTSYS_MENU_MYTPLSADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=mytplsadmin'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_COMPILEHOOKADMIN ,
+        'title' => _MI_ALTSYS_MENU_COMPILEHOOKADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=compilehookadmin'
-    ) ,
+    ),
     array(
-        'title' => _MI_ALTSYS_MENU_MYLANGADMIN ,
+        'title' => _MI_ALTSYS_MENU_MYLANGADMIN,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=mylangadmin'
-    ) ,
+    ),
 /*  array(
         'title' => _MI_ALTSYS_MENU_MYAVATAR ,
         'link' => 'index.php?mode=admin&lib=altsys&page=myavatar' ,
@@ -38,11 +38,11 @@ 
         'title' => _MI_ALTSYS_MENU_MYSMILEY ,
         'link' => 'index.php?mode=admin&lib=altsys&page=mysmiley' ,
     ) ,*/
-) ;
+);
 
 $adminmenu4altsys = array(
     array(
-        'title' => 'ALTSYS '._PREFERENCES ,
+        'title' => 'ALTSYS '._PREFERENCES,
         'link' => 'admin/index.php?mode=admin&lib=altsys&page=mypreferences'
     )
-) ;
+);

xoops_trust_path/libs/altsys/mymenu.php

Spacing +24 added lines, -24 removed lines

@@ -2,30 +2,30 @@ 
 
 /********* mymenu only for ALTSYS ********/
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
 // Skip for ORETEKI XOOPS
 if (defined('XOOPS_ORETEKI')) {
-    return ;
+    return;
 }
 
-if (! isset($module) || ! is_object($module)) {
-    $module = $xoopsModule ;
-} elseif (! is_object($xoopsModule)) {
-    die('$xoopsModule is not set')  ;
+if (!isset($module) || !is_object($module)) {
+    $module = $xoopsModule;
+} elseif (!is_object($xoopsModule)) {
+    die('$xoopsModule is not set');
 }
 
 // language files (modinfo.php)
-altsys_include_language_file('modinfo') ;
+altsys_include_language_file('modinfo');
 
-include __DIR__.'/admin_menu.php' ;
+include __DIR__.'/admin_menu.php';
 
-$adminmenu = array_merge($adminmenu, $adminmenu4altsys) ;
+$adminmenu = array_merge($adminmenu, $adminmenu4altsys);
 
-$mymenu_uri = empty($mymenu_fake_uri) ? $_SERVER['REQUEST_URI'] : $mymenu_fake_uri ;
-$mymenu_link = substr(strstr($mymenu_uri, '/admin/'), 1) ;
+$mymenu_uri = empty($mymenu_fake_uri) ? $_SERVER['REQUEST_URI'] : $mymenu_fake_uri;
+$mymenu_link = substr(strstr($mymenu_uri, '/admin/'), 1);
 
 // xoops_breadcrumbs
 // $GLOBALS['altsysXoopsBreadcrumbs'] = array( array( 'url' => XOOPS_URL.'/modules/altsys/admin/index.php' , 'name' => $xoopsModule->getVar('name') ) ) ;
@@ -33,19 +33,19 @@ 
 // highlight
 foreach (array_keys($adminmenu) as $i) {
     if ($mymenu_link == $adminmenu[$i]['link']) {
-        $adminmenu[$i]['selected'] = true ;
-        $adminmenu_hilighted = true ;
+        $adminmenu[$i]['selected'] = true;
+        $adminmenu_hilighted = true;
 //		$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'url' => XOOPS_URL."/modules/altsys/".htmlspecialchars($adminmenu[$i]['link'],ENT_QUOTES) , 'name' => htmlspecialchars( $adminmenu[$i]['title'] , ENT_QUOTES ) ) ;
     } else {
-        $adminmenu[$i]['selected'] = false ;
+        $adminmenu[$i]['selected'] = false;
     }
 }
 if (empty($adminmenu_hilighted)) {
     foreach (array_keys($adminmenu) as $i) {
         if (stristr($mymenu_uri, $adminmenu[$i]['link'])) {
-            $adminmenu[$i]['selected'] = true ;
+            $adminmenu[$i]['selected'] = true;
 //			$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'url' => XOOPS_URL."/modules/altsys/".htmlspecialchars($adminmenu[$i]['link'],ENT_QUOTES) , 'name' => htmlspecialchars( $adminmenu[$i]['title'] , ENT_QUOTES ) ) ;
-            break ;
+            break;
         }
     }
 }
@@ -53,20 +53,20 @@ 
 // link conversion from relative to absolute
 foreach (array_keys($adminmenu) as $i) {
     if (stristr($adminmenu[$i]['link'], XOOPS_URL) === false) {
-        $adminmenu[$i]['link'] = XOOPS_URL."/modules/$mydirname/" . $adminmenu[$i]['link'] ;
+        $adminmenu[$i]['link'] = XOOPS_URL."/modules/$mydirname/".$adminmenu[$i]['link'];
     }
 }
 
 // display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'adminmenu' => $adminmenu
-)) ;
-$tpl->display('db:altsys_inc_mymenu.html') ;
+));
+$tpl->display('db:altsys_inc_mymenu.html');
 
 // submenu
-$page = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['page']) ;
+$page = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['page']);
 if (file_exists(__DIR__.'/mymenusub/'.$page.'.php')) {
-    include __DIR__.'/mymenusub/'.$page.'.php' ;
+    include __DIR__.'/mymenusub/'.$page.'.php';
 }

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

Spacing +18 added lines, -18 removed lines

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

xoops_trust_path/libs/altsys/include/tpls_functions.php

Spacing +60 added lines, -60 removed lines

@@ -1,41 +1,41 @@ 
 <?php
 
 include_once XOOPS_ROOT_PATH.'/class/template.php';
-include_once __DIR__.'/altsys_functions.php' ;
+include_once __DIR__.'/altsys_functions.php';
 
 function tplsadmin_import_data($tplset, $tpl_file, $tpl_source, $lastmodified = 0)
 {
-    $db = XoopsDatabaseFactory::getDatabaseConnection() ;
+    $db = XoopsDatabaseFactory::getDatabaseConnection();
 
     // check the file is valid template
-    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'")) ;
-    if (! $count) {
-        return false ;
+    list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'"));
+    if (!$count) {
+        return false;
     }
 
     // check the template exists in the tplset
     if ($tplset != 'default') {
-        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'")) ;
+        list($count) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'"));
         if ($count <= 0) {
             // copy from 'default' to the tplset
-            $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='default' AND tpl_file='" . addslashes($tpl_file) . "'") ;
+            $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='default' AND tpl_file='".addslashes($tpl_file)."'");
             while ($row = $db->fetchArray($result)) {
-                $db->queryF('INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_module='" . addslashes($row['tpl_module']) . "',tpl_tplset='" . addslashes($tplset) . "',tpl_file='" . addslashes($tpl_file) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_type='" . addslashes($row['tpl_type']) . "'") ;
-                $tpl_id = $db->getInsertId() ;
-                $db->queryF('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source=''") ;
+                $db->queryF('INSERT INTO '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_module='".addslashes($row['tpl_module'])."',tpl_tplset='".addslashes($tplset)."',tpl_file='".addslashes($tpl_file)."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_type='".addslashes($row['tpl_type'])."'");
+                $tpl_id = $db->getInsertId();
+                $db->queryF('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source=''");
             }
         }
     }
 
     // UPDATE just tpl_lastmodified and tpl_source
-    $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset) . "' AND tpl_file='" . addslashes($tpl_file) . "'") ;
+    $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset)."' AND tpl_file='".addslashes($tpl_file)."'");
     while (list($tpl_id) = $db->fetchRow($drs)) {
-        $db->queryF('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'") ;
-        $db->queryF('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-        altsys_template_touch($tpl_id) ;
+        $db->queryF('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."',tpl_lastimported=UNIX_TIMESTAMP() WHERE tpl_id='$tpl_id'");
+        $db->queryF('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+        altsys_template_touch($tpl_id);
     }
 
-    return true ;
+    return true;
 }
 
 
@@ -43,46 +43,46 @@ 
 
 function tplsadmin_get_fingerprint($lines)
 {
-    $str = '' ;
+    $str = '';
     foreach ($lines as $line) {
         if (trim($line)) {
-            $str .= md5(trim($line)) ;
+            $str .= md5(trim($line));
         }
     }
-    return md5($str) ;
+    return md5($str);
 }
 
 
 
 function tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, $whr_append = '1')
 {
-    global $db ;
+    global $db;
 
     // get tplfile and tplsource
-    $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile') . ' NATURAL LEFT JOIN '
-                         . $db->prefix('tplsource') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND ($whr_append)") ;
+    $result = $db->query("SELECT tpl_refid,tpl_module,'".addslashes($tplset_to)."',tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type,tpl_source FROM ".$db->prefix('tplfile').' NATURAL LEFT JOIN '
+                         . $db->prefix('tplsource')." WHERE tpl_tplset='".addslashes($tplset_from)."' AND ($whr_append)");
 
     while ($row = $db->fetchArray($result)) {
-        $tpl_source = array_pop($row) ;
+        $tpl_source = array_pop($row);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'") ;
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
-        if (! $db->getRowsNum($drs)) {
+        if (!$db->getRowsNum($drs)) {
             // INSERT mode
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . ' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
+            $sql = 'INSERT INTO '.$db->prefix('tplfile').' (tpl_refid,tpl_module,tpl_tplset,tpl_file,tpl_desc,tpl_lastmodified,tpl_lastimported,tpl_type) VALUES (';
             foreach ($row as $colval) {
-                $sql .= "'".addslashes($colval)."'," ;
+                $sql .= "'".addslashes($colval)."',";
             }
-            $db->query(substr($sql, 0, -1) . ')') ;
-            $tpl_id = $db->getInsertId() ;
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'") ;
-            altsys_template_touch($tpl_id) ;
+            $db->query(substr($sql, 0, -1).')');
+            $tpl_id = $db->getInsertId();
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
+            altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_lastmodified='" . addslashes($row['tpl_lastmodified']) . "',tpl_lastimported='" . addslashes($row['tpl_lastimported']) . "',tpl_type='" . addslashes($row['tpl_type']) . "' WHERE tpl_id='$tpl_id'") ;
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-                altsys_template_touch($tpl_id) ;
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_lastmodified='".addslashes($row['tpl_lastmodified'])."',tpl_lastimported='".addslashes($row['tpl_lastimported'])."',tpl_type='".addslashes($row['tpl_type'])."' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+                altsys_template_touch($tpl_id);
             }
         }
     }
@@ -92,31 +92,31 @@ 
 
 function tplsadmin_copy_templates_f2db($tplset_to, $whr_append = '1')
 {
-    global $db ;
+    global $db;
 
     // get tplsource
-    $result = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . "  WHERE tpl_tplset='default' AND ($whr_append)") ;
+    $result = $db->query('SELECT * FROM '.$db->prefix('tplfile')."  WHERE tpl_tplset='default' AND ($whr_append)");
 
     while ($row = $db->fetchArray($result)) {
-        $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']) ;
-        $tpl_source = rtrim(implode('', file($basefilepath))) ;
-        $lastmodified = filemtime($basefilepath) ;
+        $basefilepath = tplsadmin_get_basefilepath($row['tpl_module'], $row['tpl_type'], $row['tpl_file']);
+        $tpl_source = rtrim(implode('', file($basefilepath)));
+        $lastmodified = filemtime($basefilepath);
 
-        $drs = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "' AND ($whr_append) AND tpl_file='" . addslashes($row['tpl_file']) . "' AND tpl_refid='" . addslashes($row['tpl_refid']) . "'") ;
+        $drs = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."' AND ($whr_append) AND tpl_file='".addslashes($row['tpl_file'])."' AND tpl_refid='".addslashes($row['tpl_refid'])."'");
 
-        if (! $db->getRowsNum($drs)) {
+        if (!$db->getRowsNum($drs)) {
             // INSERT mode
-            $sql = 'INSERT INTO ' . $db->prefix('tplfile') . " SET tpl_refid='" . addslashes($row['tpl_refid']) . "',tpl_desc='" . addslashes($row['tpl_desc']) . "',tpl_lastmodified='" . addslashes($lastmodified) . "',tpl_type='" . addslashes($row['tpl_type']) . "',tpl_tplset='" . addslashes($tplset_to) . "',tpl_file='" . addslashes($row['tpl_file']) . "',tpl_module='" . addslashes($row['tpl_module']) . "'" ;
-            $db->query($sql) ;
-            $tpl_id = $db->getInsertId() ;
-            $db->query('INSERT INTO ' . $db->prefix('tplsource') . " SET tpl_id='$tpl_id', tpl_source='" . addslashes($tpl_source) . "'") ;
-            altsys_template_touch($tpl_id) ;
+            $sql = 'INSERT INTO '.$db->prefix('tplfile')." SET tpl_refid='".addslashes($row['tpl_refid'])."',tpl_desc='".addslashes($row['tpl_desc'])."',tpl_lastmodified='".addslashes($lastmodified)."',tpl_type='".addslashes($row['tpl_type'])."',tpl_tplset='".addslashes($tplset_to)."',tpl_file='".addslashes($row['tpl_file'])."',tpl_module='".addslashes($row['tpl_module'])."'";
+            $db->query($sql);
+            $tpl_id = $db->getInsertId();
+            $db->query('INSERT INTO '.$db->prefix('tplsource')." SET tpl_id='$tpl_id', tpl_source='".addslashes($tpl_source)."'");
+            altsys_template_touch($tpl_id);
         } else {
             while (list($tpl_id) = $db->fetchRow($drs)) {
                 // UPDATE mode
-                $db->query('UPDATE ' . $db->prefix('tplfile') . " SET tpl_lastmodified='" . addslashes($lastmodified) . "' WHERE tpl_id='$tpl_id'") ;
-                $db->query('UPDATE ' . $db->prefix('tplsource') . " SET tpl_source='" . addslashes($tpl_source) . "' WHERE tpl_id='$tpl_id'") ;
-                altsys_template_touch($tpl_id) ;
+                $db->query('UPDATE '.$db->prefix('tplfile')." SET tpl_lastmodified='".addslashes($lastmodified)."' WHERE tpl_id='$tpl_id'");
+                $db->query('UPDATE '.$db->prefix('tplsource')." SET tpl_source='".addslashes($tpl_source)."' WHERE tpl_id='$tpl_id'");
+                altsys_template_touch($tpl_id);
             }
         }
     }
@@ -127,7 +127,7 @@ 
 function tplsadmin_get_basefilepath($dirname, $type, $tpl_file)
 {
     // module instance
-    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.($type=='block'?'blocks/':'').$tpl_file ;
+    $path = $basefilepath = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/templates/'.($type == 'block' ? 'blocks/' : '').$tpl_file;
 
     if (is_callable('Legacy_Utils::getTrustDirnameByDirname')) {
         $mytrustdirname = Legacy_Utils::getTrustDirnameByDirname($dirname);
@@ -135,33 +135,33 @@ 
 
     if (defined('ALTSYS_TPLSADMIN_BASEPATH')) {
         // Special hook
-        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1) ;
+        $path = ALTSYS_TPLSADMIN_BASEPATH.'/'.substr($tpl_file, strlen($dirname) + 1);
     } elseif ($mytrustdirname || @include(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/mytrustdirname.php')) {
         // D3 module base
-        if (! empty($mytrustdirname)) {
-            $mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/' ;
+        if (!empty($mytrustdirname)) {
+            $mid_path = $mytrustdirname == 'altsys' ? '/libs/' : '/modules/';
 
-            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type=='block'?'blocks/':'').substr($tpl_file, strlen($dirname) + 1) ;
+            $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type == 'block' ? 'blocks/' : '').substr($tpl_file, strlen($dirname) + 1);
             //new for xcck etc.other trust_module
-            if (! file_exists($path)) {
-                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type=='block'?'blocks/':'').$tpl_file ;
-                if (! file_exists($path)) {
+            if (!file_exists($path)) {
+                $path = XOOPS_TRUST_PATH.$mid_path.$mytrustdirname.'/templates/'.($type == 'block' ? 'blocks/' : '').$tpl_file;
+                if (!file_exists($path)) {
                     $path = $basefilepath;
                 }
             }
         }
     }
 
-    return $path ;
+    return $path;
 }
 
 
 function tplsadmin_die($msg, $target_dirname = '', $wait = 2)
 {
     if (strtolower($_SERVER['REQUEST_METHOD']) === 'post') {
-        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, $wait, $msg);
+        exit;
     } else {
-        die($msg) ;
+        die($msg);
     }
 }

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

Spacing +11 added lines, -11 removed lines

@@ -2,29 +2,29 @@
 
 // render admin in theme.html
 if (is_object($xoopsUser)) {
-    $xoops_subpath = substr($_SERVER['REQUEST_URI'], strpos(strrev(XOOPS_URL), strrev($_SERVER['HTTP_HOST']))) ;
+    $xoops_subpath = substr($_SERVER['REQUEST_URI'], strpos(strrev(XOOPS_URL), strrev($_SERVER['HTTP_HOST'])));
     if (preg_match('#(^/admin.php|^/modules/system/|^/modules/[a-zA-Z0-9_.-]+/admin/)#', $xoops_subpath)) {
         // The request looks like admin
-        require_once __DIR__.'/altsys_functions.php' ;
-        if (! empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
+        require_once __DIR__.'/altsys_functions.php';
+        if (!empty($GLOBALS['altsysModuleConfig']['admin_in_theme']) && file_exists(XOOPS_THEME_PATH.'/'.$GLOBALS['altsysModuleConfig']['admin_in_theme'].'/theme.html')) {
             // configs OK
-            require_once __DIR__.'/admin_in_theme_functions.php' ;
+            require_once __DIR__.'/admin_in_theme_functions.php';
 
             // for security with register_globals=1
-            unset($GLOBALS['altsysAdminPageTitle'], /* $GLOBALS['altsysXoopsBreadcrumbs'] ,*/ $GLOBALS['xoops_admin_contents']) ;
+            unset($GLOBALS['altsysAdminPageTitle'], /* $GLOBALS['altsysXoopsBreadcrumbs'] ,*/ $GLOBALS['xoops_admin_contents']);
 
             // disable error handler without XOOPS 2.0.14/15/16
-            if (! (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array( 1, 2 )))) {
-                restore_error_handler() ;
+            if (!(is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array(1, 2)))) {
+                restore_error_handler();
             }
 
             // to prepend Notice with 2.0.14/15/16 with PHP4
-            if (! defined('E_STRICT')) {
-                define('E_STRICT', 2048) ;
+            if (!defined('E_STRICT')) {
+                define('E_STRICT', 2048);
             }
 
-            register_shutdown_function('altsys_admin_in_theme_in_last') ;
-            ob_start('altsys_admin_in_theme') ;
+            register_shutdown_function('altsys_admin_in_theme_in_last');
+            ob_start('altsys_admin_in_theme');
         }
     }
 }

xoops_trust_path/libs/altsys/include/admin_in_theme_functions.php

Spacing +44 added lines, -44 removed lines

@@ -2,94 +2,94 @@ 
 
 function altsys_admin_in_theme($s)
 {
-    global $xoops_admin_contents ;
+    global $xoops_admin_contents;
 
-    $xoops_admin_contents = '' ;
+    $xoops_admin_contents = '';
 
     if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
-        return $s ;
+        return $s;
     }
 
     // check whether cp_functions.php is loaded
-    if (! defined('XOOPS_CPFUNC_LOADED')) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+    if (!defined('XOOPS_CPFUNC_LOADED')) {
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
     // redirect
     if (strstr($s, '<meta http-equiv="Refresh" ')) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
     // outputs before cp_header()
-    @list($former_outputs, $tmp_s) = explode('<!DOCTYPE', $s, 2) ;
+    @list($former_outputs, $tmp_s) = explode('<!DOCTYPE', $s, 2);
     if (empty($tmp_s)) {
-        $tmp_s = $s ;
+        $tmp_s = $s;
     }
 
-    @list(, $tmp_s) = explode("<div class='content'>", $tmp_s, 2) ;
+    @list(, $tmp_s) = explode("<div class='content'>", $tmp_s, 2);
     if (empty($tmp_s)) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
-    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s) ;
+    list($tmp_s, $tmp_after) = explode("<td width='1%' background='".XOOPS_URL."/modules/system/images/bg_content.gif'>", $tmp_s);
     if (empty($tmp_after)) {
-        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1) ;
-        return $s ;
+        define('ALTSYS_DONT_USE_ADMIN_IN_THEME', 1);
+        return $s;
     }
 
-    $xoops_admin_contents = $former_outputs . substr(strrev(strstr(strrev($tmp_s), strrev('</div>'))), 0, -6) ;
+    $xoops_admin_contents = $former_outputs.substr(strrev(strstr(strrev($tmp_s), strrev('</div>'))), 0, -6);
 
-    return '' ;
+    return '';
 }
 
 
 function altsys_admin_in_theme_in_last($contents = null)
 {
-    global $xoops_admin_contents , $xoopsConfig , $xoopsModule , $xoopsUser , $xoopsUserIsAdmin , $xoopsLogger , $altsysModuleConfig , $altsysModuleId ;
+    global $xoops_admin_contents, $xoopsConfig, $xoopsModule, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger, $altsysModuleConfig, $altsysModuleId;
 
-    if (! isset($contents)) {
+    if (!isset($contents)) {
         while (ob_get_level()) {
-            ob_end_flush() ;
+            ob_end_flush();
         }
     } else {
-        $xoops_admin_contents = $contents ;
+        $xoops_admin_contents = $contents;
     }
 
-    if (! isset($xoops_admin_contents)) {
-        return ;
+    if (!isset($xoops_admin_contents)) {
+        return;
     }
     if (defined('ALTSYS_DONT_USE_ADMIN_IN_THEME')) {
-        return ;
+        return;
     }
 
-    if (! is_object($xoopsUser)) {
-        exit ;
+    if (!is_object($xoopsUser)) {
+        exit;
     }
 
     // language files
     if (file_exists(dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php')) {
-        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php' ;
+        include_once dirname(__DIR__).'/language/'.$xoopsConfig['language'].'/admin_in_theme.php';
     } else {
-        include_once dirname(__DIR__).'/language/english/admin_in_theme.php' ;
+        include_once dirname(__DIR__).'/language/english/admin_in_theme.php';
     }
 
     // set the theme
-    $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'] ;
+    $xoopsConfig['theme_set'] = $altsysModuleConfig['admin_in_theme'];
 
     // language files under the theme
-    $original_error_level = error_reporting() ;
-    error_reporting($original_error_level & ~ E_NOTICE) ;
+    $original_error_level = error_reporting();
+    error_reporting($original_error_level & ~ E_NOTICE);
     if (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php')) {
-        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php' ;
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/'.$xoopsConfig['language'].'.php';
     } elseif (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php')) {
-        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php' ;
+        include_once XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/english.php';
     }
-    error_reporting($original_error_level) ;
+    error_reporting($original_error_level);
 
-    include __DIR__.'/admin_in_theme_header.inc.php' ;
+    include __DIR__.'/admin_in_theme_header.inc.php';
 
 /*	// include adminmenu
     include XOOPS_CACHE_PATH.'/adminmenu.php' ;
@@ -125,11 +125,11 @@ 
         function shutdown() {'.implode("\n",$xoops_admin_menu_sd).'}' ; */
 
     // appendix (core specific css etc)
-    $xoops_module_header = '' ;
+    $xoops_module_header = '';
     if (altsys_get_core_type() == ALTSYS_CORE_TYPE_XCL21) {
-        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n" ;
+        $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=style.css" />'."\n";
         if (is_object(@$xoopsModule)) {
-            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n" ;
+            $xoops_module_header .= '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/legacyRender/admin/css.php?file=module.css&amp;dirname='.$xoopsModule->getVar('dirname').'" />'."\n";
         }
     }
 
@@ -148,14 +148,14 @@ 
         'xoops_slogan' => htmlspecialchars($xoopsConfig['slogan'], ENT_QUOTES),
         'xoops_contents' => $xoops_admin_contents, //. '<div id="adminmenu_layers">' . $xoops_admin_menu_dv . '</div>' ,
         'xoops_module_header' => $xoops_module_header
-    )) ;
+    ));
 
     // rendering
-    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html') ;
+    $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html');
 
     // for XOOPS 2.0.14/15/16 from xoops.org
-    if (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array( 1, 2 ))) {
-        $xoopsLogger->activated = true ;
-        echo $xoopsLogger->render('') ;
+    if (is_object(@$xoopsLogger) && method_exists($xoopsLogger, 'render') && in_array($xoopsConfig['debug_mode'], array(1, 2))) {
+        $xoopsLogger->activated = true;
+        echo $xoopsLogger->render('');
     }
 }

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

Spacing +14 added lines, -14 removed lines

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

xoops_trust_path/libs/altsys/include/gtickets.php

Spacing +104 added lines, -104 removed lines

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

xoops_trust_path/libs/altsys/include/Archive_Zip.php

Spacing +108 added lines, -108 removed lines

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