chamilo / chamilo-lms

main/inc/lib/magpierss/rss_cache.inc

Braces +4 added lines, -8 removed lines

@@ -124,13 +124,11 @@ 
             if ( $this->MAX_AGE > $age ) {
                 // object exists and is current
                 return 'HIT';
-            }
-            else {
+            } else {
                 // object exists but is old
                 return 'STALE';
             }
-        }
-        else {
+        } else {
             // object does not exist
             return 'MISS';
         }
@@ -142,8 +140,7 @@ 
 			$mtime = filemtime( $filename );
             $age = time() - $mtime;
 			return $age;
-		}
-		else {
+		} else {
 			return -1;	
 		}
 	}
@@ -185,8 +182,7 @@ 
         $this->ERROR = $errormsg;
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
     }

main/inc/lib/magpierss/rss_utils.inc

Braces +2 added lines, -4 removed lines

@@ -37,8 +37,7 @@ 
         $offset = 0;
         if ( $match[10] == 'Z' ) {
             # zulu time, aka GMT
-        }
-        else {
+        } else {
             list( $tz_mod, $tz_hour, $tz_min ) =
                 array( $match[8], $match[9], $match[10]);
             
@@ -58,8 +57,7 @@ 
         }
         $epoch = $epoch + $offset;
         return $epoch;
-    }
-    else {
+    } else {
         return -1;
     }
 }

main/inc/lib/magpierss/extlib/Snoopy.class.inc

Braces +159 added lines, -118 removed lines

@@ -124,24 +124,26 @@ 
 	public function fetch($URI) {
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
 		if (!isset($fp)) { $fp = false; }
 		switch ($URI_PARTS["scheme"]) {
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -177,13 +179,12 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}					
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -195,14 +196,14 @@ 
 					return false;
 				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -236,9 +237,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}					
 				return true;					
@@ -279,14 +280,16 @@ 
 
 		while(list($key,$val) = each($links[2]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}				
 		
 		while(list($key,$val) = each($links[3]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}		
 		
 		// return the links
@@ -402,27 +405,31 @@ 
 	
 	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 			
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
+		if(!empty($this->agent)) {
+					$headers .= "User-Agent: ".$this->agent."\r\n";
+		}
+		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+					$headers .= "Host: ".$this->host."\r\n";
+		}
+		if(!empty($this->accept)) {
+					$headers .= "Accept: ".$this->accept."\r\n";
+		}
 		
 		if($this->use_gzip) {
 			// make sure PHP was built with --with-zlib
 			// and we can handle gzipp'ed data
 			if ( function_exists(gzinflate) ) {
 			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
+			} else {
 			   trigger_error(
 			   	"use_gzip is on, but PHP was built without zlib support.".
 				"  Requesting file(s) without gzip encoding.", 
@@ -430,12 +437,14 @@ 
 			}
 		}
 		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
+		if(!empty($this->referer)) {
+					$headers .= "Referer: ".$this->referer."\r\n";
+		}
 		if(!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 	
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -448,27 +457,33 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers .= $headerKey.": ".$headerVal."\r\n";
+			}
 		}
 		if(!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
+			if ($content_type == "multipart/form-data") {
+							$headers .= "; boundary=".$this->_mime_boundary;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+		if(!empty($body)) {
+					$headers .= "Content-length: ".strlen($body)."\r\n";
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+		}
 
 		$headers .= "\r\n";
 		
 		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
+		if ($this->read_timeout > 0) {
+					socket_set_timeout($fp, $this->read_timeout);
+		}
 		$this->timed_out = false;
 		
 		fwrite($fp,$headers.$body,strlen($headers.$body));
@@ -488,8 +503,9 @@ 
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+			if(preg_match("/^\r?\n$/", $currentHeader) ) {
+						      break;
+			}
 						
 			// if a header begins with Location: or URI:, set the redirect
 			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
@@ -502,13 +518,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$currentHeader))
@@ -561,15 +578,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 		
 		return true;
 	}
@@ -585,28 +605,35 @@ 
 	
 	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$headers = array();		
 					
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
+		if(!empty($this->agent)) {
+					$headers[] = "User-Agent: ".$this->agent;
+		}
+		if(!empty($this->host)) {
+					$headers[] = "Host: ".$this->host;
+		}
+		if(!empty($this->accept)) {
+					$headers[] = "Accept: ".$this->accept;
+		}
+		if(!empty($this->referer)) {
+					$headers[] = "Referer: ".$this->referer;
+		}
 		if(!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 	
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -619,31 +646,38 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers[] = $headerKey.": ".$headerVal;
+			}
 		}
 		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+			if ($content_type == "multipart/form-data") {
+							$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+			} else {
+							$headers[] = "Content-type: $content_type";
+			}
+		}
+		if(!empty($body)) {
+					$headers[] = "Content-length: ".strlen($body);
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+		}
 			
 		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
 		}
 			  	                         
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+		if(!empty($body)) {
+					$cmdline_params .= " -d \"$body\"";
+		}
 		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+		if($this->read_timeout > 0) {
+					$cmdline_params .= " -m ".$this->read_timeout;
+		}
 		
 		$headerfile = uniqid(time());
 		
