chamilo / chamilo-lms

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;
         }
     }

main/inc/lib/kses-0.2.2/oop/php5.class.kses.php

Braces +25 added lines, -20 removed lines

@@ -192,13 +192,11 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses5::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -341,13 +339,11 @@ 
 					{
 						$this->RemoveProtocol($protocol);
 					}
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses5::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -388,14 +384,12 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses5::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -747,8 +741,7 @@ 
 						{
 							# there are no checks
 							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
+						} else
 						{
 							# there are some checks
 							$ok = true;
@@ -817,16 +810,20 @@ 
 							}
 							break;
 						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;
 								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
 								break;
 							}
-							if (preg_match('/^\s+/', $attr)) # valueless
+							if (preg_match('/^\s+/', $attr)) {
+							    # valueless
 							{
 								$working   = 1;
+							}
 								$mode      = 0;
 								$attrarr[] = array(
 									'name'  => $attrname,
@@ -838,9 +835,11 @@ 
 							}
 							break;
 						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   = $this->removeBadProtocols($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -852,9 +851,11 @@ 
 								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
 								break;
 							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+							    # 'value'
 							{
 								$thisval   = $this->removeBadProtocols($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -866,9 +867,11 @@ 
 								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
 								break;
 							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+							    # value
 							{
 								$thisval   = $this->removeBadProtocols($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -883,9 +886,11 @@ 
 							break;
 					}
 
-					if ($working == 0) # not well formed, remove and try again
+					if ($working == 0) {
+					    # not well formed, remove and try again
 					{
 						$attr = preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr);
+					}
 						$mode = 0;
 					}
 				}

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

Braces +14 added lines, -28 removed lines

@@ -8,12 +8,10 @@ 
 	if(substr(phpversion(), 0, 1) < 4)
 	{
 		define('KSESTEST_VER', 0);
-	}
-	elseif(substr(phpversion(), 0, 1) >= 5)
+	} elseif(substr(phpversion(), 0, 1) >= 5)
 	{
 		define('KSESTEST_VER', 5);
-	}
-	else
+	} else
 	{
 		define('KSESTEST_VER', 4);
 	}
@@ -22,8 +20,7 @@ 
 	if($_SERVER["DOCUMENT_ROOT"] == "")
 	{
 		define('KSESTEST_ENV', 'CLI');
-	}
-	else
+	} else
 	{
 		define('KSESTEST_ENV', 'WEB');
 	}
@@ -48,8 +45,7 @@ 
 	if(file_exists($include_file) && is_readable($include_file))
 	{
 		include_once($include_file);
-	}
-	else
+	} else
 	{
 		$message = array(
 			"Error:  Unable to find '" . $include_file . "'.",
@@ -126,8 +122,7 @@ 
 		if(KSESTEST_ENV == 'CLI')
 		{
 			return $text;
-		}
-		else
+		} else
 		{
 			return "<code>\n$text<code>\n";
 		}
@@ -138,8 +133,7 @@ 
 		if(KSESTEST_ENV == 'CLI')
 		{
 			return $text;
-		}
-		else
+		} else
 		{
 			return htmlentities($text);
 		}
@@ -150,14 +144,12 @@ 
 		if(KSESTEST_ENV == 'CLI')
 		{
 			return '[' . $text . ']';
-		}
-		else
+		} else
 		{
 			if($pass == true)
 			{
 				return '<span style="color: green;">[' . $text . ']</span>';
-			}
-			else
+			} else
 			{
 				return '<span style="color: red;">[' . $text . ']</span>';
 			}
@@ -169,8 +161,7 @@ 
 		if(KSESTEST_ENV == 'WEB')
 		{
 			$out = "&nbsp;&nbsp;&nbsp;";
-		}
-		else
+		} else
 		{
 			$out = "   ";
 		}
@@ -183,8 +174,7 @@ 
 		if(KSESTEST_ENV == 'WEB')
 		{
 			$out = "<br />\n";
-		}
-		else
+		} else
 		{
 			$out = "\n";
 		}
