chamilo / chamilo-lms

main/inc/lib/message.lib.php

Braces +24 added lines, -16 removed lines

@@ -131,8 +131,9 @@ 
             $direction = 'DESC';
         } else {
             $column = intval($column);
-            if (!in_array($direction, array('ASC', 'DESC')))
-                $direction = 'ASC';
+            if (!in_array($direction, array('ASC', 'DESC'))) {
+                            $direction = 'ASC';
+            }
         }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
 
@@ -488,8 +489,9 @@ 
     public static function delete_message_by_user_receiver($user_receiver_id, $id)
     {
         $table_message = Database::get_main_table(TABLE_MESSAGE);
-        if ($id != strval(intval($id)))
-            return false;
+        if ($id != strval(intval($id))) {
+                    return false;
+        }
         $user_receiver_id = intval($user_receiver_id);
         $id = intval($id);
         $sql = "SELECT * FROM $table_message
@@ -664,8 +666,9 @@ 
      */
     public static function update_message($user_id, $message_id)
     {
-        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
 
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $sql = "UPDATE $table_message SET msg_status = '0'
@@ -705,8 +708,9 @@ 
      */
     public static function get_message_by_user($user_id, $message_id)
     {
-        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "SELECT * FROM $table_message
                   WHERE user_receiver_id=".intval($user_id)." AND id='".intval($message_id)."'";
@@ -721,8 +725,9 @@ 
      */
     public static function get_messages_by_group($group_id)
     {
-        if ($group_id != strval(intval($group_id)))
-            return false;
+        if ($group_id != strval(intval($group_id))) {
+                    return false;
+        }
 
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
@@ -749,8 +754,9 @@ 
      */
     public static function get_messages_by_group_by_message($group_id, $message_id)
     {
-        if ($group_id != strval(intval($group_id)))
-            return false;
+        if ($group_id != strval(intval($group_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $group_id = intval($group_id);
         $sql = "SELECT * FROM $table_message
@@ -828,8 +834,9 @@ 
      */
     public static function exist_message($user_id, $id)
     {
-        if ($id != strval(intval($id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($id != strval(intval($id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "SELECT id FROM $table_message
                   WHERE
@@ -860,8 +867,9 @@ 
             $direction = 'DESC';
         } else {
             $column = intval($column);
-            if (!in_array($direction, array('ASC', 'DESC')))
-                $direction = 'ASC';
+            if (!in_array($direction, array('ASC', 'DESC'))) {
+                            $direction = 'ASC';
+            }
         }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $request = api_is_xml_http_request();

main/inc/lib/search/xapian/XapianIndexer.class.php

Braces +9 added lines, -6 removed lines

@@ -70,13 +70,16 @@
      */
     function connectDb($path = null, $dbMode = null, $lang = 'english')
     {
-        if ($this->db != null)
-            return $this->db;
-        if ($dbMode == null)
-            $dbMode = Xapian::DB_CREATE_OR_OPEN;
+        if ($this->db != null) {
+                    return $this->db;
+        }
+        if ($dbMode == null) {
+                    $dbMode = Xapian::DB_CREATE_OR_OPEN;
+        }
 
-        if ($path == null)
-            $path = api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/';
+        if ($path == null) {
+                    $path = api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/';
+        }
 
         try {
             $this->db = new XapianWritableDatabase($path, $dbMode);

main/inc/lib/search/search_widget.php

Braces +12 added lines, -5 removed lines

@@ -48,7 +48,9 @@ 
 
     foreach ($sf_term_array as $raw_term) {
         $term = substr($raw_term, 1);
-        if (empty($term)) continue;
+        if (empty($term)) {
+            continue;
+        }
         $html_term = htmlspecialchars($term, ENT_QUOTES, $charset);
         $selected = '';
         if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) {
@@ -69,7 +71,9 @@ 
     $max = count($sf_terms);
     $multiple_selects .='';
     foreach ($sf_terms as $prefix => $sf_term_array) {
-        if ($prefix == $prefilter_prefix) continue;
+        if ($prefix == $prefilter_prefix) {
+            continue;
+        }
         $multiple_select = '';
         if ($i>0) {
             //print "+" image
@@ -342,9 +346,10 @@ 
 
 	// Tool introduction
     // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here.
-    if (api_get_course_id() !== -1)
-    if (!empty($groupId)) {
+    if (api_get_course_id() !== -1) {
+        if (!empty($groupId)) {
         Display::display_introduction_section(TOOL_SEARCH.$groupId);
+    }
     } else {
         Display::display_introduction_section(TOOL_SEARCH);
     }
@@ -366,7 +371,9 @@ 
                     break;
                 }
             }
-            if ($thesaurus_decided) break;
+            if ($thesaurus_decided) {
+                break;
+            }
         }
     }
 

main/inc/lib/search/ChamiloIndexer.class.php

Braces +6 added lines, -4 removed lines

@@ -36,8 +36,9 @@ 
         $stored_terms = $this->get_terms_on_db($prefix, $course_code, $tool_id, $ref_id_high_level);
 
         // don't do anything if no change, verify only at DB, not the search engine
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return FALSE;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return FALSE;
+        }
 
         require_once api_get_path(LIBRARY_PATH) . 'search/xapian/XapianQuery.php';
 
@@ -45,8 +46,9 @@ 
         $doc = $this->get_document($search_did);
         $xapian_terms = xapian_get_doc_terms($doc, $prefix);
         $xterms = array();
-        foreach ($xapian_terms as $xapian_term)
-            $xterms[] = substr($xapian_term['name'], 1);
+        foreach ($xapian_terms as $xapian_term) {
+                    $xterms[] = substr($xapian_term['name'], 1);
+        }
 
         $dterms = $terms;
 

main/inc/lib/baker.lib.php

Braces +9 added lines, -4 removed lines

@@ -94,8 +94,9 @@ 
         // Read the magic bytes and verify
         $retval = substr($png,0,8);
         $ipos = 8;
-        if ($retval != "\x89PNG\x0d\x0a\x1a\x0a")
-            throw new Exception('Is not a valid PNG image');
+        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);
         $ipos = $ipos + 8;
@@ -107,13 +108,17 @@ 
                 $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);
             $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);
             $ipos = $ipos + 8;

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

Braces +120 added lines, -162 removed lines

@@ -344,8 +344,7 @@ 
         // ----- Look for the optional second argument

         if ($v_size == 2) {

           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];

-        }

-        else if ($v_size > 2) {

+        } else if ($v_size > 2) {

           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,

 		                       "Invalid number / type of arguments");

           return 0;

@@ -394,8 +393,7 @@ 
       foreach ($v_string_list as $v_string) {

         if ($v_string != '') {

           $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;

-        }

-        else {

+        } else {

         }

       }

     }

@@ -529,8 +527,7 @@ 
         // ----- Look for the optional second argument

         if ($v_size == 2) {

           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];

-        }

-        else if ($v_size > 2) {

+        } else if ($v_size > 2) {

           // ----- Error log

           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

 

@@ -806,8 +803,7 @@ 
         // ----- Look for the optional second argument

         if ($v_size == 2) {

           $v_remove_path = $v_arg_list[1];

-        }

-        else if ($v_size > 2) {

+        } else if ($v_size > 2) {

           // ----- Error log

           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

 

@@ -951,8 +947,7 @@ 
         }

         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {

           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;

-        }

-        else {

+        } else {

         }

       }

 

@@ -967,8 +962,7 @@ 
         // ----- Look for the optional second argument

         if ($v_size == 2) {

           $v_remove_path = $v_arg_list[1];

-        }

-        else if ($v_size > 2) {

+        } else if ($v_size > 2) {

           // ----- Error log

           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

 

@@ -1204,8 +1198,7 @@ 
         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");

         $v_result = PCLZIP_ERR_MISSING_FILE;

-      }

-      else {

+      } else {

         // ----- Duplicate the archive

         $v_result = $this->privDuplicate($p_archive);

       }

@@ -1293,8 +1286,7 @@ 
   {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

       return(PclErrorCode());

-    }

-    else {

+    } else {

       return($this->error_code);

     }

   }

@@ -1332,15 +1324,13 @@ 
 

     if (isset($v_name[$this->error_code])) {

       $v_value = $v_name[$this->error_code];

-    }

-    else {

+    } else {

       $v_value = 'NoName';

     }

 

     if ($p_with_code) {

       return($v_value.' ('.$this->error_code.')');

-    }

-    else {

+    } else {

       return($v_value);

     }

   }

@@ -1355,12 +1345,10 @@ 
   {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

       return(PclErrorString());

-    }

-    else {

+    } else {

       if ($p_full) {

         return($this->errorName(true)." : ".$this->error_string);

-      }

-      else {

+      } else {

         return($this->error_string." [code ".$this->error_code."]");

       }

     }

@@ -1545,8 +1533,7 @@ 
               && ($p_options_list[$i+1] != '')) {

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

             $i++;

-          }

-          else {

+          } else {

           }

         break;

 

@@ -1564,11 +1551,9 @@ 
           // ----- Get the value

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

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

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

-          }

-          else {

+          } else {

             // ----- Error log

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

 

@@ -1597,8 +1582,7 @@ 
           // ----- Get the value

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

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

-          }

-          else {

+          } else {

             // ----- Error log

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

 

@@ -1627,8 +1611,7 @@ 
           // ----- Get the value

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

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

-          }

-          else {

+          } else {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,

 			                     "Wrong parameter value for option '"

@@ -1661,14 +1644,11 @@ 
 

               // ----- Parse items

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

-          }

-          else if (is_integer($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])) {

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

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

-          }

-          else {

+          } else {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1695,13 +1675,11 @@ 
                   // ----- Set the option value

                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];

                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];

-              }

-              elseif ($v_size_item_list == 2) {

+              } elseif ($v_size_item_list == 2) {

                   // ----- Set the option value

                   $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];

                   $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];

-              }