@@ -681,13 +715,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
@@ -712,15 +747,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		unlink("/tmp/$headerfile");
 		
@@ -736,8 +774,9 @@ 
 	{
 		for($x=0; $x<count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
+		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match)) {
+					$this->cookies[$match[1]] = $match[2];
+		}
 		}
 	}
 
@@ -773,8 +812,7 @@ 
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -793,8 +831,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -837,8 +874,9 @@ 
 		settype($formvars, "array");
 		settype($formfiles, "array");
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+		if (count($formvars) == 0 && count($formfiles) == 0) {
+					return;
+		}
 		
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
@@ -848,8 +886,9 @@ 
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
 						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
+					} else {
+											$postdata .= urlencode($key)."=".urlencode($val)."&";
+					}
 				}
 				break;
 
@@ -875,7 +914,9 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if (!is_readable($file_name)) {
+						    continue;
+						}
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

main/inc/lib/magpierss/rss_parse.inc

Braces +47 added lines, -71 removed lines

@@ -165,12 +165,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -181,8 +179,7 @@ 
         if ( $el == 'channel' ) 
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        } elseif ($el == 'item' or $el == 'entry' ) 
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -198,9 +195,7 @@ 
             $el == 'textinput' ) 
         {
             $this->intextinput = true;
-        }
-        
-        elseif (
+        } elseif (
             $this->feed_type == RSS and 
             $this->current_namespace == '' and 
             $el == 'image' ) 
@@ -244,8 +239,7 @@ 
             if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
             
@@ -263,8 +257,7 @@ 
         if ($this->feed_type == ATOM and $this->incontent) 
         {
             $this->append_content( $text );
-        }
-        else {
+        } else {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
@@ -278,37 +271,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
         {
             $this->intextinput = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
         {
             $this->inimage = false;
-        }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {   
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        } elseif ($el == 'channel' or $el == 'feed' ) 
         {
             $this->inchannel = false;
-        }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        } elseif ($this->feed_type == ATOM and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el ) 
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift( $this->stack );
-        }
-        else {
+        } else {
             array_shift( $this->stack );
         }
         
@@ -327,8 +313,7 @@ 
     public function append_content($text) {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat( $this->channel[ $this->incontent ], $text );
         }
     }
@@ -343,34 +328,27 @@ 
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $this->current_namespace ][ $el ], $text );
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $el ], $text );
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $el ], $text );
             }
@@ -384,10 +362,12 @@ 
             $this->channel['description'] = $this->channel['tagline'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
-                    $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
-                    $item['content']['encoded'] = $item['atom_content'];
+                if ( isset($item['summary']) ) {
+                                    $item['description'] = $item['summary'];
+                }
+                if ( isset($item['atom_content'])) {
+                                    $item['content']['encoded'] = $item['atom_content'];
+                }
                 
                 $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
                 if ( $atom_date ) {
@@ -399,23 +379,23 @@ 
                 
                 $this->items[$i] = $item;
             }       
-        }
-        elseif ( $this->is_rss() ) {
+        } elseif ( $this->is_rss() ) {
             $this->channel['tagline'] = $this->channel['description'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
-                    $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
-                    $item['atom_content'] = $item['content']['encoded'];
+                if ( isset($item['description'])) {
+                                    $item['summary'] = $item['description'];
+                }
+                if ( isset($item['content']['encoded'] ) ) {
+                                    $item['atom_content'] = $item['content']['encoded'];
+                }
                 
                 if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
-                }
-                elseif ( isset($item['pubdate']) ) {
+                } elseif ( isset($item['pubdate']) ) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -431,8 +411,7 @@ 
     public function is_rss () {
         if ( $this->feed_type == RSS ) {
             return $this->feed_version; 
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -440,8 +419,7 @@ 
     public function is_atom() {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -453,8 +431,7 @@ 
     public function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
-        }
-        else {
+        } else {
             list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
         }
         if ($out_enc) {
@@ -478,8 +455,7 @@ 
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
             return xml_parser_create($in_enc);
-        }
-        else {
+        } else {
             return xml_parser_create('');
         }
     }
@@ -508,8 +484,7 @@ 
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
                 $this->source_encoding = $in_enc;
-            }
-            else {
+            } else {
                 $in_enc = 'UTF-8';
             }
         }