@@ -207,8 +197,7 @@ 
 				$out .= "\t\t<p>\n";
 				$out .= "\t\t\t$text\n";
 				$out .= "\t\t</p>\n";
-			}
-			else
+			} else
 			{
 				$header = "$title\n" . str_repeat('-', 60) . "\n\n";
 				$out .= "\t$text\n\n";
@@ -226,8 +215,7 @@ 
 			echo $out;
 			echo "\t</body>\n";
 			echo "</html>\n";
-		}
-		else
+		} else
 		{
 			echo $header;
 			echo $out;
@@ -239,8 +227,7 @@ 
 		if(KSESTEST_ENV == 'WEB')
 		{
 			return "\t\t\t<hr />\n";
-		}
-		else
+		} else
 		{
 			return str_repeat(60, '-') . "\n";
 		}
@@ -262,8 +249,7 @@ 
 				$text .= "\t\t\t\t<li>$li</li>\n";
 			}
 			$text .= "\t\t\t</ul>\n";
-		}
-		else
+		} else
 		{
 			foreach($data as $li)
 			{

main/inc/lib/kses-0.2.2/oop/php4.class.kses.php

Braces +26 added lines, -22 removed lines

@@ -165,13 +165,11 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses4::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -273,14 +271,12 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses4::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -451,13 +447,11 @@ 
 					{
 						$this->RemoveProtocol($protocol);
 					}
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses4::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -740,8 +734,7 @@ 
 						{
 							# there are no checks
 							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
+						} else
 						{
 							# there are some checks
 							$ok = true;
@@ -810,16 +803,20 @@ 
 							}
 							break;
 						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;
 								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
 								break;
 							}
-							if (preg_match('/^\s+/', $attr)) # valueless
+							if (preg_match('/^\s+/', $attr)) {
+							    # valueless
 							{
 								$working   = 1;
+							}
 								$mode      = 0;
 								$attrarr[] = array(
 									'name'  => $attrname,
@@ -831,9 +828,11 @@ 
 							}
 							break;
 						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   = $this->_bad_protocol($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -845,9 +844,11 @@ 
 								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
 								break;
 							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+							    # 'value'
 							{
 								$thisval   = $this->_bad_protocol($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -859,9 +860,11 @@ 
 								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
 								break;
 							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+							    # value
 							{
 								$thisval   = $this->_bad_protocol($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -876,9 +879,11 @@ 
 							break;
 					}
 
-					if ($working == 0) # not well formed, remove and try again
+					if ($working == 0) {
+					    # not well formed, remove and try again
 					{
 						$attr = $this->_html_error($attr);
+					}
 						$mode = 0;
 					}
 				}
@@ -985,8 +990,7 @@ 
 				if ($allowed)
 				{
 					return "$string:";
-				}
-				else
+				} else
 				{
 					return '';
 				}

main/inc/lib/fileDisplay.lib.php

Braces +11 added lines, -8 removed lines

@@ -213,16 +213,19 @@
     if (is_dir($dir)) {
         while(($entry = $dir->read()) !== false)
         {
-            if ($entry != '.' && $entry != '..')
-                continue;
+            if ($entry != '.' && $entry != '..') {
+                            continue;
+            }
 
-            if (!is_dir($dir_name.'/'.$entry))
-                $current_modified = filemtime($dir_name.'/'.$entry);
-            elseif ($do_recursive)
-                $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            if (!is_dir($dir_name.'/'.$entry)) {
+                            $current_modified = filemtime($dir_name.'/'.$entry);
+            } elseif ($do_recursive) {
+                            $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            }
 
-            if ($current_modified > $last_modified)
-                $last_modified = $current_modified;
+            if ($current_modified > $last_modified) {
+                            $last_modified = $current_modified;
+            }
         }
 
         $dir->close();

main/inc/lib/fileUpload.lib.php

Braces +3 added lines, -1 removed lines

@@ -993,7 +993,9 @@
                     if ($file != '.' && $file != '..') {
 
                         $filetype = 'file';
-                        if (is_dir($base_work_dir.$upload_path.'/'.$file)) $filetype = 'folder';
+                        if (is_dir($base_work_dir.$upload_path.'/'.$file)) {
+                            $filetype = 'folder';
+                        }
 
                         $safe_file = api_replace_dangerous_char($file, 'strict');
                         @rename($base_work_dir.$upload_path.'/'.$file,$base_work_dir.$upload_path.'/'.$safe_file);

main/inc/lib/usergroup.lib.php

Braces +3 added lines, -2 removed lines

@@ -1906,8 +1906,9 @@
                 $new_relation_type[] ="'$rel'";
             }
             $relation_type = implode(',', $new_relation_type);
-            if (!empty($relation_type))
-                $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
+            if (!empty($relation_type)) {
+                            $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
+            }
         }
 
         $sql = "SELECT picture_uri as image, u.id, u.firstname, u.lastname, relation_type

main/inc/lib/agenda.lib.php

Braces +3 added lines, -2 removed lines

@@ -3122,8 +3122,9 @@
         global $DaysShort, $course_path;
         //Handle leap year
         $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-            $numberofdays[2] = 29;
+        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
+                    $numberofdays[2] = 29;
+        }
         //Get the first day of the month
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
         //Start the week on monday

main/inc/lib/xajax/xajax.inc.php

Braces +84 added lines, -86 removed lines

@@ -173,8 +173,9 @@ 
 		$this->aObjects = array();
 		$this->aFunctionIncludeFiles = array();
 		$this->sRequestURI = $sRequestURI;
-		if ($this->sRequestURI == "")
-			$this->sRequestURI = $this->_detectURI();
+		if ($this->sRequestURI == "") {
+					$this->sRequestURI = $this->_detectURI();
+		}
 		$this->sWrapperPrefix = $sWrapperPrefix;
 		$this->bDebug = $bDebug;
 		$this->bStatusMessages = false;
@@ -399,8 +400,7 @@ 
 			$this->aFunctions[$mFunction[0]] = 1;
 			$this->aFunctionRequestTypes[$mFunction[0]] = $sRequestType;
 			$this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
-		}
-		else {
+		} else {
 			$this->aFunctions[$mFunction] = 1;
 			$this->aFunctionRequestTypes[$mFunction] = $sRequestType;
 		}
@@ -426,8 +426,7 @@ 
 
 		if (is_array($mFunction)) {
 			$this->aFunctionIncludeFiles[$mFunction[0]] = $sIncludeFile;
-		}
-		else {
+		} else {
 			$this->aFunctionIncludeFiles[$mFunction] = $sIncludeFile;
 		}
 	}
@@ -451,8 +450,7 @@ 
 		if (is_array($mFunction)) {
 			$this->sCatchAllFunction = $mFunction[0];
 			$this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
-		}
-		else {
+		} else {
 			$this->sCatchAllFunction = $mFunction;
 		}
 	}
