chamilo / chamilo-lms

main/inc/lib/myspace.lib.php

Braces +3 added lines, -1 removed lines

@@ -2097,7 +2097,9 @@
                 FROM $tbl_course course
                 WHERE course.code IN (".implode(',',$courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
         $column = intval($column);
         $from = intval($from);

main/inc/lib/nusoap/class.soapclient.php

Braces +6 added lines, -4 removed lines

@@ -173,8 +173,9 @@ 
 		}

 		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {

 			$this->loadWSDL();

-			if ($this->getError())

-				return false;

+			if ($this->getError()) {
+							return false;
+			}
 		}

 		// serialize parameters

 		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){

@@ -388,8 +389,9 @@ 
 	function getOperationData($operation){

 		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {

 			$this->loadWSDL();

-			if ($this->getError())

-				return false;

+			if ($this->getError()) {
+							return false;
+			}
 		}

 		if(isset($this->operations[$operation])){

 			return $this->operations[$operation];

main/inc/lib/nusoap/class.soap_transport_http.php

Braces +39 added lines, -29 removed lines

@@ -159,10 +159,12 @@ 
 	* @access	private

 	*/

 	function io_method() {

-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

-			return 'curl';

-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

-			return 'socket';

+		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) {
+					return 'curl';
+		}
+		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) {
+					return 'socket';
+		}
 		return 'unknown';

 	}

 

@@ -246,30 +248,36 @@ 
 			return false;

 		}

 		// Avoid warnings when PHP does not have these options

-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))

-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

-		else

-			$CURLOPT_CONNECTIONTIMEOUT = 78;

-		if (defined('CURLOPT_HTTPAUTH'))

-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

-		else

-			$CURLOPT_HTTPAUTH = 107;

-		if (defined('CURLOPT_PROXYAUTH'))

-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

-		else

-			$CURLOPT_PROXYAUTH = 111;

-		if (defined('CURLAUTH_BASIC'))

-			$CURLAUTH_BASIC = CURLAUTH_BASIC;

-		else

-			$CURLAUTH_BASIC = 1;

-		if (defined('CURLAUTH_DIGEST'))

-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;

-		else

-			$CURLAUTH_DIGEST = 2;

-		if (defined('CURLAUTH_NTLM'))

-			$CURLAUTH_NTLM = CURLAUTH_NTLM;

-		else

-			$CURLAUTH_NTLM = 8;

+		if (defined('CURLOPT_CONNECTIONTIMEOUT')) {
+					$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
+		} else {
+					$CURLOPT_CONNECTIONTIMEOUT = 78;
+		}
+		if (defined('CURLOPT_HTTPAUTH')) {
+					$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
+		} else {
+					$CURLOPT_HTTPAUTH = 107;
+		}
+		if (defined('CURLOPT_PROXYAUTH')) {
+					$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
+		} else {
+					$CURLOPT_PROXYAUTH = 111;
+		}
+		if (defined('CURLAUTH_BASIC')) {
+					$CURLAUTH_BASIC = CURLAUTH_BASIC;
+		} else {
+					$CURLAUTH_BASIC = 1;
+		}
+		if (defined('CURLAUTH_DIGEST')) {
+					$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
+		} else {
+					$CURLAUTH_DIGEST = 2;
+		}
+		if (defined('CURLAUTH_NTLM')) {
+					$CURLAUTH_NTLM = CURLAUTH_NTLM;
+		} else {
+					$CURLAUTH_NTLM = 8;
+		}
 

 		$this->debug('connect using cURL');

 		// init CURL

@@ -612,7 +620,9 @@ 
 								'HTTP/1.0 200 Connection established');

 		foreach ($skipHeaders as $hd) {

 			$prefix = substr($data, 0, strlen($hd));

-			if ($prefix == $hd) return true;

+			if ($prefix == $hd) {
+			    return true;
+			}
 		}

 

 		return false;

main/inc/lib/nusoap/class.wsdl.php

Braces +3 added lines, -2 removed lines

@@ -78,8 +78,9 @@
 		$this->proxypassword = $proxypassword;

 		$this->timeout = $timeout;

 		$this->response_timeout = $response_timeout;

-		if (is_array($curl_options))

-			$this->curl_options = $curl_options;

+		if (is_array($curl_options)) {
+					$this->curl_options = $curl_options;
+		}
 		$this->use_curl = $use_curl;

 		$this->fetchWSDL($wsdl);

     }

main/inc/lib/events_dispatcher.class.php

Braces +3 added lines, -1 removed lines

@@ -18,9 +18,11 @@
 
         foreach ($event_config[$event_name]["actions"] as $func) {
             $execute = true;
-            if (!function_exists($func)) // if the function doesn't exist, we log
+            if (!function_exists($func)) {
+                // if the function doesn't exist, we log
             {
                 error_log("EventsDispatcher warning : ".$func." does not exist.");
+            }
                 $execute = false;
             }
 

main/inc/lib/internationalization.lib.php

Braces +1 added lines, -2 removed lines

@@ -1710,8 +1710,7 @@
             }
         }
         return false;