@@ -552,8 +527,7 @@ 
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
             return $enc;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -565,8 +539,7 @@ 
         }
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);        
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
         
@@ -594,8 +567,11 @@ 
 
 
 	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
+       if ($case=CASE_LOWER) {
+           $cmd=strtolower;
+       } elseif ($case=CASE_UPPER) {
+           $cmd=strtoupper;
+       }
        foreach($array as $key=>$value) {
                $output[$cmd($key)]=$value;
        }

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/urlmanager.lib.php

Braces +3 added lines, -2 removed lines

@@ -262,8 +262,9 @@
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 
-        if (!empty($access_url_id))
-            $where ="WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+        if (!empty($access_url_id)) {
+                    $where ="WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+        }
 
         $sql = "SELECT id, name, access_url_id
                 FROM $tbl_session u

main/inc/lib/tracking.lib.php

Braces +74 added lines, -31 removed lines

@@ -2259,7 +2259,9 @@ 
             $debug = false;
         }
 
-        if ($debug) echo '<h1>Tracking::get_avg_student_score</h1>';
+        if ($debug) {
+            echo '<h1>Tracking::get_avg_student_score</h1>';
+        }
         $tbl_stats_exercices = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
         $tbl_stats_attempts = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 
@@ -2336,7 +2338,9 @@ 
                             $condition_user1 AND
                             session_id = $session_id
                         GROUP BY lp_id, user_id";
-                if ($debug) echo $sql;
+                if ($debug) {
+                    echo $sql;
+                }
 
                 $rs_last_lp_view_id = Database::query($sql);
 
@@ -2352,7 +2356,9 @@ 
                         $lp_view_id = $row_lp_view['id'];
                         $lp_id      = $row_lp_view['lp_id'];
                         $user_id    = $row_lp_view['user_id'];