@@ -477,8 +475,7 @@ 
 		if (is_array($mFunction)) {
 			$this->sPreFunction = $mFunction[0];
 			$this->aObjects[$mFunction[0]] = array_slice($mFunction, 1);
-		}
-		else {
+		} else {
 			$this->sPreFunction = $mFunction;
 		}
 	}
@@ -492,7 +489,9 @@ 
 	 */
 	function canProcessRequests()
 	{
-		if ($this->getRequestMode() != -1) return true;
+		if ($this->getRequestMode() != -1) {
+		    return true;
+		}
 		return false;
 	}
 
@@ -504,11 +503,13 @@ 
 	 */
 	function getRequestMode()
 	{
-		if (!empty($_GET["xajax"]))
-			return XAJAX_GET;
+		if (!empty($_GET["xajax"])) {
+					return XAJAX_GET;
+		}
 
-		if (!empty($_POST["xajax"]))
-			return XAJAX_POST;
+		if (!empty($_POST["xajax"])) {
+					return XAJAX_POST;
+		}
 
 		return -1;
 	}
@@ -535,16 +536,18 @@ 
 		$sResponse = "";
 
 		$requestMode = $this->getRequestMode();
-		if ($requestMode == -1) return;
+		if ($requestMode == -1) {
+		    return;
+		}
 
 		if ($requestMode == XAJAX_POST)
 		{
 			$sFunctionName = $_POST["xajax"];
 
-			if (!empty($_POST["xajaxargs"]))
-				$aArgs = $_POST["xajaxargs"];
-		}
-		else
+			if (!empty($_POST["xajaxargs"])) {
+							$aArgs = $_POST["xajaxargs"];
+			}
+		} else
 		{
 			header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
 			header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -553,8 +556,9 @@ 
 
 			$sFunctionName = $_GET["xajax"];
 
-			if (!empty($_GET["xajaxargs"]))
-				$aArgs = $_GET["xajaxargs"];
+			if (!empty($_GET["xajaxargs"])) {
+							$aArgs = $_GET["xajaxargs"];
+			}
 		}
 
 		// Use xajax error handler if necessary
