chamilo / chamilo-lms

main/inc/lib/search/tool_processors/learnpath_processor.class.php

Spacing +7 added lines, -7 removed lines

@@ -8,9 +8,9 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
+require_once dirname(__FILE__).'/../IndexableChunk.class.php';
 
 /**
  * Process learning paths before pass it to search listing scripts
@@ -52,7 +52,7 @@ 
                     $visibility = api_get_item_visibility(api_get_course_info($courseid), TOOL_LEARNPATH, $lp_id);
                     if ($visibility) {
                         list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $lp_id, $lp['has_document_id']);
-                        $url = api_get_path(WEB_PATH) . 'main/newscorm/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
+                        $url = api_get_path(WEB_PATH).'main/newscorm/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
                         $url = sprintf($url, $courseid, $lp_id);
                         $result = array(
                             'toolid' => TOOL_LEARNPATH,
@@ -128,16 +128,16 @@ 
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {
                 // Get the image path
-                $img_location = api_get_path(WEB_COURSE_PATH) . $course_path . "/document/";
+                $img_location = api_get_path(WEB_COURSE_PATH).$course_path."/document/";
                 $thumbnail_path = str_replace('.png.html', '_thumb.png', $row['path']);
                 $big_img_path = str_replace('.png.html', '.png', $row['path']);
                 $thumbnail = '';
                 if (!empty($thumbnail_path)) {
-                    $thumbnail = $img_location . $thumbnail_path;
+                    $thumbnail = $img_location.$thumbnail_path;
                 }
                 $image = '';
                 if (!empty($big_img_path)) {
-                    $image = $img_location . $big_img_path;
+                    $image = $img_location.$big_img_path;
                 }
                 $name = $row['name'];
             }

main/inc/lib/baker.lib.php

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
             foreach (array_keys($this->_chunks[$type]) as $typekey) {
                 list($key, $data) = explode("\0", $this->_chunks[$type][$typekey]);
                 if (strcmp($key, $check) == 0) {
-                    echo 'Key "' . $check . '" already exists in "' . $type . '" chunk.';
+                    echo 'Key "'.$check.'" already exists in "'.$type.'" chunk.';
                     return false;
                 }
             }
@@ -70,11 +70,11 @@ 
      */
     public function addChunk($chunkType, $key, $value) {
         
-        $chunkData = $key . "\0" . $value;
-        $crc = pack("N", crc32($chunkType . $chunkData));
+        $chunkData = $key."\0".$value;
+        $crc = pack("N", crc32($chunkType.$chunkData));
         $len = pack("N", strlen($chunkData));
         
-        $newChunk = $len . $chunkType . $chunkData . $crc;
+        $newChunk = $len.$chunkType.$chunkData.$crc;
         $result = substr($this->_contents, 0, $this->_size - 12)
                 . $newChunk
                 . substr($this->_contents, $this->_size - 12, 12);
@@ -92,30 +92,30 @@ 
      */
     public function removeChunks($chunkType, $key, $png) {
         // Read the magic bytes and verify
-        $retval = substr($png,0,8);
+        $retval = substr($png, 0, 8);
         $ipos = 8;
         if ($retval != "\x89PNG\x0d\x0a\x1a\x0a")
             throw new Exception('Is not a valid PNG image');
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
-        $chunkHeader = substr($png,$ipos,8);
+        $chunkHeader = substr($png, $ipos, 8);
         $ipos = $ipos + 8;
         while ($chunkHeader) {
             // Extract length and type from binary data
             $chunk = @unpack('Nsize/a4type', $chunkHeader);
             $skip = false;
-            if ( $chunk['type'] == $chunkType ) {
-                $data = substr($png,$ipos,$chunk['size']);
+            if ($chunk['type'] == $chunkType) {
+                $data = substr($png, $ipos, $chunk['size']);
                 $sections = explode("\0", $data);
                 print_r($sections);
-                if ( $sections[0] == $key ) $skip = true;
+                if ($sections[0] == $key) $skip = true;
             }
             // Extract the data and the CRC
-            $data = substr($png,$ipos,$chunk['size']+4);
+            $data = substr($png, $ipos, $chunk['size'] + 4);
             $ipos = $ipos + $chunk['size'] + 4;
             // Add in the header, data, and CRC
-            if ( ! $skip ) $retval = $retval . $chunkHeader . $data;
+            if (!$skip) $retval = $retval.$chunkHeader.$data;
             // Read next chunk header
-            $chunkHeader = substr($png,$ipos,8);
+            $chunkHeader = substr($png, $ipos, 8);
             $ipos = $ipos + 8;
         }
         return $retval;
@@ -131,34 +131,34 @@ 
      * If there is PNG information that matches the key an array is returned
      * 
      */
-    public function extractBadgeInfo($png, $key='openbadges') {
+    public function extractBadgeInfo($png, $key = 'openbadges') {
         // Read the magic bytes and verify
-        $retval = substr($png,0,8);
+        $retval = substr($png, 0, 8);
         $ipos = 8;
         if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") {
             return false;
         }
 
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
-        $chunkHeader = substr($png,$ipos,8);
+        $chunkHeader = substr($png, $ipos, 8);
         $ipos = $ipos + 8;
         while ($chunkHeader) {
             // Extract length and type from binary data
             $chunk = @unpack('Nsize/a4type', $chunkHeader);
             $skip = false;
             if ($chunk['type'] == 'tEXt') {
-                $data = substr($png,$ipos,$chunk['size']);
+                $data = substr($png, $ipos, $chunk['size']);
                 $sections = explode("\0", $data);
                 if ($sections[0] == $key) {
                    return $sections;
                 }
             }
             // Extract the data and the CRC
-            $data = substr($png,$ipos,$chunk['size']+4);
+            $data = substr($png, $ipos, $chunk['size'] + 4);
             $ipos = $ipos + $chunk['size'] + 4;
 
             // Read next chunk header
-            $chunkHeader = substr($png,$ipos,8);
+            $chunkHeader = substr($png, $ipos, 8);
             $ipos = $ipos + 8;
         }
     }

main/inc/lib/pclzip/pclzip.lib.php

Spacing +282 added lines, -282 removed lines

@@ -47,7 +47,7 @@ 
 

   // ----- Constants

   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {

-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );

+    define('PCLZIP_READ_BLOCK_SIZE', 2048);

   }

 

   // ----- File list separator

@@ -61,7 +61,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );

   // Recommanded values for smart separation of filenames.

   if (!defined('PCLZIP_SEPARATOR')) {

-    define( 'PCLZIP_SEPARATOR', '|' );

+    define('PCLZIP_SEPARATOR', '|');

   }

 

   // ----- Error configuration

@@ -70,7 +70,7 @@ 
   //     you must ensure that you have included PclError library.

   // [2,...] : reserved for futur use

   if (!defined('PCLZIP_ERROR_EXTERNAL')) {

-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );

+    define('PCLZIP_ERROR_EXTERNAL', 0);

   }

 

   // ----- Optional static temporary directory

@@ -83,7 +83,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );

   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );

   if (!defined('PCLZIP_TEMPORARY_DIR')) {

-    define( 'PCLZIP_TEMPORARY_DIR', '' );

+    define('PCLZIP_TEMPORARY_DIR', '');

   }

 

   // ----- Optional threshold ratio for use of temporary files

@@ -95,7 +95,7 @@ 
   //       Samples :

   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );

   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {

-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );

+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);

   }

 

 // --------------------------------------------------------------------------------

@@ -120,72 +120,72 @@ 
   //  -12 : Unable to rename file (rename)

   //  -13 : Invalid header checksum

   //  -14 : Invalid archive size

-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );

-  define( 'PCLZIP_ERR_NO_ERROR', 0 );

-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );

-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );

-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );

-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );

-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );

-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );

-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );

-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );

-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );

-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );

-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );

-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );

-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );

-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );

-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );

-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );

-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );

-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );

-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );

-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );

-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );

+  define('PCLZIP_ERR_USER_ABORTED', 2);

+  define('PCLZIP_ERR_NO_ERROR', 0);

+  define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);

+  define('PCLZIP_ERR_READ_OPEN_FAIL', -2);

+  define('PCLZIP_ERR_INVALID_PARAMETER', -3);

+  define('PCLZIP_ERR_MISSING_FILE', -4);

+  define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);

+  define('PCLZIP_ERR_INVALID_ZIP', -6);

+  define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);

+  define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);

+  define('PCLZIP_ERR_BAD_EXTENSION', -9);

+  define('PCLZIP_ERR_BAD_FORMAT', -10);

+  define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);

+  define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);

+  define('PCLZIP_ERR_BAD_CHECKSUM', -13);

+  define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);

+  define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);

+  define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);

+  define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);

+  define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);

+  define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);

+  define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);

+  define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);

 

   // ----- Options values

-  define( 'PCLZIP_OPT_PATH', 77001 );

-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );

-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );

-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );

-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );

-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );

-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );

-  define( 'PCLZIP_OPT_BY_NAME', 77008 );

-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );

-  define( 'PCLZIP_OPT_BY_EREG', 77010 );

-  define( 'PCLZIP_OPT_BY_PREG', 77011 );

-  define( 'PCLZIP_OPT_COMMENT', 77012 );

-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );

-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );

-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );

-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );

-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );

+  define('PCLZIP_OPT_PATH', 77001);

+  define('PCLZIP_OPT_ADD_PATH', 77002);

+  define('PCLZIP_OPT_REMOVE_PATH', 77003);

+  define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);

+  define('PCLZIP_OPT_SET_CHMOD', 77005);

+  define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);

+  define('PCLZIP_OPT_NO_COMPRESSION', 77007);

+  define('PCLZIP_OPT_BY_NAME', 77008);

+  define('PCLZIP_OPT_BY_INDEX', 77009);

+  define('PCLZIP_OPT_BY_EREG', 77010);

+  define('PCLZIP_OPT_BY_PREG', 77011);

+  define('PCLZIP_OPT_COMMENT', 77012);

+  define('PCLZIP_OPT_ADD_COMMENT', 77013);

+  define('PCLZIP_OPT_PREPEND_COMMENT', 77014);

+  define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);

+  define('PCLZIP_OPT_REPLACE_NEWER', 77016);

+  define('PCLZIP_OPT_STOP_ON_ERROR', 77017);

   // Having big trouble with crypt. Need to multiply 2 long int

   // which is not correctly supported by PHP ...

   //define( 'PCLZIP_OPT_CRYPT', 77018 );

-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );

-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );

-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias

-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );

-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias

-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );

-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias

+  define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);

+  define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);

+  define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias

+  define('PCLZIP_OPT_TEMP_FILE_ON', 77021);

+  define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias

+  define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);

+  define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias

 

   // ----- File description attributes

-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );

-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );

-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );

-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );

-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );

-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );

+  define('PCLZIP_ATT_FILE_NAME', 79001);

+  define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);

+  define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);

+  define('PCLZIP_ATT_FILE_MTIME', 79004);

+  define('PCLZIP_ATT_FILE_CONTENT', 79005);

+  define('PCLZIP_ATT_FILE_COMMENT', 79006);

 

   // ----- Call backs values

-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );

-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );

-  define( 'PCLZIP_CB_PRE_ADD', 78003 );

-  define( 'PCLZIP_CB_POST_ADD', 78004 );

+  define('PCLZIP_CB_PRE_EXTRACT', 78001);

+  define('PCLZIP_CB_POST_EXTRACT', 78002);

+  define('PCLZIP_CB_PRE_ADD', 78003);