-                        if ($debug) echo '<h2>LP id '.$lp_id.'</h2>';
+                        if ($debug) {
+                            echo '<h2>LP id '.$lp_id.'</h2>';
+                        }
 
                         if ($get_only_latest_attempt_results) {
                             //Getting lp_items done by the user
@@ -2409,7 +2415,9 @@ 
                                          lp_i.c_id  = $course_id AND
                                          (lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."')
                                       WHERE lp_view_id = $lp_view_id ";
-                            if ($debug) echo $sql.'<br />';
+                            if ($debug) {
+                                echo $sql.'<br />';
+                            }
                             $res_max_score = Database::query($sql);
 
                             while ($row_max_score = Database::fetch_array($res_max_score,'ASSOC')) {
@@ -2428,7 +2436,9 @@ 
                             $max_score_item_view = $row_max_score['max_score_item_view'];
                             $score = $row_max_score['score'];
 
-                            if ($debug) echo '<h3>Item Type: ' .$row_max_score['item_type'].'</h3>';
+                            if ($debug) {
+                                echo '<h3>Item Type: ' .$row_max_score['item_type'].'</h3>';
+                            }
 
                             if ($row_max_score['item_type'] == 'sco') {
                                 /* Check if it is sco (easier to get max_score)
@@ -2448,7 +2458,9 @@ 
                                 if (!empty($max_score)) {
                                     $lp_partial_total += $score/$max_score;
                                 }
-                                if ($debug) echo '<b>$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                if ($debug) {
+                                    echo '<b>$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                }
                             } else {
                                 // Case of a TOOL_QUIZ element
                                 $item_id = $row_max_score['iid'];
@@ -2470,12 +2482,16 @@ 
                                         ORDER BY exe_date DESC
                                         LIMIT 1";
 
-                                if ($debug) echo $sql .'<br />';
+                                if ($debug) {
+                                    echo $sql .'<br />';
+                                }
                                 $result_last_attempt = Database::query($sql);
                                 $num = Database :: num_rows($result_last_attempt);
                                 if ($num > 0 ) {
                                     $id_last_attempt = Database :: result($result_last_attempt, 0, 0);
-                                    if ($debug) echo $id_last_attempt.'<br />';
+                                    if ($debug) {
+                                        echo $id_last_attempt.'<br />';
+                                    }
 
                                     // Within the last attempt number tracking, get the sum of
                                     // the max_scores of all questions that it was
@@ -2494,7 +2510,9 @@ 
                                                     q.c_id = $course_id
                                             )
                                             AS t";
-                                    if ($debug) echo '$sql: '.$sql.' <br />';
+                                    if ($debug) {
+                                        echo '$sql: '.$sql.' <br />';
+                                    }
                                     $res_max_score_bis = Database::query($sql);
                                     $row_max_score_bis = Database::fetch_array($res_max_score_bis);
 
@@ -2504,7 +2522,9 @@ 
                                     if (!empty($max_score) && floatval($max_score) > 0) {
                                         $lp_partial_total += $score/$max_score;
                                     }
-                                    if ($debug) echo '$lp_partial_total, $score, $max_score <b>'.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                    if ($debug) {
+                                        echo '$lp_partial_total, $score, $max_score <b>'.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                    }
                                 }
                             }
 
@@ -2517,17 +2537,25 @@ 
                                         $count_items++;
                                     }
                                 }
-                                if ($debug) echo '$count_items: '.$count_items;
+                                if ($debug) {
+                                    echo '$count_items: '.$count_items;
+                                }
                             }
                         } //end for
 
                         $score_of_scorm_calculate += $count_items ? (($lp_partial_total / $count_items) * 100) : 0;
 
-                        if ($debug) echo '<h3>$count_items '.$count_items.'</h3>';
-                        if ($debug) echo '<h3>$score_of_scorm_calculate '.$score_of_scorm_calculate.'</h3>';
+                        if ($debug) {
+                            echo '<h3>$count_items '.$count_items.'</h3>';
+                        }
+                        if ($debug) {
+                            echo '<h3>$score_of_scorm_calculate '.$score_of_scorm_calculate.'</h3>';
+                        }
 
                         $global_result += $score_of_scorm_calculate;
-                        if ($debug) echo '<h3>$global_result '.$global_result.'</h3>';
+                        if ($debug) {
+                            echo '<h3>$global_result '.$global_result.'</h3>';
+                        }
                     } // end while
                 }
 
@@ -2540,7 +2568,9 @@ 
                                 c_id = $course_id AND
                                 (item_type = 'quiz' OR item_type = 'sco') AND
                                 lp_id = ".$lp_id;
-                    if ($debug) echo $sql;
+                    if ($debug) {
+                        echo $sql;
+                    }
                     $result_have_quiz = Database::query($sql);
 
                     if (Database::num_rows($result_have_quiz) > 0 ) {
@@ -2551,19 +2581,29 @@ 
                     }
                 }
 
-                if ($debug) echo '<h3>$lp_with_quiz '.$lp_with_quiz.' </h3>';
-                if ($debug) echo '<h3>Final return</h3>';
+                if ($debug) {
+                    echo '<h3>$lp_with_quiz '.$lp_with_quiz.' </h3>';
+                }
+                if ($debug) {
+                    echo '<h3>Final return</h3>';
+                }
 
                 if ($lp_with_quiz != 0) {
                     if (!$return_array) {
                         $score_of_scorm_calculate = round(($global_result/$lp_with_quiz),2);
-                        if ($debug) var_dump($score_of_scorm_calculate);
+                        if ($debug) {
+                            var_dump($score_of_scorm_calculate);
+                        }
                         if (empty($lp_ids)) {
-                            if ($debug) echo '<h2>All lps fix: '.$score_of_scorm_calculate.'</h2>';
+                            if ($debug) {
+                                echo '<h2>All lps fix: '.$score_of_scorm_calculate.'</h2>';
+                            }
                         }
                         return $score_of_scorm_calculate;
                     } else {
-                        if ($debug) var_dump($global_result, $lp_with_quiz);
+                        if ($debug) {
+                            var_dump($global_result, $lp_with_quiz);
+                        }
                         return array($global_result, $lp_with_quiz);
                     }
                 } else {
@@ -3050,11 +3090,13 @@ 
 
         if (!empty ($id_session)) {
             $sql .= ' WHERE session_course.session_id=' . $id_session;
-            if (api_is_multiple_url_enabled())
-            $sql .=  ' AND access_url_id = '.$access_url_id;
-        }  else {
-            if (api_is_multiple_url_enabled())
-            $sql .=  ' WHERE access_url_id = '.$access_url_id;
+            if (api_is_multiple_url_enabled()) {
+                        $sql .=  ' AND access_url_id = '.$access_url_id;
+            }
+        } else {
+            if (api_is_multiple_url_enabled()) {
+                        $sql .=  ' WHERE access_url_id = '.$access_url_id;
+            }
         }
 
         $result = Database::query($sql);
@@ -3162,8 +3204,7 @@ 
                 if ($session['access_start_date'] == '0000-00-00 00:00:00' || empty($session['access_start_date'])
                 ) {
                     $session['status'] = get_lang('SessionActive');
-                }
-                else {
+                } else {
                     $time_start = api_strtotime($session['access_start_date'], 'UTC');
                     $time_end = api_strtotime($session['access_end_date'], 'UTC');
                     if ($time_start < time() && time() < $time_end) {
@@ -6599,8 +6640,9 @@ 
     		if (is_array($hpresults)) {
     			for($i = 0; $i < sizeof($hpresults); $i++) {
     				$title = GetQuizName($hpresults[$i][0],'');
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
+    				if ($title == '') {
+    				    				$title = basename($hpresults[$i][0]);
+    				}
     				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
     				?>
                     <tr>
@@ -6972,8 +7014,9 @@ 
     			for($i = 0; $i < sizeof($hpresults); $i++) {
     				$title = GetQuizName($hpresults[$i][0],'');
 
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
+    				if ($title == '') {
+    				    				$title = basename($hpresults[$i][0]);
+    				}
 
     				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
 

main/inc/lib/kses-0.2.2/kses_original.php

Braces +90 added lines, -56 removed lines

@@ -93,24 +93,28 @@ 
 {
   $string = kses_stripslashes($string);
 
-  if (substr($string, 0, 1) != '<')
-    return '&gt;';
+  if (substr($string, 0, 1) != '<') {
+      return '&gt;';
+  }
     # It matched a ">" character
 
-  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-    return '';
+  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+      return '';
+  }
     # It's seriously malformed
 
   $slash = trim($matches[1]);
   $elem = $matches[2];
   $attrlist = $matches[3];
 
-  if (!@isset($allowed_html[strtolower($elem)]))
-    return '';
+  if (!@isset($allowed_html[strtolower($elem)])) {
+      return '';
+  }
     # They are using a not allowed HTML element
 
-  if ($slash != '')
-    return "<$slash$elem>";
+  if ($slash != '') {
+      return "<$slash$elem>";
+  }
   # No attributes are allowed for closing elements
 
   return kses_attr("$slash$elem", $attrlist, $allowed_html,
@@ -131,13 +135,15 @@ 
 # Is there a closing XHTML slash at the end of the attributes?
 
   $xhtml_slash = '';
-  if (preg_match('%\s/\s*$%', $attr))
-    $xhtml_slash = ' /';
+  if (preg_match('%\s/\s*$%', $attr)) {
+      $xhtml_slash = ' /';
+  }
 
 # Are any attributes allowed at all for this element?
 
-  if (@count($allowed_html[strtolower($element)]) == 0)
-    return "<$element$xhtml_slash>";
+  if (@count($allowed_html[strtolower($element)]) == 0) {
+      return "<$element$xhtml_slash>";
+  }
 
 # Split it
 
@@ -151,27 +157,34 @@ 
   foreach ($attrarr as $arreach)
   {
     if (!@isset($allowed_html[strtolower($element)]
-                            [strtolower($arreach['name'])]))
-      continue; # the attribute is not allowed
+                            [strtolower($arreach['name'])])) {
+          continue;
+    }
+    # the attribute is not allowed
 
     $current = $allowed_html[strtolower($element)]
                             [strtolower($arreach['name'])];
 
-    if (!is_array($current))
-      $attr2 .= ' '.$arreach['whole'];
+    if (!is_array($current)) {
+          $attr2 .= ' '.$arreach['whole'];
+    }
     # there are no checks
 
     else
     {
     # there are some checks
       $ok = true;
-      foreach ($current as $currkey => $currval)
-        if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
+      foreach ($current as $currkey => $currval) {
+              if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
                                  $currkey, $currval))
-        { $ok = false; break; }
-
-      if ($ok)
-        $attr2 .= ' '.$arreach['whole']; # it passed them
+        { $ok = false;
+      }
+      break; }
+
+      if ($ok) {
+              $attr2 .= ' '.$arreach['whole'];
+      }
+      # it passed them
     } # if !is_array($current)
   } # foreach
 
@@ -218,16 +231,22 @@ 
 
       case 1: # equals sign or valueless ("selected")
 
-        if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+        if (preg_match('/^\s*=\s*/', $attr)) {
+            # equals sign
         {
-          $working = 1; $mode = 2;
+          $working = 1;
+        }
+        $mode = 2;
           $attr = preg_replace('/^\s*=\s*/', '', $attr);
           break;
         }
 
-        if (preg_match('/^\s+/', $attr)) # valueless
+        if (preg_match('/^\s+/', $attr)) {
+            # valueless
         {
-          $working = 1; $mode = 0;
+          $working = 1;
+        }
+        $mode = 0;
           $attrarr[] = array
                         ('name'  => $attrname,
                          'value' => '',
@@ -240,10 +259,11 @@ 
 
       case 2: # attribute value, a URL after href= for instance
 
-        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
-         # "value"
+        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) {
+                 # "value"
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+        }
 
           $attrarr[] = array
                         ('name'  => $attrname,
@@ -255,10 +275,11 @@ 
           break;
         }
 
-        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
-         # 'value'
+        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+                 # 'value'
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+        }
 
           $attrarr[] = array
                         ('name'  => $attrname,
@@ -270,10 +291,11 @@ 
           break;
         }
 
-        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
-         # value
+        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+                 # value
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+        }
 
           $attrarr[] = array
                         ('name'  => $attrname,
@@ -288,21 +310,24 @@ 
         break;
     } # switch
 
-    if ($working == 0) # not well formed, remove and try again
+    if ($working == 0) {
+        # not well formed, remove and try again
     {
       $attr = kses_html_error($attr);
+    }
       $mode = 0;
     }
   } # while
 
-  if ($mode == 1)
-  # special case, for when the attribute list ends with a valueless
+  if ($mode == 1) {
+    # special case, for when the attribute list ends with a valueless
   # attribute like "selected"
     $attrarr[] = array
                   ('name'  => $attrname,
                    'value' => '',
                    'whole' => $attrname,
                    'vless' => 'y');
+  }
 
   return $attrarr;
 } # function kses_hair