-              else {

+              } else {

                   // ----- Error log

                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

@@ -1857,14 +1835,17 @@ 
     $v_memory_limit = trim($v_memory_limit);

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

 

-    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*1024*1024;

-        $v_memory_limit = $v_memory_limit*1048576;

-    if($last == 'k')

-        $v_memory_limit = $v_memory_limit*1024;

+    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*1024*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);

 

@@ -2037,15 +2018,12 @@ 
       if (file_exists($v_descr['filename'])) {

         if (@is_file($v_descr['filename'])) {

           $v_descr['type'] = 'file';

-        }

-        else if (@is_dir($v_descr['filename'])) {

+        } else if (@is_dir($v_descr['filename'])) {

           $v_descr['type'] = 'folder';

-        }

-        else if (@is_link($v_descr['filename'])) {

+        } else if (@is_link($v_descr['filename'])) {

           // skip

           continue;

-        }

-        else {

+        } else {

           // skip

           continue;

         }

@@ -2094,8 +2072,7 @@ 
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {

               if ($v_descr['stored_filename'] != '') {

                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;

-              }

-              else {

+              } else {

                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;

               }

             }

@@ -2104,8 +2081,7 @@ 
           }

 

           @closedir($v_folder_handler);

-        }

-        else {

+        } else {

           // TBC : unable to open folder in read mode

         }

 