@@ -586,15 +590,13 @@ 
 				if ($this->sCatchAllFunction) {
 					$sFunctionName = $this->sCatchAllFunction;
 					$bFunctionIsCatchAll = true;
-				}
-				else {
+				} else {
 					$bFoundFunction = false;
 					$objResponse = new xajaxResponse();
 					$objResponse->addAlert("Unknown Function $sFunctionName.");
 					$sResponse = $objResponse->getXML();
 				}
-			}
-			else if ($this->aFunctionRequestTypes[$sFunctionName] != $requestMode)
+			} else if ($this->aFunctionRequestTypes[$sFunctionName] != $requestMode)
 			{
 				$bFoundFunction = false;
 				$objResponse = new xajaxResponse();
@@ -615,12 +617,10 @@ 
 				if (stristr($aArgs[$i],"<xjxobj>") != false)
 				{
 					$aArgs[$i] = $this->_xmlToArray("xjxobj",$aArgs[$i]);
-				}
-				else if (stristr($aArgs[$i],"<xjxquery>") != false)
+				} else if (stristr($aArgs[$i],"<xjxquery>") != false)
 				{
 					$aArgs[$i] = $this->_xmlToArray("xjxquery",$aArgs[$i]);
-				}
-				else if ($this->bDecodeUTF8Input)
+				} else if ($this->bDecodeUTF8Input)
 				{
 					$aArgs[$i] = $this->_decodeUTF8Data($aArgs[$i]);
 				}
@@ -631,14 +631,15 @@ 
 				if (is_array($mPreResponse) && $mPreResponse[0] === false) {
 					$bEndRequest = true;
 					$sPreResponse = $mPreResponse[1];
-				}
-				else {
+				} else {
 					$sPreResponse = $mPreResponse;
 				}
 				if (is_a($sPreResponse, "xajaxResponse")) {
 					$sPreResponse = $sPreResponse->getXML();
 				}
-				if ($bEndRequest) $sResponse = $sPreResponse;
+				if ($bEndRequest) {
+				    $sResponse = $sPreResponse;
+				}
 			}
 
 			if (!$bEndRequest) {
@@ -646,8 +647,7 @@ 
 					$objResponse = new xajaxResponse();
 					$objResponse->addAlert("The Registered Function $sFunctionName Could Not Be Found.");
 					$sResponse = $objResponse->getXML();
-				}
-				else {
+				} else {
 					if ($bFunctionIsCatchAll) {
 						$aArgs = array($sFunctionNameForSpecial, $aArgs);
 					}
@@ -660,8 +660,7 @@ 
 					$objResponse = new xajaxResponse();
 					$objResponse->addAlert("No XML Response Was Returned By Function $sFunctionName.");
 					$sResponse = $objResponse->getXML();
-				}
-				else if ($sPreResponse != "") {
+				} else if ($sPreResponse != "") {
 					$sNewResponse = new xajaxResponse($this->sEncoding, $this->bOutputEntities);
 					$sNewResponse->loadXML($sPreResponse);
 					$sNewResponse->loadXML($sResponse);
@@ -671,8 +670,9 @@ 
 		}
 
 		$sContentHeader = "Content-type: text/xml;";