@@ -324,16 +349,18 @@ 
     # greater than the given value. This can be used to avoid Buffer Overflows
     # in WWW clients and various Internet servers.
 
-      if (strlen($value) > $checkvalue)
-        $ok = false;
+      if (strlen($value) > $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'minlen':
     # The minlen check makes sure that the attribute value has a length not
     # smaller than the given value.
 
-      if (strlen($value) < $checkvalue)
-        $ok = false;
+      if (strlen($value) < $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'maxval':
@@ -343,20 +370,24 @@ 
     # value is not greater than the given value.
     # This check can be used to avoid Denial of Service attacks.
 
-      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-        $ok = false;
-      if ($value > $checkvalue)
-        $ok = false;
+      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+              $ok = false;
+      }
+      if ($value > $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'minval':
     # The minval check checks that the attribute value is a positive integer,
     # and that it is not smaller than the given value.
 
-      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-        $ok = false;
-      if ($value < $checkvalue)
-        $ok = false;
+      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+              $ok = false;
+      }
+      if ($value < $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'valueless':
@@ -365,8 +396,9 @@ 
     # is a "y" or a "Y", the attribute must not have a value.
     # If the given value is an "n" or an "N", the attribute must have one.
 
-      if (strtolower($checkvalue) != $vless)
-        $ok = false;
+      if (strtolower($checkvalue) != $vless) {
+              $ok = false;
+      }
       break;
   } # switch
 
@@ -492,18 +524,20 @@ 
   $string2 = strtolower($string2);
 
   $allowed = false;
-  foreach ($allowed_protocols as $one_protocol)
-    if (strtolower($one_protocol) == $string2)
+  foreach ($allowed_protocols as $one_protocol) {
+      if (strtolower($one_protocol) == $string2)
     {
       $allowed = true;
+  }
       break;
     }
 
-  if ($allowed)
-    return "$string2:";
-  else
-    return '';
-} # function kses_bad_protocol_once2
+  if ($allowed) {
+      return "$string2:";
+  } else {
+      return '';
+  }
+  } # function kses_bad_protocol_once2
 
 
 function kses_normalize_entities($string)