@@ -2118,8 +2094,7 @@ 
 

           // ----- Concat the resulting list

           $v_result_list = array_merge($v_result_list, $v_dirlist_descr);

-        }

-        else {

+        } else {

         }

 

         // ----- Free local array

@@ -2393,8 +2368,9 @@ 
   {

     $v_result=1;

 

-    if ($this->zip_fd != 0)

-      @fclose($this->zip_fd);

+    if ($this->zip_fd != 0) {
+          @fclose($this->zip_fd);
+    }
     $this->zip_fd = 0;

 

     // ----- Return

@@ -2611,11 +2587,9 @@ 
     // ----- Look for filetime

     if (isset($p_filedescr['mtime'])) {

       $p_header['mtime'] = $p_filedescr['mtime'];

-    }

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

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

       $p_header['mtime'] = time();

-    }

-    else {

+    } else {

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

     }

 

@@ -2623,8 +2597,7 @@ 
     if (isset($p_filedescr['comment'])) {

       $p_header['comment_len'] = strlen($p_filedescr['comment']);

       $p_header['comment'] = $p_filedescr['comment'];

-    }

-    else {

+    } else {

       $p_header['comment_len'] = 0;

       $p_header['comment'] = '';

     }

@@ -2935,20 +2908,17 @@ 
     $p_filename = $p_filedescr['filename'];

     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {

       $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];