+  define('PCLZIP_CB_POST_ADD', 78004);

   /* For futur use

   define( 'PCLZIP_CB_PRE_LIST', 78005 );

   define( 'PCLZIP_CB_POST_LIST', 78006 );

@@ -290,7 +290,7 @@ 
   // --------------------------------------------------------------------------------

   function create($p_filelist)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -316,7 +316,7 @@ 
 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',

+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',

                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

                                                    PCLZIP_OPT_ADD_PATH => 'optional',

                                                    PCLZIP_CB_PRE_ADD => 'optional',

@@ -402,7 +402,7 @@ 
 

     // ----- For each file in the list check the attributes

     $v_supported_attributes

-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'

+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'

              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'

              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'

              ,PCLZIP_ATT_FILE_MTIME => 'optional'

@@ -473,7 +473,7 @@ 
   // --------------------------------------------------------------------------------

   function add($p_filelist)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -499,7 +499,7 @@ 
 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',

+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',

                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

                                                    PCLZIP_OPT_ADD_PATH => 'optional',

                                                    PCLZIP_CB_PRE_ADD => 'optional',

@@ -585,7 +585,7 @@ 
 

     // ----- For each file in the list check the attributes

     $v_supported_attributes

-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'

+    = array(PCLZIP_ATT_FILE_NAME => 'mandatory'

              ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'

              ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'

              ,PCLZIP_ATT_FILE_MTIME => 'optional'

@@ -662,7 +662,7 @@ 
   // --------------------------------------------------------------------------------

   function listContent()

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -719,7 +719,7 @@ 
   // --------------------------------------------------------------------------------

   function extract()

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -752,7 +752,7 @@ 
 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

-                                            array (PCLZIP_OPT_PATH => 'optional',

+                                            array(PCLZIP_OPT_PATH => 'optional',

                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',

                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

                                                    PCLZIP_OPT_ADD_PATH => 'optional',

@@ -876,7 +876,7 @@ 
   //function extractByIndex($p_index, options...)

   function extractByIndex($p_index)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -913,7 +913,7 @@ 
 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

-                                            array (PCLZIP_OPT_PATH => 'optional',

+                                            array(PCLZIP_OPT_PATH => 'optional',

                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',

                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',

@@ -983,10 +983,10 @@ 
     // ----- Trick

     // Here I want to reuse extractByRule(), so I need to parse the $p_index

     // with privParseOptions()

-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);

+    $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);

     $v_options_trick = array();

     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,

-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));

+                                        array(PCLZIP_OPT_BY_INDEX => 'optional'));

     if ($v_result != 1) {

         return 0;

     }

@@ -1025,7 +1025,7 @@ 
   // --------------------------------------------------------------------------------

   function delete()

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -1048,10 +1048,10 @@ 
 

       // ----- Parse the options

       $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

-                                        array (PCLZIP_OPT_BY_NAME => 'optional',

+                                        array(PCLZIP_OPT_BY_NAME => 'optional',

                                                PCLZIP_OPT_BY_EREG => 'optional',

                                                PCLZIP_OPT_BY_PREG => 'optional',

-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));

+                                               PCLZIP_OPT_BY_INDEX => 'optional'));

       if ($v_result != 1) {

           return 0;

       }

@@ -1305,9 +1305,9 @@ 
   // Description :

   // Parameters :

   // --------------------------------------------------------------------------------

-  function errorName($p_with_code=false)

+  function errorName($p_with_code = false)

   {

-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',

+    $v_name = array(PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',

                       PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',

                       PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',

                       PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',

@@ -1351,7 +1351,7 @@ 
   // Description :

   // Parameters :

   // --------------------------------------------------------------------------------

-  function errorInfo($p_full=false)

+  function errorInfo($p_full = false)

   {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

       return(PclErrorString());

@@ -1390,7 +1390,7 @@ 
   //   true on success,

   //   false on error, the error code is set.

   // --------------------------------------------------------------------------------

-  function privCheckFormat($p_level=0)

+  function privCheckFormat($p_level = 0)

   {

     $v_result = true;

 

@@ -1443,13 +1443,13 @@ 
   //   1 on success.

   //   0 on failure.

   // --------------------------------------------------------------------------------

-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)

+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Read the options

-    $i=0;

-    while ($i<$p_size) {

+    $i = 0;

+    while ($i < $p_size) {

 

       // ----- Check if the option is supported

       if (!isset($v_requested_options[$p_options_list[$i]])) {

@@ -1467,7 +1467,7 @@ 
         case PCLZIP_OPT_REMOVE_PATH :

         case PCLZIP_OPT_ADD_PATH :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1476,13 +1476,13 @@ 
           }

 

           // ----- Get the value

-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);

+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);

           $i++;

         break;

 

         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

             return PclZip::errorCode();

           }

@@ -1494,14 +1494,14 @@ 
           }

 

           // ----- Check the value

-          $v_value = $p_options_list[$i+1];

-          if ((!is_integer($v_value)) || ($v_value<0)) {

+          $v_value = $p_options_list[$i + 1];

+          if ((!is_integer($v_value)) || ($v_value < 0)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");

             return PclZip::errorCode();

           }

 

           // ----- Get the value (and convert it in bytes)

-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;

+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;

           $i++;

         break;

 

@@ -1532,7 +1532,7 @@ 
 

         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1541,9 +1541,9 @@ 
           }

 

           // ----- Get the value

-          if (   is_string($p_options_list[$i+1])

-              && ($p_options_list[$i+1] != '')) {

-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);

+          if (is_string($p_options_list[$i + 1])

+              && ($p_options_list[$i + 1] != '')) {

+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);

             $i++;

           }

           else {

@@ -1553,7 +1553,7 @@ 
         // ----- Look for options that request an array of string for value

         case PCLZIP_OPT_BY_NAME :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1562,11 +1562,11 @@ 
           }

 

           // ----- Get the value

-          if (is_string($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];

+          if (is_string($p_options_list[$i + 1])) {

+              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];

           }

-          else if (is_array($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+          else if (is_array($p_options_list[$i + 1])) {

+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];

           }

           else {

             // ----- Error log

@@ -1586,7 +1586,7 @@ 
         case PCLZIP_OPT_BY_PREG :

         //case PCLZIP_OPT_CRYPT :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1595,8 +1595,8 @@ 
           }

 

           // ----- Get the value

-          if (is_string($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+          if (is_string($p_options_list[$i + 1])) {

+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];

           }

           else {

             // ----- Error log

@@ -1613,7 +1613,7 @@ 
         case PCLZIP_OPT_ADD_COMMENT :

         case PCLZIP_OPT_PREPEND_COMMENT :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,

 			                     "Missing parameter value for option '"

@@ -1625,8 +1625,8 @@ 
           }

 

           // ----- Get the value

-          if (is_string($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+          if (is_string($p_options_list[$i + 1])) {

+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];

           }

           else {

             // ----- Error log

@@ -1644,7 +1644,7 @@ 
         // ----- Look for options that request an array of index

         case PCLZIP_OPT_BY_INDEX :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1654,19 +1654,19 @@ 
 

           // ----- Get the value

           $v_work_list = array();

-          if (is_string($p_options_list[$i+1])) {

+          if (is_string($p_options_list[$i + 1])) {

 

               // ----- Remove spaces

-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');

+              $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');

 

               // ----- Parse items

-              $v_work_list = explode(",", $p_options_list[$i+1]);

+              $v_work_list = explode(",", $p_options_list[$i + 1]);

           }

-          else if (is_integer($p_options_list[$i+1])) {

-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];

+          else if (is_integer($p_options_list[$i + 1])) {

+              $v_work_list[0] = $p_options_list[$i + 1].'-'.$p_options_list[$i + 1];

           }

-          else if (is_array($p_options_list[$i+1])) {

-              $v_work_list = $p_options_list[$i+1];

+          else if (is_array($p_options_list[$i + 1])) {

+              $v_work_list = $p_options_list[$i + 1];

           }

           else {

             // ----- Error log

@@ -1680,9 +1680,9 @@ 
           // each index item in the list must be a couple with a start and

           // an end value : [0,3], [5-5], [8-10], ...

           // ----- Check the format of each item

-          $v_sort_flag=false;

-          $v_sort_value=0;

-          for ($j=0; $j<sizeof($v_work_list); $j++) {

+          $v_sort_flag = false;

+          $v_sort_value = 0;

+          for ($j = 0; $j < sizeof($v_work_list); $j++) {

               // ----- Explode the item

               $v_item_list = explode("-", $v_work_list[$j]);

               $v_size_item_list = sizeof($v_item_list);

@@ -1712,7 +1712,7 @@ 
 

               // ----- Look for list sort

               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {

-                  $v_sort_flag=true;

+                  $v_sort_flag = true;

 

                   // ----- TBC : An automatic sort should be writen ...

                   // ----- Error log

@@ -1746,7 +1746,7 @@ 
         // ----- Look for options that request an octal value

         case PCLZIP_OPT_SET_CHMOD :

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1755,7 +1755,7 @@ 
           }

 

           // ----- Get the value

-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];

           $i++;

         break;

 

@@ -1771,7 +1771,7 @@ 
         case PCLZIP_CB_POST_LIST :

         */

           // ----- Check the number of parameters