main/inc/lib/kses-0.2.2/kses.php

Braces +135 added lines, -84 removed lines

@@ -183,16 +183,19 @@ 
 {
     $string = kses_stripslashes($string);
 
-    if (substr($string, 0, 1) != '<')
-        return '&gt;';
+    if (substr($string, 0, 1) != '<') {
+            return '&gt;';
+    }
     // It matched a ">" character
 
     if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
         $string = str_replace(array('<!--', '-->'), '', $matches[1]);
-        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) )
-            $string = $newstring;
-        if ( $string == '' )
-            return '';
+        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) ) {
+                    $string = $newstring;
+        }
+        if ( $string == '' ) {
+                    return '';
+        }
         // prevent multiple dashes in comments
         $string = preg_replace('/--+/', '-', $string);
         // prevent three dashes closing a comment
@@ -201,20 +204,23 @@ 
     }
     // Allow HTML comments
 
-    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-        return '';
+    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+            return '';
+    }
     // It's seriously malformed
 
     $slash = trim($matches[1]);
     $elem = $matches[2];
     $attrlist = $matches[3];
 
-    if (!@isset($allowed_html[strtolower($elem)]))
-        return '';
+    if (!@isset($allowed_html[strtolower($elem)])) {
+            return '';
+    }
     // They are using a not allowed HTML element
 