-    }

-    else {

+    } else {

       $p_add_dir = '';

     }

     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {

       $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];

-    }

-    else {

+    } else {

       $p_remove_dir = '';

     }

     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {

       $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];

-    }

-    else {

+    } else {

       $p_remove_all_dir = 0;

     }

 

@@ -2971,8 +2941,7 @@ 
           $v_dir = $v_path_info['dirname'].'/';

         }

         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];

-      }

-      else {

+      } else {

         // ----- Calculate the stored filename

         $v_stored_filename = $p_filename;

       }

@@ -2983,8 +2952,9 @@ 
       }

       // ----- Look for partial path remove

       else if ($p_remove_dir != "") {

-        if (substr($p_remove_dir, -1) != '/')

-          $p_remove_dir .= "/";

+        if (substr($p_remove_dir, -1) != '/') {
+                  $p_remove_dir .= "/";
+        }
 

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

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

@@ -3004,8 +2974,7 @@ 
         if ($v_compare > 0) {

           if ($v_compare == 2) {

             $v_stored_filename = "";

-          }

-          else {

+          } else {

             $v_stored_filename = substr($v_stored_filename,

                                         strlen($p_remove_dir));

           }

@@ -3017,10 +2986,11 @@ 
 

       // ----- Look for path to add

       if ($p_add_dir != "") {

-        if (substr($p_add_dir, -1) == "/")

-          $v_stored_filename = $p_add_dir.$v_stored_filename;

-        else

-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;

+        if (substr($p_add_dir, -1) == "/") {
+                  $v_stored_filename = $p_add_dir.$v_stored_filename;
+        } else {
+                  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        }
       }

     }

 

@@ -3303,8 +3273,9 @@ 
     if (   ($p_path == "")

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

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

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

-      $p_path = "./".$p_path;

+			&& (substr($p_path,1,2)!=":/"))) {
+          $p_path = "./".$p_path;
+    }
 

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

     if (($p_path != "./") && ($p_path != "/"))

@@ -3791,8 +3762,7 @@ 
         // ----- Change the file status

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

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

-	  	  }

-		    else {

+	  	  } else {

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

 

             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

@@ -3808,19 +3778,19 @@ 
                 return PclZip::errorCode();

 		      }

 		    }

-      }

-      else {

+      } else {

       }

     }

 

     // ----- Check the directory availability and create it if necessary

     else {

-      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 ((($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) {

 

@@ -3876,8 +3846,7 @@ 
           touch($p_entry['filename'], $p_entry['mtime']);

 

 

-        }

-        else {

+        } else {

           // ----- TBC

           // Need to be finished

           if (($p_entry['flag'] & 1) == 1) {

@@ -4120,8 +4089,7 @@ 
           // ----- Send the file to the output

           echo $v_buffer;

           unset($v_buffer);

-        }

-        else {

+        } else {

 

           // ----- Read the compressed file in a buffer (one shot)

           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);

@@ -4231,8 +4199,7 @@ 
 

           // ----- Reading the file

           $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);

-        }

-        else {

+        } else {

 

           // ----- Reading the file

           $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);

@@ -4244,8 +4211,7 @@ 
         }

 

         // ----- Trace

-      }

-      else {

+      } else {

           // TBC : error : can not extract a folder in a string

       }

 

@@ -4338,8 +4304,7 @@ 
     // ----- Get extra_fields

     if ($v_data['extra_len'] != 0) {

       $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);

-    }

-    else {

+    } else {

       $p_header['extra'] = '';

     }

 

@@ -4370,8 +4335,7 @@ 
       // ----- Get UNIX date format

       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);

 

-    }

-    else

+    } else

     {

       $p_header['mtime'] = time();

     }

@@ -4436,29 +4400,33 @@ 
     $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);

 

     // ----- Get filename

-    if ($p_header['filename_len'] != 0)

-      //