-    }
-    elseif (is_array($encoding2)) {
+    } elseif (is_array($encoding2)) {
         foreach ($encoding2 as $encoding) {
             if (api_equal_encodings($encoding1, $encoding, $strict)) {
                 return true;

main/inc/lib/rights.lib.php

Braces +23 added lines, -15 removed lines

@@ -16,31 +16,39 @@
 	// warning the goal of this function is to enforce rights managment in Chamilo
 	// thus default return value is always true
 	public static function hasRight($handler) {
-		if (array_key_exists($handler, self::$rights_cache))
-			return self::$rights_cache[$handler];
+		if (array_key_exists($handler, self::$rights_cache)) {
+					return self::$rights_cache[$handler];
+		}
 
-		if (!array_key_exists($handler, self::$rights))
-			return true; // handler does not exists
+		if (!array_key_exists($handler, self::$rights)) {
+					return true;
+		}
+		// handler does not exists
 
 		if (self::$rights[$handler]['type'] == 'sql') {
 			$result = Database::query(self::$rights[$handler]['sql']);
-			if (Database::num_rows($result) > 0)
-				$result = true;
-			else
-				$result = false;
-		} else if (self::$rights[$handler]['type'] == 'const')
-			$result = self::$rights[$handler]['const'];
-		else if (self::$rights[$handler]['type'] == 'func')
-			$result = self::$rights[$handler]['func']();
-		else // handler type not implemented
+			if (Database::num_rows($result) > 0) {
+							$result = true;
+			} else {
+							$result = false;
+			}
+		} else if (self::$rights[$handler]['type'] == 'const') {
+					$result = self::$rights[$handler]['const'];
+		} else if (self::$rights[$handler]['type'] == 'func') {
+					$result = self::$rights[$handler]['func']();
+		} else {
+		    // handler type not implemented
 			return true;
+		}
 		self::$rights_cache[$handler] = $result;
 		return $result;
 	}
 
 	public static function hasRightClosePageWithError($handler) {
-		if (hasRight($handler) == false)
-			die("You are not allowed here"); //FIXME
+		if (hasRight($handler) == false) {
+					die("You are not allowed here");
+		}
+		//FIXME
 	}
 
 }

main/inc/lib/image.lib.php

Braces +57 added lines, -19 removed lines

@@ -154,7 +154,9 @@ 
 
     public function set_image_wrapper()
     {
-        if ($this->debug) error_log('Image::set_image_wrapper loaded');
+        if ($this->debug) {
+            error_log('Image::set_image_wrapper loaded');
+        }
         try {
             if (file_exists($this->path)) {
                 $this->image     = new Imagick($this->path);
@@ -163,10 +165,14 @@ 
                     $this->fill_image_info(); //Fills height, width and type
                 }
             } else {
-                if ($this->debug) error_log('Image::image does not exist');
+                if ($this->debug) {
+                    error_log('Image::image does not exist');
+                }
             }
         } catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
     }
 
@@ -180,7 +186,9 @@ 
 
         if (in_array($this->type, $this->allowed_extensions)) {
             $this->image_validated = true;
-            if ($this->debug) error_log('image_validated true');
+            if ($this->debug) {
+                error_log('image_validated true');
+            }
         }
     }
 
@@ -196,7 +204,9 @@ 
 	//@todo implement border logic case for Imagick
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
 
         if ($specific_size) {
             $width = $thumbw;
@@ -222,7 +232,9 @@ 
      */
     
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->image->cropimage($width, $height, $x, $y);
 		$this->width  = $width;
 		$this->height = $height;
@@ -230,7 +242,9 @@ 
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -238,20 +252,28 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				break;
 		}
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
 		} catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
 
 		if (!$file) {
@@ -334,7 +356,9 @@ 
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 		if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
@@ -387,7 +411,9 @@ 
      * @param int $src_height the source height of the original image
      */
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->width = $width;
 		$this->height = $height;
         $src = null;
@@ -418,7 +444,9 @@ 
 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
@@ -427,19 +455,27 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
+				if ($compress == -1) {
+				    $compress = 100;
+				}
 				return imagejpeg($this->bg, $file, $compress);
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
 				return imagepng($this->bg, $file, $compress);
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
@@ -456,7 +492,9 @@ 
      */
     function convert2bw()
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 
         $dest_img = imagecreatetruecolor(imagesx($this->bg), imagesy($this->bg));
         /* copy ignore the transparent color

main/inc/lib/text.lib.php

Braces +31 added lines, -20 removed lines

@@ -351,8 +351,9 @@ 
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
-        return $matches[0];
+    if ( empty($url) ) {
+            return $matches[0];
+    }
 
     return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -377,8 +378,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
     //$original_url = $url;
 
-    if ( '' == $url )
-        return $url;
+    if ( '' == $url ) {
+            return $url;
+    }
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
     $url = _deep_replace($strip, $url);
@@ -388,8 +390,9 @@ 
      * link starting with /, # or ? or a php file).
      */
     if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+            $url = 'http://' . $url;
+    }
 
     return Security::remove_XSS($url);
 
@@ -466,8 +469,9 @@ 
     $dest = $matches[2];
     $dest = 'http://' . $dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
-        return $matches[0];
+    if ( empty($dest) ) {
+            return $matches[0];
+    }
 
     // removed trailing [.,;:)] from URL
     if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
@@ -511,10 +515,11 @@ 
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
     foreach ( $textarr as $piece ) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
-            $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
-            $nested_code_pre--;
+        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) ) {
+                    $nested_code_pre++;
+        } elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre ) {
+                    $nested_code_pre--;
+        }
 
         if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
             $r .= $piece;
@@ -723,15 +728,13 @@ 
 			if($length>$maxchar)
 			{
 				break;
-			}
-			else
+			} else
 			{
 				$output = $output." ".$words[$i];
 				$i++;
 			};
 		};
-	}
-	else
+	} else
 	{
 		$output = $text;
 		return $output;
@@ -782,13 +785,21 @@ 
     if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
         $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        if (intval($month) < 10 ) {
+            $month = '0'.$month;
+        }
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10 ) {
+            $day = '0'.$day;
+        }
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10 ) {
+            $hours = '0'.$hours;
+        }
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10 ) {
+            $minutes = '0'.$minutes;
+        }
     }
     if (checkdate($month,$day,$year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;