-		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
-			$sContentHeader .= " charset=".$this->sEncoding;
+		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0) {
+					$sContentHeader .= " charset=".$this->sEncoding;
+		}
 		header($sContentHeader);
 		if ($this->bErrorHandler && !empty( $GLOBALS['xajaxErrorHandlerText'] )) {
 			$sErrorResponse = new xajaxResponse();
@@ -681,8 +681,7 @@ 
 				$fH = @fopen($this->sLogFile, "a");
 				if (!$fH) {
 					$sErrorResponse->addAlert("** Logging Error **\n\nxajax was unable to write to the error log file:\n" . $this->sLogFile);
-				}
-				else {
+				} else {
 					fwrite($fH, "** xajax Error Log - " . strftime("%b %e %Y %I:%M:%S %p") . " **" . $GLOBALS['xajaxErrorHandlerText'] . "\n\n\n");
 					fclose($fH);
 				}
@@ -692,12 +691,17 @@ 
 			$sResponse = $sErrorResponse->getXML();
 
 		}
-		if ($this->bCleanBuffer) while (@ob_end_clean());
+		if ($this->bCleanBuffer) {
+		    while (@ob_end_clean());
+		}
 		print $sResponse;
-		if ($this->bErrorHandler) restore_error_handler();
+		if ($this->bErrorHandler) {
+		    restore_error_handler();
+		}
 
-		if ($this->bExitAllowed)
-			exit();
+		if ($this->bExitAllowed) {
+					exit();
+		}
 	}
 
 	/**
@@ -806,9 +810,13 @@ 
 	 */
 	function getJavascriptInclude($sJsURI="", $sJsFile=NULL)
 	{
-		if ($sJsFile == NULL) $sJsFile = "xajax_js/xajax.js";
+		if ($sJsFile == NULL) {
+		    $sJsFile = "xajax_js/xajax.js";
+		}
 
-		if ($sJsURI != "" && substr($sJsURI, -1) != "/") $sJsURI .= "/";
+		if ($sJsURI != "" && substr($sJsURI, -1) != "/") {
+		    $sJsURI .= "/";
+		}
 
 		$html = "\t<script type=\"text/javascript\" src=\"" . $sJsURI . $sJsFile . "\"></script>\n";
 		$html .= "\t<script type=\"text/javascript\">\n";
@@ -831,8 +839,7 @@ 
 
 		if ($sJsFullFilename) {
 			$realJsFile = $sJsFullFilename;
-		}
-		else {
+		} else {
 			$realPath = realpath(dirname(__FILE__));
 			$realJsFile = $realPath . "/". $sJsFile;
 		}
@@ -849,8 +856,7 @@ 
 			$fH = @fopen($realJsFile, "w");
 			if (!$fH) {
 				trigger_error("The xajax compressed javascript file could not be written in the <b>" . dirname($realJsFile) . "</b> folder. Error ", E_USER_ERROR);
-			}
-			else {
+			} else {
 				fwrite($fH, $compressedScript);
 				fclose($fH);
 			}
@@ -950,7 +956,9 @@ 
 	 */
 	function _isObjectCallback($sFunction)
 	{
-		if (array_key_exists($sFunction, $this->aObjects)) return true;
+		if (array_key_exists($sFunction, $this->aObjects)) {
+		    return true;
+		}
 		return false;
 	}
 
@@ -967,12 +975,10 @@ 
 		if ($this->_isObjectCallback($sFunction)) {
 			if (is_object($this->aObjects[$sFunction][0])) {
 				return method_exists($this->aObjects[$sFunction][0], $this->aObjects[$sFunction][1]);
-			}
-			else {
+			} else {
 				return is_callable($this->aObjects[$sFunction]);
 			}
-		}
-		else {
+		} else {
 			return function_exists($sFunction);
 		}
 	}