-    if ($slash != '')
-        return "<$slash$elem>";
+    if ($slash != '') {
+            return "<$slash$elem>";
+    }
     // No attributes are allowed for closing elements
 
     return kses_attr("$slash$elem", $attrlist, $allowed_html,
@@ -241,13 +247,15 @@ 
     // Is there a closing XHTML slash at the end of the attributes?
 
     $xhtml_slash = '';
-    if (preg_match('%\s*/\s*$%', $attr))
-        $xhtml_slash = ' /';
+    if (preg_match('%\s*/\s*$%', $attr)) {
+            $xhtml_slash = ' /';
+    }
 
     // Are any attributes allowed at all for this element?
 
-    if (@count($allowed_html[strtolower($element)]) == 0)
-        return "<$element$xhtml_slash>";
+    if (@count($allowed_html[strtolower($element)]) == 0) {
+            return "<$element$xhtml_slash>";
+    }
 
     // Split it
 
@@ -261,42 +269,52 @@ 
     foreach ($attrarr as $arreach)
     {
         if (!@isset($allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])]))
-            continue; // the attribute is not allowed
+                              [strtolower($arreach['name'])])) {
+                    continue;
+        }
+        // the attribute is not allowed
 
         $current = $allowed_html[strtolower($element)]
                               [strtolower($arreach['name'])];
-        if ($current == '')
-            continue; // the attribute is not allowed
+        if ($current == '') {
+                    continue;
+        }
+        // the attribute is not allowed
 
-        if (!is_array($current))
-            $attr2 .= ' '.$arreach['whole'];
+        if (!is_array($current)) {
+                    $attr2 .= ' '.$arreach['whole'];
+        }
         // there are no checks
 
         else
         {
             // there are some checks
             $ok = true;
-            foreach ($current as $currkey => $currval)
-                if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
+            foreach ($current as $currkey => $currval) {
+                            if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
                                  $currkey, $currval))
-                { $ok = false; break; }
+                { $ok = false;
+            }
+            break; }
 
             if ( strtolower($arreach['name']) == 'style' ) {
                 $orig_value = $arreach['value'];
 
                 $value = kses_safecss_filter_attr($orig_value);
 
-                if ( empty($value) )
-                    continue;
+                if ( empty($value) ) {
+                                    continue;
+                }
 
                 $arreach['value'] = $value;
 
                 $arreach['whole'] = str_replace($orig_value, $value, $arreach['whole']);
             }
 
-            if ($ok)
-                $attr2 .= ' '.$arreach['whole']; // it passed them
+            if ($ok) {
+                            $attr2 .= ' '.$arreach['whole'];
+            }
+            // it passed them
         } // if !is_array($current)
     } // foreach
 
@@ -351,16 +369,22 @@ 
 
             case 1: // equals sign or valueless ("selected")
 
-                if (preg_match('/^\s*=\s*/', $attr)) // equals sign
+                if (preg_match('/^\s*=\s*/', $attr)) {
+                    // equals sign
                 {
-                    $working = 1; $mode = 2;
+                    $working = 1;
+                }
+                $mode = 2;
                     $attr = preg_replace('/^\s*=\s*/', '', $attr);
                     break;
                 }
 
-                if (preg_match('/^\s+/', $attr)) // valueless
+                if (preg_match('/^\s+/', $attr)) {
+                    // valueless
                 {
-                    $working = 1; $mode = 0;
+                    $working = 1;
+                }
+                $mode = 0;
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
@@ -371,16 +395,18 @@ 
 
             case 2: // attribute value, a URL after href= for instance
 
-                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
-                    // "value"
+                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match)) {
+                                    // "value"
                 {
                     // MDL-2684 - kses stripping CSS styles that it thinks look like protocols
                     if ($attrname == 'style') {
                         $thisval = $match[1];
+                }
                     } else {
                         $thisval = $match[1];
-                        if ( in_array(strtolower($attrname), $uris) )
-                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                        if ( in_array(strtolower($attrname), $uris) ) {
+                                                    $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                        }
                     }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
@@ -391,12 +417,14 @@ 
                     break;
                 }
 
-                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
-                    // 'value'
+                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match)) {
+                                    // 'value'
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
-                        $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                }
+                    if ( in_array(strtolower($attrname), $uris) ) {
+                                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                    }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
@@ -406,12 +434,14 @@ 
                     break;
                 }
 
-                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
-                    // value
+                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match)) {
+                                    // value
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
-                        $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                }
+                    if ( in_array(strtolower($attrname), $uris) ) {
+                                            $thisval = kses_bad_protocol($thisval, $allowed_protocols);
+                    }
 
                     if(FALSE === array_key_exists($attrname, $attrarr)) {
                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
@@ -424,17 +454,20 @@ 
                 break;
         } // switch
 