+    if ($p_header['filename_len'] != 0) {
+          //

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

       // A patch about stored filenames with backslash directory separator (Windows style).

       // Archives created by the utility IZArc 3.81 (possibly new versions too) need this patch.

       //$p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);

-      $p_header['filename'] = str_replace("\\", '/', fread($this->zip_fd, $p_header['filename_len']));

+      $p_header['filename'] = str_replace("\\", '/', fread($this->zip_fd, $p_header['filename_len']));
+    }
       // --------------------------------------------------------------------------------

       //

-    else

-      $p_header['filename'] = '';

+    else {
+          $p_header['filename'] = '';
+    }
 

     // ----- Get extra

-    if ($p_header['extra_len'] != 0)

-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);

-    else

-      $p_header['extra'] = '';

+    if ($p_header['extra_len'] != 0) {
+          $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    } else {
+          $p_header['extra'] = '';
+    }
 

     // ----- Get comment

-    if ($p_header['comment_len'] != 0)

-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);

-    else

-      $p_header['comment'] = '';

+    if ($p_header['comment_len'] != 0) {
+          $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    } else {
+          $p_header['comment'] = '';
+    }
 

     // ----- Extract properties

 

@@ -4480,8 +4448,7 @@ 
       // ----- Get UNIX date format

       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);

 

-    }

-    else

+    } else

     {

       $p_header['mtime'] = time();

     }

@@ -4594,8 +4561,9 @@ 
     // ----- Go back to the maximum possible size of the Central Dir End Record

     if (!$v_found) {

       $v_maximum_size = 65557; // 0xFFFF + 22;

-      if ($v_maximum_size > $v_size)

-        $v_maximum_size = $v_size;

+      if ($v_maximum_size > $v_size) {
+              $v_maximum_size = $v_size;
+      }
       @fseek($this->zip_fd, $v_size-$v_maximum_size);

       if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))

       {

@@ -4680,9 +4648,9 @@ 
     // ----- Get comment

     if ($v_data['comment_size'] != 0) {

       $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);

-    }

-    else

-      $p_central_dir['comment'] = '';

+    } else {
+          $p_central_dir['comment'] = '';
+    }
 

     $p_central_dir['entries'] = $v_data['entries'];

     $p_central_dir['disk_entries'] = $v_data['disk_entries'];

@@ -4782,8 +4750,7 @@ 
                   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;

                   }

@@ -4834,8 +4801,7 @@ 
                   break;

               }

           }

-      }

-      else {

+      } else {

       	$v_found = true;

       }

 

@@ -4843,8 +4809,7 @@ 
       if ($v_found)

       {

         unset($v_header_list[$v_nb_extracted]);

-      }

-      else

+      } else

       {

         $v_nb_extracted++;

       }

@@ -5320,8 +5285,7 @@ 
   {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

       PclError($p_error_code, $p_error_string);

-    }

-    else {

+    } else {

       $this->error_code = $p_error_code;

       $this->error_string = $p_error_string;

     }

@@ -5337,8 +5301,7 @@ 
   {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

       PclErrorReset();

-    }

-    else {

+    } else {

       $this->error_code = 0;

       $this->error_string = '';

     }

@@ -5436,11 +5399,9 @@ 
         if ($v_list[$i] == ".") {

           // ----- Ignore this directory

           // Should be the first $i=0, but no check is done

-        }

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

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

 		  $v_skip++;

-        }

-        else if ($v_list[$i] == "") {

+        } else if ($v_list[$i] == "") {

 		  // ----- First '/' i.e. root slash

 		  if ($i == 0) {

             $v_result = "/".$v_result;

@@ -5460,13 +5421,11 @@ 
             // ----- Ignore only the double '//' in path,

             // but not the first and last '/'

 		  }

-        }

-        else {

+        } else {

 		  // ----- Look for item to skip

 		  if ($v_skip > 0) {

 		    $v_skip--;

-		  }

-		  else {

+		  } else {

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

 		  }

         }

@@ -5549,14 +5508,17 @@ 
     // ----- Look if everything seems to be the same

     if ($v_result) {

       // ----- Skip all the empty items

-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;

-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;

+      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+          $j++;
+      }
+      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+          $i++;
+      }
 

       if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {

         // ----- There are exactly the same

         $v_result = 2;

-      }