@@ -990,8 +996,7 @@ 
 	{
 		if ($this->_isObjectCallback($sFunction)) {
 			$mReturn = call_user_func_array($this->aObjects[$sFunction], $aArgs);
-		}
-		else {
+		} else {
 			$mReturn = call_user_func_array($sFunction, $aArgs);
 		}
 		return $mReturn;
@@ -1086,8 +1091,7 @@ 
 								{
 									$value = $this->_parseObjXml("xjxobj");
 									$this->iPos++;
-								}
-								else
+								} else
 								{
 									$value .= $this->aObjArray[$this->iPos];
 									if ($this->bDecodeUTF8Input)
@@ -1134,10 +1138,11 @@ 
 			if (get_magic_quotes_gpc() == 1) {
 				$newArray = array();
 				foreach ($aArray as $sKey => $sValue) {
-					if (is_string($sValue))
-						$newArray[$sKey] = stripslashes($sValue);
-					else
-						$newArray[$sKey] = $sValue;
+					if (is_string($sValue)) {
+											$newArray[$sKey] = stripslashes($sValue);
+					} else {
+											$newArray[$sKey] = $sValue;
+					}
 				}
 				$aArray = $newArray;
 			}
@@ -1166,20 +1171,18 @@ 
 				$sFuncToUse = "api_convert_encoding";
 			}
 			//if (function_exists('iconv'))
-			elseif (function_exists('iconv'))
-			//
+			elseif (function_exists('iconv')) {
+						//
 			{
 				$sFuncToUse = "iconv";
 			}
-			else if (function_exists('mb_convert_encoding'))
+			} else if (function_exists('mb_convert_encoding'))
 			{
 				$sFuncToUse = "mb_convert_encoding";
-			}
-			else if ($this->sEncoding == "ISO-8859-1")
+			} else if ($this->sEncoding == "ISO-8859-1")
 			{
 				$sFuncToUse = "utf8_decode";
-			}
-			else
+			} else
 			{
 				trigger_error("The incoming xajax data could not be converted from UTF-8", E_USER_NOTICE);
 			}
@@ -1191,8 +1194,7 @@ 
 					if ($sFuncToUse == "iconv")
 					{
 						$sValue = iconv("UTF-8", $this->sEncoding.'//TRANSLIT', $sValue);
-					}
-					else if ($sFuncToUse == "mb_convert_encoding")
+					} else if ($sFuncToUse == "mb_convert_encoding")
 					{
 						$sValue = mb_convert_encoding($sValue, $this->sEncoding, "UTF-8");
 					}
@@ -1221,27 +1223,23 @@ 
 function xajaxErrorHandler($errno, $errstr, $errfile, $errline)
 {
 	$errorReporting = error_reporting();
-	if (($errno & $errorReporting) == 0) return;
+	if (($errno & $errorReporting) == 0) {
+	    return;
+	}
 
 	if ($errno == E_NOTICE) {
 		$errTypeStr = "NOTICE";
-	}
-	else if ($errno == E_WARNING) {
+	} else if ($errno == E_WARNING) {
 		$errTypeStr = "WARNING";
-	}
-	else if ($errno == E_USER_NOTICE) {
+	} else if ($errno == E_USER_NOTICE) {
 		$errTypeStr = "USER NOTICE";
-	}
-	else if ($errno == E_USER_WARNING) {
+	} else if ($errno == E_USER_WARNING) {
 		$errTypeStr = "USER WARNING";
-	}
-	else if ($errno == E_USER_ERROR) {
+	} else if ($errno == E_USER_ERROR) {
 		$errTypeStr = "USER FATAL ERROR";
-	}
-	else if ($errno == E_STRICT) {
+	} else if ($errno == E_STRICT) {
 		return;
-	}
-	else {
+	} else {
 		$errTypeStr = "UNKNOWN: $errno";
 	}
 	$GLOBALS['xajaxErrorHandlerText'] .= "\n----\n[$errTypeStr] $errstr\nerror in line $errline of file $errfile";