-        if ($working == 0) // not well formed, remove and try again
+        if ($working == 0) {
+            // not well formed, remove and try again
         {
             $attr = kses_html_error($attr);
+        }
             $mode = 0;
         }
     } // while
 
-    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
-        // special case, for when the attribute list ends with a valueless
+    if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr)) {
+            // special case, for when the attribute list ends with a valueless
         // attribute like "selected"
         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+    }
 
     return $attrarr;
 }
@@ -462,16 +495,18 @@ 
             // greater than the given value. This can be used to avoid Buffer Overflows
             // in WWW clients and various Internet servers.
 
-            if (strlen($value) > $checkvalue)
-                $ok = false;
+            if (strlen($value) > $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'minlen':
             // The minlen check makes sure that the attribute value has a length not
             // smaller than the given value.
 
-            if (strlen($value) < $checkvalue)
-                $ok = false;
+            if (strlen($value) < $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'maxval':
@@ -481,20 +516,24 @@ 
             // value is not greater than the given value.
             // This check can be used to avoid Denial of Service attacks.
 
-            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-                $ok = false;
-            if ($value > $checkvalue)
-                $ok = false;
+            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+                            $ok = false;
+            }
+            if ($value > $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'minval':
             // The minval check checks that the attribute value is a positive integer,
             // and that it is not smaller than the given value.
 
-            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-                $ok = false;
-            if ($value < $checkvalue)
-                $ok = false;
+            if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+                            $ok = false;
+            }
+            if ($value < $checkvalue) {
+                            $ok = false;
+            }
             break;
 
         case 'valueless':
@@ -503,8 +542,9 @@ 
             // is a "y" or a "Y", the attribute must not have a value.
             // If the given value is an "n" or an "N", the attribute must have one.
 
-            if (strtolower($checkvalue) != $vless)
-                $ok = false;
+            if (strtolower($checkvalue) != $vless) {
+                            $ok = false;
+            }
             break;
     } // switch
 
@@ -660,18 +700,20 @@ 
     $string2 = strtolower($string2);
 
     $allowed = false;
-    foreach ( (array) $allowed_protocols as $one_protocol)
-        if (strtolower($one_protocol) == $string2)
+    foreach ( (array) $allowed_protocols as $one_protocol) {
+            if (strtolower($one_protocol) == $string2)
         {
             $allowed = true;
+    }
             break;
         }
 
-    if ($allowed)
-        return "$string2:";
-    else
-        return '';
-}
+    if ($allowed) {
+            return "$string2:";
+    } else {
+            return '';
+    }
+    }
 
 /**
  * Converts and fixes HTML entities.
@@ -711,8 +753,9 @@ 
 function kses_named_entities($matches) {
     global $kses_allowedentitynames;
 
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $i = $matches[1];
     return ( ( ! in_array($i, $kses_allowedentitynames) ) ? "&amp;$i;" : "&$i;" );
@@ -730,8 +773,9 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities2($matches) {
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $i = $matches[1];
     if (kses_valid_unicode($i)) {
@@ -756,8 +800,9 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities3($matches) {
-    if ( empty($matches[1]) )
-        return '';
+    if ( empty($matches[1]) ) {
+            return '';
+    }
 
     $hexchars = $matches[1];
     return ( ( ! kses_valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
@@ -823,8 +868,10 @@ 
     $css = kses_no_null($css);
     $css = str_replace(array("\n","\r","\t"), '', $css);
 
-    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+    if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) {
+        // remove any inline css containing \ ( & } = or comments
         return '';
+    }
 
     $css_array = explode( ';', trim( $css ) );
     $allowed_attr = array( 'text-align', 'margin', 'color', 'float',
@@ -839,25 +886,29 @@ 
         'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
         'width' );
 
-    if ( empty($allowed_attr) )
-        return $css;
+    if ( empty($allowed_attr) ) {
+            return $css;
+    }
 
     $css = '';
     foreach ( $css_array as $css_item ) {
-        if ( $css_item == '' )
-            continue;
+        if ( $css_item == '' ) {
+                    continue;
+        }
         $css_item = trim( $css_item );
         $found = false;
         if ( strpos( $css_item, ':' ) === false ) {
             $found = true;
         } else {
             $parts = split( ':', $css_item );
-            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) )
-                $found = true;
+            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) ) {
+                            $found = true;
+            }
         }
         if ( $found ) {
-            if( $css != '' )
-                $css .= ';';
+            if( $css != '' ) {
+                            $css .= ';';
+            }
             $css .= $css_item;
         }
     }