-      else if ($i < $v_list_dir_size) {

+      } else if ($i < $v_list_dir_size) {

         // ----- The path is shorter than the dir

         $v_result = 0;

       }

@@ -5591,8 +5553,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

       }

-    }

-    else if ($p_mode==1)

+    } else if ($p_mode==1)

     {

       while ($p_size != 0)

       {

@@ -5601,8 +5562,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

       }

-    }

-    else if ($p_mode==2)

+    } else if ($p_mode==2)

     {

       while ($p_size != 0)

       {

@@ -5611,8 +5571,7 @@ 
         @gzwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

       }

-    }

-    else if ($p_mode==3)

+    } else if ($p_mode==3)

     {

       while ($p_size != 0)

       {

@@ -5650,8 +5609,7 @@ 
       // ----- Try to copy & unlink the src

       if (!@copy($p_src, $p_dest)) {

         $v_result = 0;

-      }

-      else if (!@unlink($p_src)) {

+      } else if (!@unlink($p_src)) {

         $v_result = 0;

       }

     }

main/inc/lib/pdf.lib.php

Braces +3 added lines, -2 removed lines

@@ -536,8 +536,9 @@
             }
         } else {
             $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';
+            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';
+            }
         }
         return $web_path;
     }

main/inc/lib/pear/excelreader/OLERead.inc

Braces +4 added lines, -2 removed lines

@@ -240,14 +240,16 @@
 		    return $streamData;

     		

 

-    	}else{

+    	} else{

     	

 	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

 	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

 	            $numBlocks++;

 	        }

 	        

-	        if ($numBlocks == 0) return '';

+	        if ($numBlocks == 0) {
+	            return '';
+	        }
 	        

 	        //echo "numBlocks = $numBlocks\n";

 	    //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

main/inc/lib/pear/excelreader/reader.php

Braces +37 added lines, -27 removed lines

@@ -505,7 +505,7 @@ 
                                                 if ($spos + $len < $limitpos) {
                                                                 $retstr = substr($this->data, $spos, $len);
                                                                 $spos += $len;
-                                                }else{
+                                                } else{
                                                         // found countinue
                                                         $retstr = substr($this->data, $spos, $limitpos - $spos);
                                                         $bytesRead = $limitpos - $spos;
@@ -527,12 +527,12 @@ 
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len;
                                                                     $asciiEncoding = true;
-                                                                  }elseif (!$asciiEncoding && ($option != 0)){
+                                                                  } elseif (!$asciiEncoding && ($option != 0)){
                                                                                 $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len/2;
                                                                     $asciiEncoding = false;
-                                                                  }elseif (!$asciiEncoding && ($option == 0)) {
+                                                                  } elseif (!$asciiEncoding && ($option == 0)) {
                                                                 // Bummer - the string starts off as Unicode, but after the
                                                                 // continuation it is in straightforward ASCII encoding
                                                                                 $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
@@ -541,7 +541,7 @@ 
                                                                 }
                                                             $charsLeft -= $len;
                                                                 $asciiEncoding = false;
-                                                                  }else{
+                                                                  } else{
                                                             $newstr = '';
                                                                     for ($j = 0; $j < strlen($retstr); $j++) {
                                                                       $newstr = $retstr[$j].chr(0);
@@ -619,22 +619,24 @@ 
                                     'type' => 'date',
                                     'format' => $this->dateFormats[$indexCode]
                                     );
-                        }elseif (array_key_exists($indexCode, $this->numberFormats)) {
+                        } elseif (array_key_exists($indexCode, $this->numberFormats)) {
                         //echo "isnumber ".$this->numberFormats[$indexCode];
                             $this->formatRecords['xfrecords'][] = array(
                                     'type' => 'number',
                                     'format' => $this->numberFormats[$indexCode]
                                     );
-                        }else{
+                        } else{
                             $isdate = FALSE;
                             if ($indexCode > 0){
-                                if (isset($this->formatRecords[$indexCode]))
-                                    $formatstr = $this->formatRecords[$indexCode];
+                                if (isset($this->formatRecords[$indexCode])) {
+                                                                    $formatstr = $this->formatRecords[$indexCode];
+                                }
                                 //echo '.other.';
                                 //echo "\ndate-time=$formatstr=\n";
-                                if ($formatstr)
-                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
+                                if ($formatstr) {
+                                                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
                                     $isdate = TRUE;
+                                }
                                     $formatstr = str_replace('mm', 'i', $formatstr);
                                     $formatstr = str_replace('h', 'H', $formatstr);
                                     //echo "\ndate-time $formatstr \n";
@@ -646,7 +648,7 @@ 
                                         'type' => 'date',
                                         'format' => $formatstr,
                                         );
-                            }else{
+                            } else{
                                 $this->formatRecords['xfrecords'][] = array(
                                         'type' => 'other',
                                         'format' => '',
@@ -674,7 +676,7 @@ 
                             } else {
                                 $rec_name    = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2));
                             }