-          if (($i+1) >= $p_size) {

+          if (($i + 1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1780,7 +1780,7 @@ 
           }

 

           // ----- Get the value

-          $v_function_name = $p_options_list[$i+1];

+          $v_function_name = $p_options_list[$i + 1];

 

           // ----- Check that the value is a valid existing function

           if (!function_exists($v_function_name)) {

@@ -1812,7 +1812,7 @@ 
 

     // ----- Look for mandatory options

     if ($v_requested_options !== false) {

-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {

+      for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {

         // ----- Look for mandatory option

         if ($v_requested_options[$key] == 'mandatory') {

           // ----- Look if present

@@ -1845,7 +1845,7 @@ 
   // --------------------------------------------------------------------------------

   function privOptionDefaultThreshold(&$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {

@@ -1857,16 +1857,16 @@ 
     $v_memory_limit = trim($v_memory_limit);

     $last = strtolower(substr($v_memory_limit, -1));

 

-    if($last == 'g')

+    if ($last == 'g')

         //$v_memory_limit = $v_memory_limit*1024*1024*1024;

-        $v_memory_limit = $v_memory_limit*1073741824;

-    if($last == 'm')

+        $v_memory_limit = $v_memory_limit * 1073741824;

+    if ($last == 'm')

         //$v_memory_limit = $v_memory_limit*1024*1024;

-        $v_memory_limit = $v_memory_limit*1048576;

-    if($last == 'k')

-        $v_memory_limit = $v_memory_limit*1024;

+        $v_memory_limit = $v_memory_limit * 1048576;

+    if ($last == 'k')

+        $v_memory_limit = $v_memory_limit * 1024;

 

-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);

+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);

 

 

     // ----- Sanity check : No threshold if value lower than 1M

@@ -1887,9 +1887,9 @@ 
   //   1 on success.

   //   0 on failure.

   // --------------------------------------------------------------------------------

-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)

+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- For each file in the list check the attributes

     foreach ($p_file_list as $v_key => $v_value) {

@@ -1982,7 +1982,7 @@ 
 

       // ----- Look for mandatory options

       if ($v_requested_options !== false) {

-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {

+        for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {

           // ----- Look for mandatory option

           if ($v_requested_options[$key] == 'mandatory') {

             // ----- Look if present

@@ -2018,13 +2018,13 @@ 
   // --------------------------------------------------------------------------------

   function privFileDescrExpand(&$p_filedescr_list, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Create a result list

     $v_result_list = array();

 

     // ----- Look each entry

-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {

+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {

 

       // ----- Get filedescr

       $v_descr = $p_filedescr_list[$i];

@@ -2143,7 +2143,7 @@ 
   // --------------------------------------------------------------------------------

   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

     $v_list_detail = array();

 

     // ----- Magic quotes trick

@@ -2178,7 +2178,7 @@ 
   // --------------------------------------------------------------------------------

   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

     $v_list_detail = array();

 

     // ----- Look if the archive exists or is empty

@@ -2195,7 +2195,7 @@ 
     $this->privDisableMagicQuotes();

 

     // ----- Open the zip file

-    if (($v_result=$this->privOpenFd('rb')) != 1)

+    if (($v_result = $this->privOpenFd('rb')) != 1)

     {

       // ----- Magic quotes trick

       $this->privSwapBackMagicQuotes();

@@ -2276,7 +2276,7 @@ 
     }

 

     // ----- Create the Central Dir files header

-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)

+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)

     {

       // ----- Create the file header

       if ($v_header_list[$i]['status'] == 'ok') {

@@ -2309,10 +2309,10 @@ 
     }

 

     // ----- 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->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)

+    if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)

     {

       // ----- Reset the file list

       unset($v_header_list);

@@ -2357,7 +2357,7 @@ 
   // --------------------------------------------------------------------------------

   function privOpenFd($p_mode)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Look if already open

     if ($this->zip_fd != 0)

@@ -2391,7 +2391,7 @@ 
   // --------------------------------------------------------------------------------

   function privCloseFd()

   {

-    $v_result=1;

+    $v_result = 1;

 

     if ($this->zip_fd != 0)

       @fclose($this->zip_fd);

@@ -2418,7 +2418,7 @@ 
 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)

   function privAddList($p_filedescr_list, &$p_result_list, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Add the files

     $v_header_list = array();

@@ -2432,7 +2432,7 @@ 
     $v_offset = @ftell($this->zip_fd);

 

     // ----- Create the Central Dir files header

-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)

+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)

     {

       // ----- Create the file header

       if ($v_header_list[$i]['status'] == 'ok') {

@@ -2454,7 +2454,7 @@ 
     }

 

     // ----- 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->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)

@@ -2482,14 +2482,14 @@ 
   // --------------------------------------------------------------------------------

   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

     $v_header = array();

 

     // ----- Recuperate the current number of elt in list

     $v_nb = sizeof($p_result_list);

 

     // ----- Loop on the files

-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {

+    for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {

       // ----- Format the filename

       $p_filedescr_list[$j]['filename']

       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);

@@ -2502,7 +2502,7 @@ 
       }

 

       // ----- Check the filename

-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')

+      if (($p_filedescr_list[$j]['type'] != 'virtual_file')

           && (!file_exists($p_filedescr_list[$j]['filename']))) {

         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");

         return PclZip::errorCode();

@@ -2512,10 +2512,10 @@ 
       // or a dir with all its path removed

 //      if (   (is_file($p_filedescr_list[$j]['filename']))

 //          || (   is_dir($p_filedescr_list[$j]['filename'])

-      if (   ($p_filedescr_list[$j]['type'] == 'file')

+      if (($p_filedescr_list[$j]['type'] == 'file')

           || ($p_filedescr_list[$j]['type'] == 'virtual_file')

-          || (   ($p_filedescr_list[$j]['type'] == 'folder')

-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])

+          || (($p_filedescr_list[$j]['type'] == 'folder')

+              && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])

                   || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))

           ) {

 

@@ -2544,7 +2544,7 @@ 
   // --------------------------------------------------------------------------------

   function privAddFile($p_filedescr, &$p_header, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Working variable

     $p_filename = $p_filedescr['filename'];

@@ -2589,13 +2589,13 @@ 
     $p_header['index'] = -1;

 

     // ----- Look for regular file

-    if ($p_filedescr['type']=='file') {

+    if ($p_filedescr['type'] == 'file') {

       $p_header['external'] = 0x00000000;

       $p_header['size'] = filesize($p_filename);

     }

 

     // ----- Look for regular folder

-    else if ($p_filedescr['type']=='folder') {

+    else if ($p_filedescr['type'] == 'folder') {

       $p_header['external'] = 0x00000010;

       $p_header['mtime'] = filemtime($p_filename);

       $p_header['size'] = filesize($p_filename);

@@ -2670,10 +2670,10 @@ 
       // ----- Look for a file

       if ($p_filedescr['type'] == 'file') {

         // ----- Look for using temporary file to zip

-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

+        if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])

                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {

+                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {

           $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);

           if ($v_result < PCLZIP_ERR_NO_ERROR) {

             return $v_result;

@@ -2773,7 +2773,7 @@ 
         // ----- Set the file properties

         $p_header['size'] = 0;

         //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked

-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked

+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked

 

         // ----- Call the header generation

         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)

@@ -2817,7 +2817,7 @@ 
   // --------------------------------------------------------------------------------

   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)

   {

-    $v_result=PCLZIP_ERR_NO_ERROR;

+    $v_result = PCLZIP_ERR_NO_ERROR;

 

     // ----- Working variable

     $p_filename = $p_filedescr['filename'];

@@ -2871,7 +2871,7 @@ 
     $v_data_header['os'] = bin2hex($v_data_header['os']);

 

     // ----- Read the gzip file footer

-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);

+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);

     $v_binary_data = @fread($v_file_compressed, 8);

     $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);

 

@@ -2879,7 +2879,7 @@ 
     $p_header['compression'] = ord($v_data_header['cm']);

     //$p_header['mtime'] = $v_data_header['mtime'];

     $p_header['crc'] = $v_data_footer['crc'];

-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;

+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;

 

     // ----- Close the file

     @fclose($v_file_compressed);

@@ -2929,7 +2929,7 @@ 
   // --------------------------------------------------------------------------------

   function privCalculateStoredFilename(&$p_filedescr, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Working variables

     $p_filename = $p_filedescr['filename'];

@@ -2986,14 +2986,14 @@ 
         if (substr($p_remove_dir, -1) != '/')

           $p_remove_dir .= "/";

 

-        if (   (substr($p_filename, 0, 2) == "./")

+        if ((substr($p_filename, 0, 2) == "./")

             || (substr($p_remove_dir, 0, 2) == "./")) {

 

-          if (   (substr($p_filename, 0, 2) == "./")

+          if ((substr($p_filename, 0, 2) == "./")

               && (substr($p_remove_dir, 0, 2) != "./")) {

             $p_remove_dir = "./".$p_remove_dir;

           }

-          if (   (substr($p_filename, 0, 2) != "./")

+          if ((substr($p_filename, 0, 2) != "./")

               && (substr($p_remove_dir, 0, 2) == "./")) {

             $p_remove_dir = substr($p_remove_dir, 2);

           }

@@ -3041,15 +3041,15 @@ 
   // --------------------------------------------------------------------------------

   function privWriteFileHeader(&$p_header)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Store the offset position of the file

     $p_header['offset'] = ftell($this->zip_fd);

 

     // ----- 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,

@@ -3086,7 +3086,7 @@ 
   // --------------------------------------------------------------------------------

   function privWriteCentralFileHeader(&$p_header)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // TBC

     //for(reset($p_header); $key = key($p_header); next($p_header)) {

@@ -3094,8 +3094,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

@@ -3139,7 +3139,7 @@ 
   // --------------------------------------------------------------------------------

   function privWriteCentralHeader($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,

@@ -3168,7 +3168,7 @@ 
   // --------------------------------------------------------------------------------

   function privList(&$p_list)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Magic quotes trick

     $this->privDisableMagicQuotes();

@@ -3208,7 +3208,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->privReadCentralFileHeader($v_header)) != 1)

@@ -3255,7 +3255,7 @@ 
   // --------------------------------------------------------------------------------

   function privConvertHeader2FileInfo($p_header, &$p_info)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Get the interesting attributes

     $v_temp_path = PclZipUtilPathReduction($p_header['filename']);

@@ -3266,7 +3266,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'];

     $p_info['crc'] = $p_header['crc'];

@@ -3294,16 +3294,16 @@ 
   // --------------------------------------------------------------------------------

   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Magic quotes trick

     $this->privDisableMagicQuotes();

 

     // ----- Check the path

-    if (   ($p_path == "")

-	    || (   (substr($p_path, 0, 1) != "/")

+    if (($p_path == "")

+	    || ((substr($p_path, 0, 1) != "/")

 		    && (substr($p_path, 0, 3) != "../")

-			&& (substr($p_path,1,2)!=":/")))

+			&& (substr($p_path, 1, 2) != ":/")))

       $p_path = "./".$p_path;

 

     // ----- Reduce the path last (and duplicated) '/'

@@ -3312,7 +3312,7 @@ 
       // ----- 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);

       }

     }

 

@@ -3346,7 +3346,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

@@ -3385,17 +3385,17 @@ 
       $v_extract = false;

 

       // ----- Look for extract by name rule

-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))

+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))

           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {

 

           // ----- Look if the filename is in the list

-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {

+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {

 

               // ----- Look for a directory

               if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {

 

                   // ----- Look if the directory is in the filename path

-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

+                  if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {

                       $v_extract = true;

                   }

@@ -3420,7 +3420,7 @@ 
       */

 

       // ----- Look for extract by preg rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))

+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))

                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {

 

           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {

@@ -3429,20 +3429,20 @@ 
       }

 

       // ----- Look for extract by index rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))

+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))

                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {

 

           // ----- Look if the index is in the list

-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {

+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {

 

-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

                   $v_extract = true;

               }

-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

-                  $j_start = $j+1;

+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

+                  $j_start = $j + 1;

               }

 

-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {

+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {

                   break;

               }

           }

@@ -3454,14 +3454,14 @@ 
       }

 

 	  // ----- Check compression method

-	  if (   ($v_extract)

-	      && (   ($v_header['compression'] != 8)

+	  if (($v_extract)

+	      && (($v_header['compression'] != 8)

 		      && ($v_header['compression'] != 0))) {

           $v_header['status'] = 'unsupported_compression';

 

           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {

 

               $this->privSwapBackMagicQuotes();

 

@@ -3479,8 +3479,8 @@ 
           $v_header['status'] = 'unsupported_encryption';

 

           // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {

 

               $this->privSwapBackMagicQuotes();

 

@@ -3561,7 +3561,7 @@ 
           }

         }

         // ----- Look for extraction in standard output

-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))

+        elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))

 		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {

           // ----- Extracting the file in standard output

           $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);

@@ -3634,7 +3634,7 @@ 
   // --------------------------------------------------------------------------------

   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Read the file header

     if (($v_result = $this->privReadFileHeader($v_header)) != 1)

@@ -3652,7 +3652,7 @@ 
     // ----- Look for all path to remove

     if ($p_remove_all_path == true) {

         // ----- Look for folder entry that not need to be extracted

-        if (($p_entry['external']&0x00000010)==0x00000010) {

+        if (($p_entry['external'] & 0x00000010) == 0x00000010) {

 

             $p_entry['status'] = "filtered";

 

@@ -3754,8 +3754,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

         // For historical reason first PclZip implementation does not stop

         // when this kind of error occurs.

-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {

 

             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,

 			                     "Filename '".$p_entry['filename']."' is "

@@ -3774,8 +3774,8 @@ 
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

         // For historical reason first PclZip implementation does not stop

         // when this kind of error occurs.

-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {

 

             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,

 			                     "Filename '".$p_entry['filename']."' exists "

@@ -3789,8 +3789,8 @@ 
       else if (filemtime($p_entry['filename']) > $p_entry['mtime'])

       {

         // ----- Change the file status

-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))

-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {

+        if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))

+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {

 	  	  }

 		    else {

             $p_entry['status'] = "newer_exist";

@@ -3798,8 +3798,8 @@ 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

             // For historical reason first PclZip implementation does not stop

             // when this kind of error occurs.

-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {

 

                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,

 			             "Newer version of '".$p_entry['filename']."' exists "

@@ -3815,14 +3815,14 @@ 
 

     // ----- 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'];

       else if (!strstr($p_entry['filename'], "/"))

         $v_dir_to_check = "";

       else

         $v_dir_to_check = dirname($p_entry['filename']);

 

-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {

+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {

 

           // ----- Change the file status

           $p_entry['status'] = "path_creation_fail";

@@ -3838,7 +3838,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['compression'] == 0) {

@@ -3887,10 +3887,10 @@ 
 

 

           // ----- Look for using temporary file to unzip

-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

+          if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])

                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {

+                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {

             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);

             if ($v_result < PCLZIP_ERR_NO_ERROR) {

               return $v_result;

@@ -3985,7 +3985,7 @@ 
   // --------------------------------------------------------------------------------

   function privExtractFileUsingTempFile(&$p_entry, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Creates a temporary file

     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';

@@ -4061,7 +4061,7 @@ 
   // --------------------------------------------------------------------------------

   function privExtractFileInOutput(&$p_entry, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Read the file header

     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {

@@ -4110,7 +4110,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']) {

 

@@ -4173,7 +4173,7 @@ 
   // --------------------------------------------------------------------------------

   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Read the file header

     $v_header = array();

@@ -4224,7 +4224,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'])

         if ($p_entry['compression'] == 0) {

@@ -4296,7 +4296,7 @@ 
   // --------------------------------------------------------------------------------

   function privReadFileHeader(&$p_header)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Read the 4 bytes signature

     $v_binary_data = @fread($this->zip_fd, 4);

@@ -4360,7 +4360,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;

@@ -4399,7 +4399,7 @@ 
   // --------------------------------------------------------------------------------

   function privReadCentralFileHeader(&$p_header)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Read the 4 bytes signature

     $v_binary_data = @fread($this->zip_fd, 4);

@@ -4470,7 +4470,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;

@@ -4514,7 +4514,7 @@ 
   // --------------------------------------------------------------------------------

   function privCheckFileHeaders(&$p_local_header, &$p_central_header)

   {

-    $v_result=1;

+    $v_result = 1;

 

   	// ----- Check the static values

   	// TBC

@@ -4551,7 +4551,7 @@ 
   // --------------------------------------------------------------------------------

   function privReadEndCentralDir(&$p_central_dir)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Go to the end of the zip file

     $v_size = filesize($this->zipname);

@@ -4569,8 +4569,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))

       {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');

@@ -4596,8 +4596,8 @@ 
       $v_maximum_size = 65557; // 0xFFFF + 22;

       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))

       {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');

@@ -4618,7 +4618,7 @@ 
         //$v_bytes = ($v_bytes << 8) | Ord($v_byte);

         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number

         // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.

-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);

+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);

 

         // ----- Compare the bytes

         if ($v_bytes == 0x504b0506)

@@ -4708,11 +4708,11 @@ 
   // --------------------------------------------------------------------------------

   function privDeleteByRule(&$p_result_list, &$p_options)

   {

-    $v_result=1;

+    $v_result = 1;

     $v_list_detail = array();

 

     // ----- Open the zip file

-    if (($v_result=$this->privOpenFd('rb')) != 1)

+    if (($v_result = $this->privOpenFd('rb')) != 1)

     {

       // ----- Return

       return $v_result;

@@ -4748,7 +4748,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

@@ -4769,21 +4769,21 @@ 
       $v_found = false;

 

       // ----- Look for extract by name rule

-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))

+      if ((isset($p_options[PCLZIP_OPT_BY_NAME]))

           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {

 

           // ----- Look if the filename is in the list

-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {

+          for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {

 

               // ----- Look for a directory

               if (substr($p_options[PCLZIP_OPT_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_options[PCLZIP_OPT_BY_NAME][$j]))

+                  if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_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_options[PCLZIP_OPT_BY_NAME][$j])) {

                       $v_found = true;

                   }

@@ -4808,7 +4808,7 @@ 
       */

 

       // ----- Look for extract by preg rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))

+      else if ((isset($p_options[PCLZIP_OPT_BY_PREG]))

                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {

 

           if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {

@@ -4817,20 +4817,20 @@ 
       }

 

       // ----- Look for extract by index rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))

+      else if ((isset($p_options[PCLZIP_OPT_BY_INDEX]))

                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {

 

           // ----- Look if the index is in the list

-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {

+          for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {

 

-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

+              if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

                   $v_found = true;

               }

-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

-                  $j_start = $j+1;

+              if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

+                  $j_start = $j + 1;

               }

 

-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {

+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {

                   break;

               }

           }

@@ -4868,11 +4868,11 @@ 
         }

 

         // ----- Look which file need to be kept

-        for ($i=0; $i<sizeof($v_header_list); $i++) {

+        for ($i = 0; $i < sizeof($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'])) {

                 // ----- Close the zip file

                 $this->privCloseFd();

                 $v_temp_zip->privCloseFd();

@@ -4931,7 +4931,7 @@ 
         $v_offset = @ftell($v_temp_zip->zip_fd);

 

         // ----- Re-Create the Central Dir files header

-        for ($i=0; $i<sizeof($v_header_list); $i++) {

+        for ($i = 0; $i < sizeof($v_header_list); $i++) {

             // ----- Create the file header

             if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {

                 $v_temp_zip->privCloseFd();

@@ -4954,7 +4954,7 @@ 
         }

 

         // ----- 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

         if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {

@@ -5016,15 +5016,15 @@ 
   //    1 : OK

   //   -1 : Unable to create directory

   // --------------------------------------------------------------------------------

-  function privDirCheck($p_dir, $p_is_dir=false)

+  function privDirCheck($p_dir, $p_is_dir = false)

   {

     $v_result = 1;

 

 

     // ----- Remove the final '/'

-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))

+    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

@@ -5073,7 +5073,7 @@ 
   // --------------------------------------------------------------------------------

   function privMerge(&$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))

@@ -5098,7 +5098,7 @@ 
     }

 

     // ----- Open the zip file

-    if (($v_result=$this->privOpenFd('rb')) != 1)

+    if (($v_result = $this->privOpenFd('rb')) != 1)

     {

       // ----- Return

       return $v_result;

@@ -5116,7 +5116,7 @@ 
     @rewind($this->zip_fd);

 

     // ----- Open the archive_to_add file

-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)

+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1)

     {

       $this->privCloseFd();

 

@@ -5200,7 +5200,7 @@ 
     $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['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

@@ -5210,7 +5210,7 @@ 
     $v_zip_temp_fd = $v_swap;

 

     // ----- Create the central dir footer

-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)

+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)

     {

       $this->privCloseFd();

       $p_archive_to_add->privCloseFd();

@@ -5258,7 +5258,7 @@ 
   // --------------------------------------------------------------------------------

   function privDuplicate($p_archive_filename)

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Look if the $p_archive_filename exists

     if (!is_file($p_archive_filename))

@@ -5272,7 +5272,7 @@ 
     }

 

     // ----- Open the zip file

-    if (($v_result=$this->privOpenFd('wb')) != 1)

+    if (($v_result = $this->privOpenFd('wb')) != 1)

     {

       // ----- Return

       return $v_result;

@@ -5316,7 +5316,7 @@ 
   // Description :

   // Parameters :

   // --------------------------------------------------------------------------------

-  function privErrorLog($p_error_code=0, $p_error_string='')

+  function privErrorLog($p_error_code = 0, $p_error_string = '')

   {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

       PclError($p_error_code, $p_error_string);

@@ -5353,10 +5353,10 @@ 
   // --------------------------------------------------------------------------------

   function privDisableMagicQuotes()

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Look if function exists

-    if (   (!function_exists("get_magic_quotes_runtime"))

+    if ((!function_exists("get_magic_quotes_runtime"))

 	    || (!function_exists("set_magic_quotes_runtime"))) {

       return $v_result;

 	}

@@ -5387,10 +5387,10 @@ 
   // --------------------------------------------------------------------------------

   function privSwapBackMagicQuotes()

   {

-    $v_result=1;

+    $v_result = 1;

 

     // ----- Look if function exists

-    if (   (!function_exists("get_magic_quotes_runtime"))

+    if ((!function_exists("get_magic_quotes_runtime"))

 	    || (!function_exists("set_magic_quotes_runtime"))) {

       return $v_result;

 	}

@@ -5431,7 +5431,7 @@ 
 

       // ----- Study directories from last to first

       $v_skip = 0;

-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {

+      for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {

         // ----- Look for current path

         if ($v_list[$i] == ".") {

           // ----- Ignore this directory

@@ -5452,7 +5452,7 @@ 
 		    }

 		  }

 		  // ----- Last '/' i.e. indicates a directory

-		  else if ($i == (sizeof($v_list)-1)) {

+		  else if ($i == (sizeof($v_list) - 1)) {

             $v_result = $v_list[$i];

 		  }

 		  // ----- Double '/' inside the path

@@ -5467,7 +5467,7 @@ 
 		    $v_skip--;

 		  }

 		  else {

-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");

+            $v_result = $v_list[$i].($i != (sizeof($v_list) - 1) ? "/".$v_result : "");

 		  }

         }

       }

@@ -5506,12 +5506,12 @@ 
     $v_result = 1;

 

     // ----- Look for path beginning by ./

-    if (   ($p_dir == '.')

-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {

+    if (($p_dir == '.')

+        || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {

       $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);

     }

-    if (   ($p_path == '.')

-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {

+    if (($p_path == '.')

+        || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {

       $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);

     }

 

@@ -5537,7 +5537,7 @@ 
       }

 

       // ----- Compare the items

-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {

+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {

         $v_result = 0;

       }

 

@@ -5578,11 +5578,11 @@ 
   //             3 : src & dest gzip

   // Return Values :

   // --------------------------------------------------------------------------------

-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)

+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)

   {

     $v_result = 1;

 

-    if ($p_mode==0)

+    if ($p_mode == 0)

     {

       while ($p_size != 0)

       {

@@ -5592,7 +5592,7 @@ 
         $p_size -= $v_read_size;

       }

     }

-    else if ($p_mode==1)

+    else if ($p_mode == 1)

     {

       while ($p_size != 0)

       {

@@ -5602,7 +5602,7 @@ 
         $p_size -= $v_read_size;

       }

     }

-    else if ($p_mode==2)

+    else if ($p_mode == 2)

     {

       while ($p_size != 0)

       {

@@ -5612,7 +5612,7 @@ 
         $p_size -= $v_read_size;

       }

     }

-    else if ($p_mode==3)

+    else if ($p_mode == 3)

     {

       while ($p_size != 0)

       {

@@ -5676,7 +5676,7 @@ 
     $v_list = get_defined_constants();

     for (reset($v_list); $v_key = key($v_list); next($v_list)) {

 	    $v_prefix = substr($v_key, 0, 10);

-	    if ((   ($v_prefix == 'PCLZIP_OPT')

+	    if ((($v_prefix == 'PCLZIP_OPT')

            || ($v_prefix == 'PCLZIP_CB_')

            || ($v_prefix == 'PCLZIP_ATT'))

 	        && ($v_list[$v_key] == $p_option)) {

@@ -5701,15 +5701,15 @@ 
   // Return Values :

   //   The path translated.

   // --------------------------------------------------------------------------------

-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)

+  function PclZipUtilTranslateWinPath($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) == '\\')) {

+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {

           $p_path = strtr($p_path, '\\', '/');

       }

     }

main/inc/lib/pdf.lib.php

Spacing +38 added lines, -38 removed lines

@@ -31,7 +31,7 @@ 
         /* More info @ http://mpdf1.com/manual/index.php?tid=184&searchstring=mPDF
          * mPDF ([ string $mode [, mixed $format [, float $default_font_size [, string $default_font [, float $margin_left , float $margin_right , float $margin_top , float $margin_bottom , float $margin_header , float $margin_footer [, string $orientation ]]]]]])
          */
-        if (!in_array($orientation, array('P','L'))) {
+        if (!in_array($orientation, array('P', 'L'))) {
             $orientation = 'P';
         }
         //$this->pdf = $pdf = new mPDF('UTF-8', $pageFormat, '', '', 30, 20, 27, 25, 16, 13, $orientation);
@@ -111,7 +111,7 @@ 
             $visualTheme = api_get_visual_theme();
             $img = api_get_path(SYS_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png';
             if (file_exists($img)) {
-                $img = api_get_path(WEB_CSS_PATH) . 'themes/' . $visualTheme . '/images/pdf_logo_header.png';
+                $img = api_get_path(WEB_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png';
                 $organization = "<img src='$img'>";
             }
         }
@@ -229,7 +229,7 @@ 
         }
 
         // Clean styles and javascript document
-        $clean_search = array (
+        $clean_search = array(
             '@<script[^>]*?>.*?</script>@si',
             '@<style[^>]*?>.*?</style>@si'
         );
@@ -250,7 +250,7 @@ 
             // then print the title in the PDF
             if (is_array($file) && isset($file['title'])) {
                 $html_title = $file['title'];
-                $file  = $file['path'];
+                $file = $file['path'];
             } else {
                 //we suppose we've only been sent a file path
                 $html_title = basename($file);
@@ -282,7 +282,7 @@ 
             //it's not a chapter but the file exists, print its title
             if ($print_title) {
                 $this->pdf->WriteHTML(
-                    '<html><body><h3>' . $html_title . '</h3></body></html>',
+                    '<html><body><h3>'.$html_title.'</h3></body></html>',
                     2
                 );
             }
@@ -292,12 +292,12 @@ 
 
             if (in_array($extension, array('html', 'htm'))) {
                 $filename = $file_info['basename'];
-                $filename = str_replace('_',' ',$filename);
+                $filename = str_replace('_', ' ', $filename);
 
                 if ($extension == 'html') {
-                    $filename = basename($filename,'.html');
-                } elseif($extension == 'htm'){
-                    $filename = basename($filename,'.htm');
+                    $filename = basename($filename, '.html');
+                } elseif ($extension == 'htm') {
+                    $filename = basename($filename, '.htm');
                 }
 
                 $document_html = @file_get_contents($file);
@@ -308,7 +308,7 @@ 
                 $document_html = str_replace('href="./css/frames.css"', $absolute_css_path, $document_html);
 
                 if (!empty($course_data['path'])) {
-                    $document_html= str_replace('../','', $document_html);
+                    $document_html = str_replace('../', '', $document_html);
                     $document_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document/';
 
                     $doc = new DOMDocument();
@@ -340,7 +340,7 @@ 
                                         $new_path = $old_src;
                                     }
 
-                                    $document_html= str_replace($old_src, $new_path, $document_html);
+                                    $document_html = str_replace($old_src, $new_path, $document_html);
                                 }
                             } else {
                                 //Check if this is a complete URL
@@ -368,7 +368,7 @@ 
                 if (!empty($document_html)) {
                     $this->pdf->WriteHTML($document_html.$page_break, 2);
                 }
-            } elseif (in_array($extension, array('jpg','jpeg','png','gif'))) {
+            } elseif (in_array($extension, array('jpg', 'jpeg', 'png', 'gif'))) {
                 //Images
                 $image = Display::img($file);
                 $this->pdf->WriteHTML('<html><body>'.$image.'</body></html>'.$page_break, 2);
@@ -417,7 +417,7 @@ 
         }
 
         //clean styles and javascript document
-        $clean_search = array (
+        $clean_search = array(
             '@<script[^>]*?>.*?</script>@si',
             '@<style[^>]*?>.*?</style>@siU'
         );
@@ -431,11 +431,11 @@ 
 
         //absolute path for frames.css //TODO: necessary?
         $absolute_css_path = api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/frames.css';
-        $document_html = str_replace('href="./css/frames.css"','href="'.$absolute_css_path.'"', $document_html);
+        $document_html = str_replace('href="./css/frames.css"', 'href="'.$absolute_css_path.'"', $document_html);
 
-        $document_html= str_replace('../../','',$document_html);
-        $document_html= str_replace('../','',$document_html);
-        $document_html= str_replace((empty($_configuration['url_append'])?'':$_configuration['url_append'].'/').'courses/'.$course_code.'/document/','',$document_html);
+        $document_html = str_replace('../../', '', $document_html);
+        $document_html = str_replace('../', '', $document_html);
+        $document_html = str_replace((empty($_configuration['url_append']) ? '' : $_configuration['url_append'].'/').'courses/'.$course_code.'/document/', '', $document_html);
 
         if (!empty($course_data['path'])) {
             $document_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document/';
@@ -456,7 +456,7 @@ 
                                 $old_src_fixed = str_replace('/courses/'.$course_data['path'].'/document/', '', $old_src);
                                 $old_src_fixed = str_replace('courses/'.$course_data['path'].'/document/', '', $old_src_fixed);
                                 $new_path = $document_path.$old_src_fixed;
-                                $document_html= str_replace($old_src, $new_path, $document_html);
+                                $document_html = str_replace($old_src, $new_path, $document_html);
 
                             }
                         }
@@ -475,7 +475,7 @@ 
         //$document_html= str_replace('temp_template_path', 'src="/main/default_course_document/', $document_html);// restore src templates
 
         api_set_encoding_html($document_html, 'UTF-8'); // The library mPDF expects UTF-8 encoded input data.
-        $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8');  // TODO: Maybe it is better idea the title to be passed through
+        $title = api_get_title_html($document_html, 'UTF-8', 'UTF-8'); // TODO: Maybe it is better idea the title to be passed through
         // $_GET[] too, as it is done with file name.
         // At the moment the title is retrieved from the html document itself.
 
@@ -497,7 +497,7 @@ 
         //$this->pdf->Output($output_file, $outputMode); // F to save the pdf in a file
 
         if ($outputMode == 'F') {
-            $output_file = api_get_path(SYS_ARCHIVE_PATH) . $output_file;
+            $output_file = api_get_path(SYS_ARCHIVE_PATH).$output_file;
         }
 
         if ($saveInFile) {
@@ -530,14 +530,14 @@ 
         $web_path = false;
         if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
             $course_info = api_get_course_info($course_code);
-            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';   // course path
+            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
             if (file_exists($store_path)) {
-                $web_path   = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
+                $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/'.api_get_current_access_url_id().'_pdf_watermark.png';
             }
         } else {
-            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';   // course path
+            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png'; // course path
             if (file_exists($store_path))
-                $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
+                $web_path = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
         }
         return $web_path;
     }
@@ -576,10 +576,10 @@ 
     {
         if (!empty($course_code) && api_get_setting('pdf_export_watermark_by_course') == 'true') {
             $course_info = api_get_course_info($course_code);
-            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'];   // course path
+            $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path']; // course path
             $web_path   = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/pdf_watermark.png';
         } else {
-            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images';   // course path
+            $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images'; // course path
             $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
         }
         $course_image = $store_path.'/'.api_get_current_access_url_id().'_pdf_watermark.png';
@@ -614,9 +614,9 @@ 
      */
     public function set_footer()
     {
-        $this->pdf->defaultfooterfontsize = 12;   // in pts
-        $this->pdf->defaultfooterfontstyle = B;   // blank, B, I, or BI
-        $this->pdf->defaultfooterline = 1;        // 1 to include line below header/above footer
+        $this->pdf->defaultfooterfontsize = 12; // in pts
+        $this->pdf->defaultfooterfontstyle = B; // blank, B, I, or BI
+        $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer
         $platform_name   = api_get_setting('Institution');
         $left_content    = $platform_name;
         $center_content  = '';
@@ -682,9 +682,9 @@ 
      */
     public function set_header($course_data)
     {
-        $this->pdf->defaultheaderfontsize   = 10;   // in pts
-        $this->pdf->defaultheaderfontstyle  = 'BI';   // blank, B, I, or BI
-        $this->pdf->defaultheaderline       = 1;    // 1 to include line below header/above footer
+        $this->pdf->defaultheaderfontsize   = 10; // in pts
+        $this->pdf->defaultheaderfontstyle  = 'BI'; // blank, B, I, or BI
+        $this->pdf->defaultheaderline       = 1; // 1 to include line below header/above footer
 
         if (!empty($course_data['code'])) {
             $teacher_list = CourseManager::get_teacher_list_from_course_code($course_data['code']);
@@ -693,7 +693,7 @@ 
             if (!empty($teacher_list)) {
 
                 foreach ($teacher_list as $teacher) {
-                    $teachers[]= $teacher['firstname'].' '.$teacher['lastname'];
+                    $teachers[] = $teacher['firstname'].' '.$teacher['lastname'];
                 }
                 if (count($teachers) > 1) {
                     $teachers = get_lang('Teachers').': '.implode(', ', $teachers);
@@ -760,7 +760,7 @@ 
                     'line' => 1,
                 ),
             );
-            $this->pdf->SetHeader($header);// ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title);
+            $this->pdf->SetHeader($header); // ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title);
         }
     }
 
@@ -805,7 +805,7 @@ 
         $this->pdf->directionality = api_get_text_direction();
         $this->pdf->useOnlyCoreFonts = true;
         // Use different Odd/Even headers and footers and mirror margins
-        $this->pdf->mirrorMargins       = 1;
+        $this->pdf->mirrorMargins = 1;
 
         // Add decoration only if not stated otherwise
         if ($complete) {
@@ -833,7 +833,7 @@ 
                     $watermark_text = api_get_setting('pdf_export_watermark_text');
                 }
                 if (!empty($watermark_text)) {
-                    $this->pdf->SetWatermarkText(strcode2utf($watermark_text),0.1);
+                    $this->pdf->SetWatermarkText(strcode2utf($watermark_text), 0.1);
                     $this->pdf->showWatermarkText = true;
                 }
             }
@@ -841,8 +841,8 @@ 
             if (empty($this->custom_header)) {
                 self::set_header($course_data);
             } else {
-                $this->pdf->SetHTMLHeader($this->custom_header,'E');
-                $this->pdf->SetHTMLHeader($this->custom_header,'O');
+                $this->pdf->SetHTMLHeader($this->custom_header, 'E');
+                $this->pdf->SetHTMLHeader($this->custom_header, 'O');
             }
 
             if (empty($this->custom_footer)) {

main/inc/lib/formvalidator/Element/receivers.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 	 */
 	function _createElements()
 	{
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array ('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('Everybody'), '0', array('onclick' => 'javascript:receivers_hide(\'receivers_to\')'));
 		$this->_elements[0]->setChecked(true);
-		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array ('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
+		$this->_elements[] = new HTML_QuickForm_Radio('receivers', '', get_lang('SelectGroupsUsers'), '1', array('onclick' => 'javascript:receivers_show(\'receivers_to\')'));
 		$this->_elements[] = new HTML_QuickForm_advmultiselect('to', '', $this->receivers);
 		$this->_elements[2]->setSelected($this->receivers_selected);
 	}

main/inc/lib/formvalidator/Element/DateRangePicker.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
         }
 
         $timePicker = 'true';
-        $timePickerValue =  $this->getAttribute('timePicker');
+        $timePickerValue = $this->getAttribute('timePicker');
         if (!empty($timePickerValue)) {
             $timePicker = $timePickerValue;
         }

main/inc/lib/formvalidator/Element/DatePicker.php

Spacing +7 added lines, -7 removed lines

@@ -44,12 +44,12 @@ 
             $value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
         }
 
-        return $this->getElementJS() . '
+        return $this->getElementJS().'
             <div class="input-group">
                 <span class="input-group-addon">
-                    <input ' . $this->_getAttrString($this->_attributes) . '>
+                    <input ' . $this->_getAttrString($this->_attributes).'>
                 </span>
-                <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
+                <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
             </div>
         ';
     }
@@ -79,14 +79,14 @@ 
         $js .= "<script>
             $(function() {
                 $('#$id').hide().datepicker({
-                    defaultDate: '" . $this->getValue() . "',
+                    defaultDate: '".$this->getValue()."',
                     dateFormat: 'yy-mm-dd',
                     altField: '#{$id}_alt',
-                    altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
+                    altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
                     showOn: 'both',
-                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
+                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
                     buttonImageOnly: true,
-                    buttonText: '" . get_lang('SelectDate') . "',
+                    buttonText: '" . get_lang('SelectDate')."',
                     changeMonth: true,
                     changeYear: true,
                     yearRange: 'c-60y:c+5y'

main/inc/lib/formvalidator/Element/SelectAjax.php

Spacing +3 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
         $iso = api_get_language_isocode(api_get_interface_language());
         $languageCondition = '';
 
-        if (file_exists(api_get_path(SYS_PATH) . "web/assets/select2/dist/js/i18n/$iso.js")) {
+        if (file_exists(api_get_path(SYS_PATH)."web/assets/select2/dist/js/i18n/$iso.js")) {
             $html .= api_get_asset("select2/dist/js/i18n/$iso.js");
             $languageCondition = "language: '$iso',";
         }
@@ -50,8 +50,7 @@ 
 
         //Get the minimumInputLength for select2
         $minimumInputLength = $this->getAttribute('minimumInputLength') > 3 ?
-            $this->getAttribute('minimumInputLength') :
-            3
+            $this->getAttribute('minimumInputLength') : 3
         ;
 
         $plHolder = $this->getAttribute('placeholder');
@@ -113,6 +112,6 @@ 
         $this->removeAttribute('url_function');
         $this->setAttribute('style', 'width: 100%;');
 
-        return parent::toHtml() . $html;
+        return parent::toHtml().$html;
     }
 }

main/inc/lib/formvalidator/Element/DateTimePicker.php

Spacing +9 added lines, -9 removed lines

@@ -38,12 +38,12 @@ 
             $value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
         }
 
-        return $this->getElementJS() . '
+        return $this->getElementJS().'
             <div class="input-group">
                 <span class="input-group-addon">
-                    <input ' . $this->_getAttrString($this->_attributes) . '>
+                    <input ' . $this->_getAttrString($this->_attributes).'>
                 </span>
-                <input class="form-control" type="text" readonly id="' . $id . '_alt" value="' . $value . '">
+                <input class="form-control" type="text" readonly id="' . $id.'_alt" value="'.$value.'">
             </div>
         ';
     }
@@ -73,18 +73,18 @@ 
         $js .= "<script>
             $(function() {
                 $('#$id').hide().datetimepicker({
-                    defaultDate: '" . $this->getValue() . "',
+                    defaultDate: '".$this->getValue()."',
                     dateFormat: 'yy-mm-dd',
                     timeFormat: 'HH:mm',
                     altField: '#{$id}_alt',
-                    altFormat: \"" . get_lang('DateFormatLongNoDayJS') . "\",
-                    altTimeFormat: \"" . get_lang('TimeFormatNoSecJS') . "\",
-                    altSeparator: \" " . get_lang('AtTime') . " \",
+                    altFormat: \"".get_lang('DateFormatLongNoDayJS')."\",
+                    altTimeFormat: \"" . get_lang('TimeFormatNoSecJS')."\",
+                    altSeparator: \" " . get_lang('AtTime')." \",
                     altFieldTimeOnly: false,
                     showOn: 'both',
-                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true) . "',
+                    buttonImage: '" . Display::return_icon('attendance.png', null, [], ICON_SIZE_TINY, true, true)."',
                     buttonImageOnly: true,
-                    buttonText: '" . get_lang('SelectDate') . "',
+                    buttonText: '" . get_lang('SelectDate')."',
                     changeMonth: true,
                     changeYear: true
                 });