-                        }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
+                        } elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
                                 $rec_name    = substr($this->data, $pos+11, $rec_length);
                         }
                     $this->boundsheets[] = array('name'=>$rec_name,
@@ -733,7 +735,9 @@ 
             //echo "mem= ".memory_get_usage()."\n";
 //            $r = &$this->file->nextRecord();
             $lowcode = ord($this->data[$spos]);
-            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break;
+            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) {
+                break;
+            }
             $code = $lowcode | ord($this->data[$spos+1])<<8;
             $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
             $spos += 4;
@@ -783,7 +787,7 @@ 
                     //echo $numValue." ";
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($numValue);
-                    }else{
+                    } else{
                         $raw = $numValue;
                         if (isset($this->_columnsFormat[$column + 1])){
                                 $this->curformat = $this->_columnsFormat[$column + 1];
@@ -813,7 +817,7 @@ 
                         $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2));
                         if ($this->isDate($tmppos-4)) {
                             list($string, $raw) = $this->createDate($numValue);
-                        }else{
+                        } else{
                             $raw = $numValue;
                             if (isset($this->_columnsFormat[$colFirst + $i + 1])){
                                         $this->curformat = $this->_columnsFormat[$colFirst + $i + 1];
@@ -837,7 +841,7 @@ 
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($tmp['double']);
                      //   $this->addcell(DateRecord($r, 1));
-                    }else{
+                    } else{
                         //$raw = $tmp[''];
                         if (isset($this->_columnsFormat[$column + 1])){
                                 $this->curformat = $this->_columnsFormat[$column + 1];
@@ -869,7 +873,7 @@ 
                         if ($this->isDate($spos)) {
                             list($string, $raw) = $this->createDate($tmp['double']);
                          //   $this->addcell(DateRecord($r, 1));
-                        }else{
+                        } else{
                             //$raw = $tmp[''];
                             if (isset($this->_columnsFormat[$column + 1])){
                                     $this->curformat = $this->_columnsFormat[$column + 1];
@@ -913,10 +917,12 @@ 
             $spos += $length;
         }
 
-        if (!isset($this->sheets[$this->sn]['numRows']))
-             $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
-        if (!isset($this->sheets[$this->sn]['numCols']))
-             $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+        if (!isset($this->sheets[$this->sn]['numRows'])) {
+                     $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
+        }
+        if (!isset($this->sheets[$this->sn]['numCols'])) {
+                     $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+        }
 
     }
 
@@ -943,7 +949,7 @@ 
                 if (($xfindex == 0x9) || ($xfindex == 0xa)){
                     $this->multiplier = 100;
                 }
-            }else{
+            } else{
                 $this->curformat = $this->_defaultFormat;
                 $this->rectype = 'unknown';
             }
@@ -993,7 +999,9 @@ 
         $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
         $mantissalow2 = ($rknumlow & 0x7fffffff);
         $value = $mantissa / pow( 2 , (20- ($exp - 1023)));
-        if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        if ($mantissalow1 != 0) {
+            $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        }
         $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023)));
         //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n";
         if ($sign) {$value = -1 * $value;}
@@ -1006,10 +1014,12 @@ 
         $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset);
         $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset);
         $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string;
-        if ($raw)
-            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
-        if (isset($this->rectype))
-            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+        if ($raw) {
+                    $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
+        }
+        if (isset($this->rectype)) {
+                    $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+        }
 
     }