chamilo / chamilo-lms

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

Spacing +92 added lines, -92 removed lines

@@ -35,47 +35,47 @@ 
  */
 
 $kses_allowedentitynames = array(
-    'nbsp',    'iexcl',  'cent',    'pound',  'curren', 'yen',
-    'brvbar',  'sect',   'uml',     'copy',   'ordf',   'laquo',
-    'not',     'shy',    'reg',     'macr',   'deg',    'plusmn',
-    'acute',   'micro',  'para',    'middot', 'cedil',  'ordm',
-    'raquo',   'iquest', 'Agrave',  'Aacute', 'Acirc',  'Atilde',
-    'Auml',    'Aring',  'AElig',   'Ccedil', 'Egrave', 'Eacute',
-    'Ecirc',   'Euml',   'Igrave',  'Iacute', 'Icirc',  'Iuml',
-    'ETH',     'Ntilde', 'Ograve',  'Oacute', 'Ocirc',  'Otilde',
-    'Ouml',    'times',  'Oslash',  'Ugrave', 'Uacute', 'Ucirc',
-    'Uuml',    'Yacute', 'THORN',   'szlig',  'agrave', 'aacute',
-    'acirc',   'atilde', 'auml',    'aring',  'aelig',  'ccedil',
-    'egrave',  'eacute', 'ecirc',   'euml',   'igrave', 'iacute',
-    'icirc',   'iuml',   'eth',     'ntilde', 'ograve', 'oacute',
-    'ocirc',   'otilde', 'ouml',    'divide', 'oslash', 'ugrave',
-    'uacute',  'ucirc',  'uuml',    'yacute', 'thorn',  'yuml',
-    'quot',    'amp',    'lt',      'gt',     'apos',   'OElig',
-    'oelig',   'Scaron', 'scaron',  'Yuml',   'circ',   'tilde',
-    'ensp',    'emsp',   'thinsp',  'zwnj',   'zwj',    'lrm',
-    'rlm',     'ndash',  'mdash',   'lsquo',  'rsquo',  'sbquo',
-    'ldquo',   'rdquo',  'bdquo',   'dagger', 'Dagger', 'permil',
-    'lsaquo',  'rsaquo', 'euro',    'fnof',   'Alpha',  'Beta',
-    'Gamma',   'Delta',  'Epsilon', 'Zeta',   'Eta',    'Theta',
-    'Iota',    'Kappa',  'Lambda',  'Mu',     'Nu',     'Xi',
-    'Omicron', 'Pi',     'Rho',     'Sigma',  'Tau',    'Upsilon',
-    'Phi',     'Chi',    'Psi',     'Omega',  'alpha',  'beta',
-    'gamma',   'delta',  'epsilon', 'zeta',   'eta',    'theta',
-    'iota',    'kappa',  'lambda',  'mu',     'nu',     'xi',
-    'omicron', 'pi',     'rho',     'sigmaf', 'sigma',  'tau',
-    'upsilon', 'phi',    'chi',     'psi',    'omega',  'thetasym',
-    'upsih',   'piv',    'bull',    'hellip', 'prime',  'Prime',
-    'oline',   'frasl',  'weierp',  'image',  'real',   'trade',
-    'alefsym', 'larr',   'uarr',    'rarr',   'darr',   'harr',
-    'crarr',   'lArr',   'uArr',    'rArr',   'dArr',   'hArr',
-    'forall',  'part',   'exist',   'empty',  'nabla',  'isin',
-    'notin',   'ni',     'prod',    'sum',    'minus',  'lowast',
-    'radic',   'prop',   'infin',   'ang',    'and',    'or',
-    'cap',     'cup',    'int',     'sim',    'cong',   'asymp',
-    'ne',      'equiv',  'le',      'ge',     'sub',    'sup',
-    'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
-    'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
-    'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
+    'nbsp', 'iexcl', 'cent', 'pound', 'curren', 'yen',
+    'brvbar', 'sect', 'uml', 'copy', 'ordf', 'laquo',
+    'not', 'shy', 'reg', 'macr', 'deg', 'plusmn',
+    'acute', 'micro', 'para', 'middot', 'cedil', 'ordm',
+    'raquo', 'iquest', 'Agrave', 'Aacute', 'Acirc', 'Atilde',
+    'Auml', 'Aring', 'AElig', 'Ccedil', 'Egrave', 'Eacute',
+    'Ecirc', 'Euml', 'Igrave', 'Iacute', 'Icirc', 'Iuml',
+    'ETH', 'Ntilde', 'Ograve', 'Oacute', 'Ocirc', 'Otilde',
+    'Ouml', 'times', 'Oslash', 'Ugrave', 'Uacute', 'Ucirc',
+    'Uuml', 'Yacute', 'THORN', 'szlig', 'agrave', 'aacute',
+    'acirc', 'atilde', 'auml', 'aring', 'aelig', 'ccedil',
+    'egrave', 'eacute', 'ecirc', 'euml', 'igrave', 'iacute',
+    'icirc', 'iuml', 'eth', 'ntilde', 'ograve', 'oacute',
+    'ocirc', 'otilde', 'ouml', 'divide', 'oslash', 'ugrave',
+    'uacute', 'ucirc', 'uuml', 'yacute', 'thorn', 'yuml',
+    'quot', 'amp', 'lt', 'gt', 'apos', 'OElig',
+    'oelig', 'Scaron', 'scaron', 'Yuml', 'circ', 'tilde',
+    'ensp', 'emsp', 'thinsp', 'zwnj', 'zwj', 'lrm',
+    'rlm', 'ndash', 'mdash', 'lsquo', 'rsquo', 'sbquo',
+    'ldquo', 'rdquo', 'bdquo', 'dagger', 'Dagger', 'permil',
+    'lsaquo', 'rsaquo', 'euro', 'fnof', 'Alpha', 'Beta',
+    'Gamma', 'Delta', 'Epsilon', 'Zeta', 'Eta', 'Theta',
+    'Iota', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Xi',
+    'Omicron', 'Pi', 'Rho', 'Sigma', 'Tau', 'Upsilon',
+    'Phi', 'Chi', 'Psi', 'Omega', 'alpha', 'beta',
+    'gamma', 'delta', 'epsilon', 'zeta', 'eta', 'theta',
+    'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
+    'omicron', 'pi', 'rho', 'sigmaf', 'sigma', 'tau',
+    'upsilon', 'phi', 'chi', 'psi', 'omega', 'thetasym',
+    'upsih', 'piv', 'bull', 'hellip', 'prime', 'Prime',
+    'oline', 'frasl', 'weierp', 'image', 'real', 'trade',
+    'alefsym', 'larr', 'uarr', 'rarr', 'darr', 'harr',
+    'crarr', 'lArr', 'uArr', 'rArr', 'dArr', 'hArr',
+    'forall', 'part', 'exist', 'empty', 'nabla', 'isin',
+    'notin', 'ni', 'prod', 'sum', 'minus', 'lowast',
+    'radic', 'prop', 'infin', 'ang', 'and', 'or',
+    'cap', 'cup', 'int', 'sim', 'cong', 'asymp',
+    'ne', 'equiv', 'le', 'ge', 'sub', 'sup',
+    'nsub', 'sube', 'supe', 'oplus', 'otimes', 'perp',
+    'sdot', 'lceil', 'rceil', 'lfloor', 'rfloor', 'lang',
+    'rang', 'loz', 'spades', 'clubs', 'hearts', 'diams',
 );
 
 /**
@@ -145,7 +145,7 @@ 
     global $pass_allowed_html, $pass_allowed_protocols;
     $pass_allowed_html = $allowed_html;
     $pass_allowed_protocols = $allowed_protocols;
-    return preg_replace_callback( '%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_kses_split_callback', $string );
+    return preg_replace_callback('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_kses_split_callback', $string);
 }
 
 /**
@@ -153,10 +153,10 @@ 
  *
  * @access private
  */
-function _kses_split_callback( $match )
+function _kses_split_callback($match)
 {
     global $pass_allowed_html, $pass_allowed_protocols;
-    return kses_split2( $match[1], $pass_allowed_html, $pass_allowed_protocols );
+    return kses_split2($match[1], $pass_allowed_html, $pass_allowed_protocols);
 }
 
 /**
@@ -189,9 +189,9 @@ 
 
     if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
         $string = str_replace(array('<!--', '-->'), '', $matches[1]);
-        while ( $string != $newstring = kses($string, $allowed_html, $allowed_protocols) )
+        while ($string != $newstring = kses($string, $allowed_html, $allowed_protocols))
             $string = $newstring;
-        if ( $string == '' )
+        if ($string == '')
             return '';
         // prevent multiple dashes in comments
         $string = preg_replace('/--+/', '-', $string);
@@ -282,12 +282,12 @@ 
                                  $currkey, $currval))
                 { $ok = false; break; }
 
-            if ( strtolower($arreach['name']) == 'style' ) {
+            if (strtolower($arreach['name']) == 'style') {
                 $orig_value = $arreach['value'];
 
                 $value = kses_safecss_filter_attr($orig_value);
 
-                if ( empty($value) )
+                if (empty($value))
                     continue;
 
                 $arreach['value'] = $value;
@@ -361,8 +361,8 @@ 
                 if (preg_match('/^\s+/', $attr)) // valueless
                 {
                     $working = 1; $mode = 0;
-                    if(FALSE === array_key_exists($attrname, $attrarr)) {
-                        $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                     }
                     $attr = preg_replace('/^\s+/', '', $attr);
                 }
@@ -379,12 +379,12 @@ 
                         $thisval = $match[1];
                     } else {
                         $thisval = $match[1];
-                        if ( in_array(strtolower($attrname), $uris) )
+                        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');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
                     $working = 1; $mode = 0;
                     $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
@@ -395,11 +395,11 @@ 
                     // 'value'
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
+                    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');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
                     }
                     $working = 1; $mode = 0;
                     $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
@@ -410,11 +410,11 @@ 
                     // value
                 {
                     $thisval = $match[1];
-                    if ( in_array(strtolower($attrname), $uris) )
+                    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');
+                    if (FALSE === array_key_exists($attrname, $attrarr)) {
+                        $attrarr[$attrname] = array('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                     }
                     // We add quotes to conform to W3C's HTML spec.
                     $working = 1; $mode = 0;
@@ -434,7 +434,7 @@ 
     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');
+        $attrarr[$attrname] = array('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
 
     return $attrarr;
 }
@@ -579,12 +579,12 @@ 
 {
     $outarray = array();
 
-    foreach ( (array) $inarray as $inkey => $inval)
+    foreach ((array) $inarray as $inkey => $inval)
     {
         $outkey = strtolower($inkey);
         $outarray[$outkey] = array();
 
-        foreach ( (array) $inval as $inkey2 => $inval2)
+        foreach ((array) $inval as $inkey2 => $inval2)
         {
             $outkey2 = strtolower($inkey2);
             $outarray[$outkey][$outkey2] = $inval2;
@@ -632,9 +632,9 @@ 
 function kses_bad_protocol_once($string, $allowed_protocols)
 {
     $string2 = preg_split('/:|&#0*58;|&#x0*3a;/i', $string, 2);
-    if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+    if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
     {
-        $string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+        $string = kses_bad_protocol_once2($string2[0], $allowed_protocols).trim($string2[1]);
     }
     return $string;
 }
@@ -660,7 +660,7 @@ 
     $string2 = strtolower($string2);
 
     $allowed = false;
-    foreach ( (array) $allowed_protocols as $one_protocol)
+    foreach ((array) $allowed_protocols as $one_protocol)
         if (strtolower($one_protocol) == $string2)
         {
             $allowed = true;
@@ -711,11 +711,11 @@ 
 function kses_named_entities($matches) {
     global $kses_allowedentitynames;
 
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $i = $matches[1];
-    return ( ( ! in_array($i, $kses_allowedentitynames) ) ? "&amp;$i;" : "&$i;" );
+    return ((!in_array($i, $kses_allowedentitynames)) ? "&amp;$i;" : "&$i;");
 }
 
 /**
@@ -730,12 +730,12 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities2($matches) {
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $i = $matches[1];
     if (kses_valid_unicode($i)) {
-        $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+        $i = str_pad(ltrim($i, '0'), 3, '0', STR_PAD_LEFT);
         $i = "&#$i;";
     } else {
         $i = "&amp;#$i;";
@@ -756,11 +756,11 @@ 
  * @return string Correctly encoded entity
  */
 function kses_normalize_entities3($matches) {
-    if ( empty($matches[1]) )
+    if (empty($matches[1]))
         return '';
 
     $hexchars = $matches[1];
-    return ( ( ! kses_valid_unicode(hexdec($hexchars)) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
+    return ((!kses_valid_unicode(hexdec($hexchars))) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars, '0').';');
 }
 
 /**
@@ -770,10 +770,10 @@ 
  * @return bool true if the value was a valid Unicode number
  */
 function kses_valid_unicode($i) {
-    return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
+    return ($i == 0x9 || $i == 0xa || $i == 0xd ||
             ($i >= 0x20 && $i <= 0xd7ff) ||
             ($i >= 0xe000 && $i <= 0xfffd) ||
-            ($i >= 0x10000 && $i <= 0x10ffff) );
+            ($i >= 0x10000 && $i <= 0x10ffff));
 }
 
 /**
@@ -800,8 +800,8 @@ 
  * @param array $match preg match
  * @return string
  */
-function _kses_decode_entities_chr( $match ) {
-    return chr( $match[1] );
+function _kses_decode_entities_chr($match) {
+    return chr($match[1]);
 }
 
 /**
@@ -810,24 +810,24 @@ 
  * @param array $match preg match
  * @return string
  */
-function _kses_decode_entities_chr_hexdec( $match ) {
-    return chr( hexdec( $match[1] ) );
+function _kses_decode_entities_chr_hexdec($match) {
+    return chr(hexdec($match[1]));
 }
 
 /**
  * Inline CSS filter
  *
  */
-function kses_safecss_filter_attr( $css ) {
+function kses_safecss_filter_attr($css) {
 
     $css = kses_no_null($css);
-    $css = str_replace(array("\n","\r","\t"), '', $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',
+    $css_array = explode(';', trim($css));
+    $allowed_attr = array('text-align', 'margin', 'color', 'float',
         'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
         'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
         'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
@@ -837,26 +837,26 @@ 
         'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
         'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
         'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
-        'width' );
+        'width');
 
-    if ( empty($allowed_attr) )
+    if (empty($allowed_attr))
         return $css;
 
     $css = '';
-    foreach ( $css_array as $css_item ) {
-        if ( $css_item == '' )
+    foreach ($css_array as $css_item) {
+        if ($css_item == '')
             continue;
-        $css_item = trim( $css_item );
+        $css_item = trim($css_item);
         $found = false;
-        if ( strpos( $css_item, ':' ) === false ) {
+        if (strpos($css_item, ':') === false) {
             $found = true;
         } else {
-            $parts = split( ':', $css_item );
-            if ( in_array( strtolower( trim( $parts[0] ) ), $allowed_attr ) )
+            $parts = split(':', $css_item);
+            if (in_array(strtolower(trim($parts[0])), $allowed_attr))
                 $found = true;
         }
-        if ( $found ) {
-            if( $css != '' )
+        if ($found) {
+            if ($css != '')
                 $css .= ';';
             $css .= $css_item;
         }

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

Spacing +44 added lines, -44 removed lines

@@ -50,7 +50,7 @@ 
 	*	@subpackage kses5
 	*/
 
-	if(substr(phpversion(), 0, 1) < 5)
+	if (substr(phpversion(), 0, 1) < 5)
 	{
 		die("Class kses requires PHP 5 or higher.");
 	}
@@ -58,7 +58,7 @@ 
 	/**
 	*	Only install KSES5 once
 	*/
-	if(!defined('KSES_CLASS_PHP5'))
+	if (!defined('KSES_CLASS_PHP5'))
 	{
 		define('KSES_CLASS_PHP5', true);
 
@@ -155,7 +155,7 @@ 
 				$string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
 				$string = $this->normalizeEntities($string);
 				$string = $this->filterKsesTextHook($string);
-				$string = preg_replace('%(<' . '[^>]*' . '(>|$)' . '|>)%e', "\$this->stripTags('\\1')", $string);
+				$string = preg_replace('%(<'.'[^>]*'.'(>|$)'.'|>)%e', "\$this->stripTags('\\1')", $string);
 				return $string;
 			}
 
@@ -177,7 +177,7 @@ 
 			public function AddProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses5::AddProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -185,15 +185,15 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
@@ -216,7 +216,7 @@ 
 			public function Protocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses5::Protocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -239,27 +239,27 @@ 
 			 */
 			public function AddProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses5::AddProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses5::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				//	prevent duplicate protocols from being added.
-				if(!in_array($protocol, $this->allowed_protocols))
+				if (!in_array($protocol, $this->allowed_protocols))
 				{
 					array_push($this->allowed_protocols, $protocol);
 					sort($this->allowed_protocols);
@@ -281,27 +281,27 @@ 
 			 */
 			public function RemoveProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses5::RemoveProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses5::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
+				if (in_array($protocol, $this->allowed_protocols))
 				{
 					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
 					sort($this->allowed_protocols);
@@ -328,21 +328,21 @@ 
 			public function RemoveProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					return false;
 				}
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->RemoveProtocol($protocol);
 					}
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
@@ -372,7 +372,7 @@ 
 			public function SetProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses5::SetProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -380,16 +380,16 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
 					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
@@ -447,37 +447,37 @@ 
 			 */
 			public function AddHTML($tag = "", $attribs = array())
 			{
-				if(!is_string($tag))
+				if (!is_string($tag))
 				{
 					trigger_error("kses5::AddHTML() requires the tag to be a string", E_USER_WARNING);
 					return false;
 				}
 
 				$tag = strtolower(trim($tag));
-				if($tag == "")
+				if ($tag == "")
 				{
 					trigger_error("kses5::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
 					return false;
 				}
 
-				if(!is_array($attribs))
+				if (!is_array($attribs))
 				{
 					trigger_error("kses5::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
 					return false;
 				}
 
 				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
+				if (is_array($attribs) && count($attribs) > 0)
 				{
-					foreach($attribs as $idx1 => $val1)
+					foreach ($attribs as $idx1 => $val1)
 					{
 						$new_idx1 = strtolower($idx1);
 						$new_val1 = $attribs[$idx1];
 
-						if(is_array($new_val1) && count($attribs) > 0)
+						if (is_array($new_val1) && count($attribs) > 0)
 						{
 							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
+							foreach ($new_val1 as $idx2 => $val2)
 							{
 								$new_idx2 = strtolower($idx2);
 								$tmp_val[$new_idx2] = $val2;
@@ -620,14 +620,14 @@ 
 			{
 				$out_array = array();
 
-				if(is_array($in_array) && count($in_array) > 0)
+				if (is_array($in_array) && count($in_array) > 0)
 				{
 					foreach ($in_array as $in_key => $in_val)
 					{
 						$out_key = strtolower($in_key);
 						$out_array[$out_key] = array();
 
-						if(is_array($in_val) && count($in_val) > 0)
+						if (is_array($in_val) && count($in_val) > 0)
 						{
 							foreach ($in_val as $in_key2 => $in_val2)
 							{
@@ -732,11 +732,11 @@ 
 				# Go through $attrarr, and save the allowed attributes for this element
 				# in $attr2
 				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
+				if (is_array($attrarr) && count($attrarr) > 0)
 				{
 					foreach ($attrarr as $arreach)
 					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+						if (!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
 						{
 							continue;
 						}
@@ -752,7 +752,7 @@ 
 						{
 							# there are some checks
 							$ok = true;
-							if(is_array($current) && count($current) > 0)
+							if (is_array($current) && count($current) > 0)
 							{
 								foreach ($current as $currkey => $currval)
 								{
@@ -834,7 +834,7 @@ 
 									'whole' => $attrname,
 									'vless' => 'y'
 								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
+								$attr = preg_replace('/^\s+/', '', $attr);
 							}
 							break;
 						case 2: # attribute value, a URL after href= for instance
@@ -844,7 +844,7 @@ 
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
+									'whole' => $attrname.'="'.$thisval.'"',
 									'vless' => 'n'
 								);
 								$working   = 1;
@@ -872,7 +872,7 @@ 
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
+									'whole' => $attrname.'="'.$thisval.'"',
 									'vless' => 'n'
 								);
 								# We add quotes to conform to W3C's HTML spec.
@@ -922,10 +922,10 @@ 
 			{
 				$string  = $this->RemoveNulls($string);
 				$string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-				$string2 = $string . 'a';
+				$string2 = $string.'a';
 
 				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+				if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
 				{
 					$string = $this->filterProtocols($string2[0]).trim($string2[1]);
 				}
@@ -952,7 +952,7 @@ 
 				$string = preg_replace('/\xad+/', '', $string2); # deals with Opera "feature"
 				$string = strtolower($string);
 
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+				if (is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
 				{
 					foreach ($this->allowed_protocols as $one_protocol)
 					{
@@ -989,8 +989,8 @@ 
 			private function checkAttributeValue($value, $vless, $checkname, $checkvalue)
 			{
 				$ok = true;
-				$check_attribute_method_name  = 'checkAttributeValue' . ucfirst(strtolower($checkname));
-				if(method_exists($this, $check_attribute_method_name))
+				$check_attribute_method_name = 'checkAttributeValue'.ucfirst(strtolower($checkname));
+				if (method_exists($this, $check_attribute_method_name))
 				{
 					$ok = $this->$check_attribute_method_name($value, $checkvalue, $vless);
 				}

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

Spacing +71 added lines, -71 removed lines

@@ -5,11 +5,11 @@ 
 	//	current valid email address at http://chaos.org/contact/
 
 	//	Make sure we're in a usable PHP environment
-	if(substr(phpversion(), 0, 1) < 4)
+	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);
 	}
@@ -19,7 +19,7 @@ 
 	}
 
 	//	See if we're in command line or web
-	if($_SERVER["DOCUMENT_ROOT"] == "")
+	if ($_SERVER["DOCUMENT_ROOT"] == "")
 	{
 		define('KSESTEST_ENV', 'CLI');
 	}
@@ -28,11 +28,11 @@ 
 		define('KSESTEST_ENV', 'WEB');
 	}
 
-	if(KSESTEST_VER == 0)
+	if (KSESTEST_VER == 0)
 	{
 		$message = array(
 			"Error: Not using a current version of PHP!",
-			"You are using PHP version " . phpversion() . ".",
+			"You are using PHP version ".phpversion().".",
 			"KSES Class version requires PHP4 or better.",
 			"KSES test program ending."
 			);
@@ -44,27 +44,27 @@ 
 		exit();
 	}
 
-	$include_file = "php" . KSESTEST_VER . ".class.kses.php";
-	if(file_exists($include_file) && is_readable($include_file))
+	$include_file = "php".KSESTEST_VER.".class.kses.php";
+	if (file_exists($include_file) && is_readable($include_file))
 	{
 		include_once($include_file);
 	}
 	else
 	{
 		$message = array(
-			"Error:  Unable to find '" . $include_file . "'.",
+			"Error:  Unable to find '".$include_file."'.",
 			"Please check your include path and make sure the file is available.",
-			"Path: " . ini_get('include_path')
+			"Path: ".ini_get('include_path')
 		);
 
 		displayPage(
-			array('title' => 'Unable to include ' . $include_file, 'message' => $message)
+			array('title' => 'Unable to include '.$include_file, 'message' => $message)
 		);
 
 		exit();
 	}
 
-	$kses_type = "kses" . KSESTEST_VER;
+	$kses_type = "kses".KSESTEST_VER;
 	$myKses = new $kses_type;
 
 	$test_text = array();
@@ -98,16 +98,16 @@ 
 
 		$out_li = array();
 		// Keep only allowed HTML from the presumed 'form'.
-		foreach($test_tags as $tag)
+		foreach ($test_tags as $tag)
 		{
 			$temp  = $myKses->Parse($tag);
 			$check = ($temp == $tag) ? true : false;
 			$text  = ($temp == $tag) ? 'pass' : 'fail';
 
-			$li_text  = output_testresult($check, $text) . output_newline();
-			$li_text .= "Input: &nbsp;" . output_translate($tag) . output_newline();
-			$li_text .= "Output: " . output_translate($temp);
-			if(KSESTEST_ENV == 'CLI')
+			$li_text  = output_testresult($check, $text).output_newline();
+			$li_text .= "Input: &nbsp;".output_translate($tag).output_newline();
+			$li_text .= "Output: ".output_translate($temp);
+			if (KSESTEST_ENV == 'CLI')
 			{
 				$li_text .= output_newline();
 			}
@@ -123,7 +123,7 @@ 
 
 	function output_code_wrap($text)
 	{
-		if(KSESTEST_ENV == 'CLI')
+		if (KSESTEST_ENV == 'CLI')
 		{
 			return $text;
 		}
@@ -135,7 +135,7 @@ 
 
 	function output_translate($text)
 	{
-		if(KSESTEST_ENV == 'CLI')
+		if (KSESTEST_ENV == 'CLI')
 		{
 			return $text;
 		}
@@ -147,26 +147,26 @@ 
 
 	function output_testresult($pass = false, $text = "")
 	{
-		if(KSESTEST_ENV == 'CLI')
+		if (KSESTEST_ENV == 'CLI')
 		{
-			return '[' . $text . ']';
+			return '['.$text.']';
 		}
 		else
 		{
-			if($pass == true)
+			if ($pass == true)
 			{
-				return '<span style="color: green;">[' . $text . ']</span>';
+				return '<span style="color: green;">['.$text.']</span>';
 			}
 			else
 			{
-				return '<span style="color: red;">[' . $text . ']</span>';
+				return '<span style="color: red;">['.$text.']</span>';
 			}
 		}
 	}
 
 	function output_spaces()
 	{
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			$out = "&nbsp;&nbsp;&nbsp;";
 		}
@@ -180,7 +180,7 @@ 
 
 	function output_newline()
 	{
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			$out = "<br />\n";
 		}
@@ -199,9 +199,9 @@ 
 
 		$out = "";
 
-		foreach($message as $text)
+		foreach ($message as $text)
 		{
-			if(KSESTEST_ENV == 'WEB')
+			if (KSESTEST_ENV == 'WEB')
 			{
 				$header = "\t\t<h1>$title</h1>\n\t\t<hr />\n";
 				$out .= "\t\t<p>\n";
@@ -210,12 +210,12 @@ 
 			}
 			else
 			{
-				$header = "$title\n" . str_repeat('-', 60) . "\n\n";
+				$header = "$title\n".str_repeat('-', 60)."\n\n";
 				$out .= "\t$text\n\n";
 			}
 		}
 
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			echo "<html>\n";
 			echo "\t<head>\n";
@@ -236,28 +236,28 @@ 
 
 	function output_hr()
 	{
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			return "\t\t\t<hr />\n";
 		}
 		else
 		{
-			return str_repeat(60, '-') . "\n";
+			return str_repeat(60, '-')."\n";
 		}
 	}
 
 	function output_ul($data = array(), $padding = "")
 	{
-		if(!is_array($data) || count($data) < 1)
+		if (!is_array($data) || count($data) < 1)
 		{
 			return "";
 		}
 
 		$text = "";
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			$text = "\t\t\t<ul>\n";
-			foreach($data as $li)
+			foreach ($data as $li)
 			{
 				$text .= "\t\t\t\t<li>$li</li>\n";
 			}
@@ -265,9 +265,9 @@ 
 		}
 		else
 		{
-			foreach($data as $li)
+			foreach ($data as $li)
 			{
-				$text .= $padding . "   * $li\n";
+				$text .= $padding."   * $li\n";
 			}
 		}
 
@@ -278,32 +278,32 @@ 
 	{
 		$default_prots = $myKses->dumpProtocols();
 		$out_text = array();
-		if(count($default_prots) > 0)
+		if (count($default_prots) > 0)
 		{
-			array_push($out_text, "Initial protocols from KSES" . KSESTEST_VER . ":");
+			array_push($out_text, "Initial protocols from KSES".KSESTEST_VER.":");
 			array_push($out_text, output_ul($default_prots));
 			array_push($out_text, output_hr());
 		}
 
-		$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));   // Add a list of protocols
-		$myKses->AddProtocols("proto4:");  // Add a single protocol (Note ':' is optional at end)
+		$myKses->AddProtocols(array("proto1", "proto2:", "proto3")); // Add a list of protocols
+		$myKses->AddProtocols("proto4:"); // Add a single protocol (Note ':' is optional at end)
 		$myKses->AddProtocol("proto9", "mystery:", "anarchy");
 		$myKses->AddProtocol("alpha", "beta", "gamma:");
 
 		$add_protocol  = "\t\t\t<ol>\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("proto9", "mystery:", "anarchy");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("alpha", "beta", "gamma:");</li>' . "\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocols("proto4:");</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocols("proto4:");</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocol("proto9", "mystery:", "anarchy");</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocol("alpha", "beta", "gamma:");</li>'."\n";
 		$add_protocol .= "\t\t\t</ol>\n";
 
 		array_push($out_text, $add_protocol);
 
 		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
+		if (count($new_prots) > 0)
 		{
-			array_push($out_text, "New protocols from KSES" . KSESTEST_VER . " after using AddProtocol(s):");
+			array_push($out_text, "New protocols from KSES".KSESTEST_VER." after using AddProtocol(s):");
 			array_push($out_text, output_ul($new_prots));
 			array_push($out_text, output_hr());
 		}
@@ -314,31 +314,31 @@ 
 		$myKses->RemoveProtocol("gamma");
 
 		$remove_protocol  = "\t\t\t<ol>\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols(array("mystery", "anarchy:"));</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols("alpha:");</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("beta:");</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("gamma");</li>' . "\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocols(array("mystery", "anarchy:"));</li>'."\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocols("alpha:");</li>'."\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocol("beta:");</li>'."\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocol("gamma");</li>'."\n";
 		$remove_protocol .= "\t\t\t</ol>\n";
 		array_push($out_text, $remove_protocol);
 
 		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
+		if (count($new_prots) > 0)
 		{
-			array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using RemoveProtocol(s):");
+			array_push($out_text, "Resulting protocols from KSES".KSESTEST_VER." after using RemoveProtocol(s):");
 			array_push($out_text, output_ul($new_prots));
 			array_push($out_text, output_hr());
 		}
 
 		$myKses->SetProtocols(array("https", "gopher", "news"));
 		$set_protocol  = "\t\t\t<ol>\n";
-		$set_protocol .= "\t\t\t\t" . '<li>$myKses->SetProtocols(array("https", "gopher", "news"));</li>' . "\n";
+		$set_protocol .= "\t\t\t\t".'<li>$myKses->SetProtocols(array("https", "gopher", "news"));</li>'."\n";
 		$set_protocol .= "\t\t\t</ol>\n";
 		array_push($out_text, $set_protocol);
 
 		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
+		if (count($new_prots) > 0)
 		{
-			array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using SetProtocols:");
+			array_push($out_text, "Resulting protocols from KSES".KSESTEST_VER." after using SetProtocols:");
 			array_push($out_text, output_ul($new_prots));
 			array_push($out_text, output_hr());
 		}
@@ -427,18 +427,18 @@ 
 		array_push($out, "Net results:");
 
 		$out_elems = $myKses->DumpElements();
-		if(count($out_elems) > 0)
+		if (count($out_elems) > 0)
 		{
 			//array_push($out, "\t\t\t<ul>\n");
-			foreach($out_elems as $tag => $attr_data)
+			foreach ($out_elems as $tag => $attr_data)
 			{
 				$out_li_elems = array();
 				$elem_text = "(X)HTML element $tag";
 				$allow = "";
-				if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
+				if (isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
 				{
 					$allow = " allows attribute";
-					if(count($attr_data) > 1)
+					if (count($attr_data) > 1)
 					{
 						$allow .= "s";
 					}
@@ -448,31 +448,31 @@ 
 				array_push($out_li_elems, "$elem_text$allow");
 
 				$attr_test_li = array();
-				if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
+				if (isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
 				{
-					foreach($attr_data as $attr_name => $attr_tests)
+					foreach ($attr_data as $attr_name => $attr_tests)
 					{
 						$li_text = $attr_name;
-						if(isset($attr_tests) && count($attr_tests) > 0)
+						if (isset($attr_tests) && count($attr_tests) > 0)
 						{
-							foreach($attr_tests as $test_name => $test_val)
+							foreach ($attr_tests as $test_name => $test_val)
 							{
-								switch($test_name)
+								switch ($test_name)
 								{
 									case "maxlen":
-										$li_text .= " - maximum length of '" . $test_val . "' characters";
+										$li_text .= " - maximum length of '".$test_val."' characters";
 										break;
 									case "minlen":
-										$li_text .= " - minimum length of '" . $test_val . "' characters";
+										$li_text .= " - minimum length of '".$test_val."' characters";
 										break;
 									case "minval":
-										$li_text .= " - minimum value of '" . $test_val . "'";
+										$li_text .= " - minimum value of '".$test_val."'";
 										break;
 									case "maxval":
-										$li_text .= " - maximum value of '" . $test_val . "'";
+										$li_text .= " - maximum value of '".$test_val."'";
 										break;
 									case "valueless":
-										switch(strtolower($test_val))
+										switch (strtolower($test_val))
 										{
 											case 'n':
 												$li_text .= " - must not be valueless";
@@ -491,7 +491,7 @@ 
 						}
 						array_push($attr_test_li, $li_text);
 					}
-					if(count($attr_test_li) > 0)
+					if (count($attr_test_li) > 0)
 					{
 						$attr_test_li = output_ul($attr_test_li, "   ");
 						$out_li_elems = array("$elem_text$allow$attr_test_li");

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

Spacing +41 added lines, -41 removed lines

@@ -39,7 +39,7 @@ 
 	*	@subpackage kses4
 	*/
 
-	if(substr(phpversion(), 0, 1) < 4)
+	if (substr(phpversion(), 0, 1) < 4)
 	{
 		die("Class kses requires PHP 4 or higher.");
 	}
@@ -47,7 +47,7 @@ 
 	/**
 	*	Only install KSES4 once
 	*/
-	if(!defined('KSES_CLASS_PHP4'))
+	if (!defined('KSES_CLASS_PHP4'))
 	{
 		define('KSES_CLASS_PHP4', true);
 
@@ -150,7 +150,7 @@ 
 			function AddProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses4::AddProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -158,15 +158,15 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
@@ -189,7 +189,7 @@ 
 			function Protocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses4::Protocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -212,26 +212,26 @@ 
 			 */
 			function AddProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses4::AddProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses4::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
-				if(!in_array($protocol, $this->allowed_protocols))
+				if (!in_array($protocol, $this->allowed_protocols))
 				{
 					array_push($this->allowed_protocols, $protocol);
 					sort($this->allowed_protocols);
@@ -257,7 +257,7 @@ 
 			function SetProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses4::SetProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -265,16 +265,16 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
 					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
@@ -331,37 +331,37 @@ 
 			 */
 			function AddHTML($tag = "", $attribs = array())
 			{
-				if(!is_string($tag))
+				if (!is_string($tag))
 				{
 					trigger_error("kses4::AddHTML() requires the tag to be a string", E_USER_WARNING);
 					return false;
 				}
 
 				$tag = strtolower(trim($tag));
-				if($tag == "")
+				if ($tag == "")
 				{
 					trigger_error("kses4::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
 					return false;
 				}
 
-				if(!is_array($attribs))
+				if (!is_array($attribs))
 				{
 					trigger_error("kses4::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
 					return false;
 				}
 
 				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
+				if (is_array($attribs) && count($attribs) > 0)
 				{
-					foreach($attribs as $idx1 => $val1)
+					foreach ($attribs as $idx1 => $val1)
 					{
 						$new_idx1 = strtolower($idx1);
 						$new_val1 = $attribs[$idx1];
 
-						if(is_array($new_val1) && count($new_val1) > 0)
+						if (is_array($new_val1) && count($new_val1) > 0)
 						{
 							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
+							foreach ($new_val1 as $idx2 => $val2)
 							{
 								$new_idx2 = strtolower($idx2);
 								$tmp_val[$new_idx2] = $val2;
@@ -391,27 +391,27 @@ 
 			 */
 			function RemoveProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses4::RemoveProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses4::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
+				if (in_array($protocol, $this->allowed_protocols))
 				{
 					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
 					sort($this->allowed_protocols);
@@ -438,21 +438,21 @@ 
 			function RemoveProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					return false;
 				}
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->RemoveProtocol($protocol);
 					}
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
@@ -587,14 +587,14 @@ 
 			{
 			  $outarray = array();
 
-				if(is_array($inarray) && count($inarray) > 0)
+				if (is_array($inarray) && count($inarray) > 0)
 				{
 					foreach ($inarray as $inkey => $inval)
 					{
 						$outkey = strtolower($inkey);
 						$outarray[$outkey] = array();
 
-						if(is_array($inval) && count($inval) > 0)
+						if (is_array($inval) && count($inval) > 0)
 						{
 							foreach ($inval as $inkey2 => $inval2)
 							{
@@ -620,9 +620,9 @@ 
 			function _split($string)
 			{
 				return preg_replace(
-					'%(<'.   # EITHER: <
-					'[^>]*'. # things that aren't >
-					'(>|$)'. # > or end of string
+					'%(<'.# EITHER: <
+					'[^>]*'.# things that aren't >
+					'(>|$)'.# > or end of string
 					'|>)%e', # OR: just a >
 					"\$this->_split2('\\1')",
 					$string);
@@ -720,11 +720,11 @@ 
 				# Go through $attrarr, and save the allowed attributes for this element
 				# in $attr2
 				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
+				if (is_array($attrarr) && count($attrarr) > 0)
 				{
 					foreach ($attrarr as $arreach)
 					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+						if (!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
 						{
 							continue;
 						}
@@ -745,7 +745,7 @@ 
 						{
 							# there are some checks
 							$ok = true;
-							if(is_array($current) && count($current) > 0)
+							if (is_array($current) && count($current) > 0)
 							{
 								foreach ($current as $currkey => $currval)
 								{
@@ -827,7 +827,7 @@ 
 									'whole' => $attrname,
 									'vless' => 'y'
 								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
+								$attr = preg_replace('/^\s+/', '', $attr);
 							}
 							break;
 						case 2: # attribute value, a URL after href= for instance
@@ -942,7 +942,7 @@ 
 			function _bad_protocol_once($string)
 			{
 				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+				if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
 				{
 					$string = $this->_bad_protocol_once2($string2[0]).trim($string2[1]);
 				}
@@ -970,7 +970,7 @@ 
 				$string = strtolower($string);
 
 				$allowed = false;
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+				if (is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
 				{
 					foreach ($this->allowed_protocols as $one_protocol)
 					{

main/inc/lib/fileDisplay.lib.php

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
     $last_modified = 0;
     $return = 0;
     if (is_dir($dir)) {
-        while(($entry = $dir->read()) !== false)
+        while (($entry = $dir->read()) !== false)
         {
             if ($entry != '.' && $entry != '..')
                 continue;
@@ -284,7 +284,7 @@ 
         'props.session_id'
     );
 
-    $visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1');
+    $visibility_rule = ' props.visibility '.($can_see_invisible ? '<> 2' : '= 1');
 
     $sql = "SELECT SUM(table1.size) FROM (
                 SELECT size

main/inc/lib/zombie/zombie_manager.class.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $count = intval($count);
         $from = intval($from);
 
-        $sql .=  " ORDER BY $column $direction";
+        $sql .= " ORDER BY $column $direction";
         $sql .= " LIMIT $count, $from ";
 
         $result = Database::query($sql);
@@ -93,8 +93,8 @@ 
     static function deactivate_zombies($ceiling)
     {
         $zombies = self::list_zombies($ceiling);
-        $ids  = array();
-        foreach($zombies as $zombie) {
+        $ids = array();
+        foreach ($zombies as $zombie) {
             $ids[] = $zombie['user_id'];
         }
         UserManager::deactivate_users($ids);

main/inc/lib/zombie/zombie_report.class.php

Spacing +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
         }
 
         $action = $this->get_action();
-        $f = array($this, 'action_' . $action);
+        $f = array($this, 'action_'.$action);
         if (is_callable($f)) {
             return call_user_func($f, $ids);
         }
@@ -292,7 +292,7 @@ 
             $text = get_lang('No');
         }
 
-        $result = Display::return_icon($image . '.png', $text);
+        $result = Display::return_icon($image.'.png', $text);
         return $result;
     }
 

main/inc/lib/xajax/xajaxCompress.php

Spacing +29 added lines, -29 removed lines

@@ -43,13 +43,13 @@ 
 function xajaxCompressJavascript($sJS)
 {
 	//remove windows cariage returns
-	$sJS = str_replace("\r","",$sJS);
+	$sJS = str_replace("\r", "", $sJS);
 
 	//array to store replaced literal strings
 	$literal_strings = array();
 
 	//explode the string into lines
-	$lines = explode("\n",$sJS);
+	$lines = explode("\n", $sJS);
 	//loop through all the lines, building a new string at the same time as removing literal strings
 	$clean = "";
 	$inComment = false;
@@ -58,22 +58,22 @@ 
 	$escaped = false;
 	$quoteChar = "";
 
-	for($i=0;$i<count($lines);$i++)
+	for ($i = 0; $i < count($lines); $i++)
 	{
 		$line = $lines[$i];
 		$inNormalComment = false;
 
 		//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
-		for($j=0;$j<strlen($line);$j++)
+		for ($j = 0; $j < strlen($line); $j++)
 		{
-			$c = substr($line,$j,1);
-			$d = substr($line,$j,2);
+			$c = substr($line, $j, 1);
+			$d = substr($line, $j, 2);
 
 			//look for start of quote
-			if(!$inQuote && !$inComment)
+			if (!$inQuote && !$inComment)
 			{
 				//is this character a quote or a comment
-				if(($c=="\"" || $c=="'") && !$inComment && !$inNormalComment)
+				if (($c == "\"" || $c == "'") && !$inComment && !$inNormalComment)
 				{
 					$inQuote = true;
 					$inComment = false;
@@ -81,7 +81,7 @@ 
 					$quoteChar = $c;
 					$literal = $c;
 				}
-				else if($d=="/*" && !$inNormalComment)
+				else if ($d == "/*" && !$inNormalComment)
 				{
 					$inQuote = false;
 					$inComment = true;
@@ -90,7 +90,7 @@ 
 					$literal = $d;
 					$j++;
 				}
-				else if($d=="//") //ignore string markers that are found inside comments
+				else if ($d == "//") //ignore string markers that are found inside comments
 				{
 					$inNormalComment = true;
 					$clean .= $c;
@@ -102,32 +102,32 @@ 
 			}
 			else //allready in a string so find end quote
 			{
-				if($c == $quoteChar && !$escaped && !$inComment)
+				if ($c == $quoteChar && !$escaped && !$inComment)
 				{
 					$inQuote = false;
 					$literal .= $c;
 
 					//subsitute in a marker for the string
-					$clean .= "___" . count($literal_strings) . "___";
+					$clean .= "___".count($literal_strings)."___";
 
 					//push the string onto our array
-					array_push($literal_strings,$literal);
+					array_push($literal_strings, $literal);
 
 				}
-				else if($inComment && $d=="*/")
+				else if ($inComment && $d == "*/")
 				{
 					$inComment = false;
 					$literal .= $d;
 
 					//subsitute in a marker for the string
-					$clean .= "___" . count($literal_strings) . "___";
+					$clean .= "___".count($literal_strings)."___";
 
 					//push the string onto our array
-					array_push($literal_strings,$literal);
+					array_push($literal_strings, $literal);
 
 					$j++;
 				}
-				else if($c == "\\" && !$escaped)
+				else if ($c == "\\" && !$escaped)
 					$escaped = true;
 				else
 					$escaped = false;
@@ -135,47 +135,47 @@ 
 				$literal .= $c;
 			}
 		}
-		if($inComment) $literal .= "\n";
+		if ($inComment) $literal .= "\n";
 		$clean .= "\n";
 	}
 	//explode the clean string into lines again
-	$lines = explode("\n",$clean);
+	$lines = explode("\n", $clean);
 
 	//now process each line at a time
-	for($i=0;$i<count($lines);$i++)
+	for ($i = 0; $i < count($lines); $i++)
 	{
 		$line = $lines[$i];
 
 		//remove comments
-		$line = preg_replace("/\/\/(.*)/","",$line);
+		$line = preg_replace("/\/\/(.*)/", "", $line);
 
 		//strip leading and trailing whitespace
 		$line = trim($line);
 
 		//remove all whitespace with a single space
-		$line = preg_replace("/\s+/"," ",$line);
+		$line = preg_replace("/\s+/", " ", $line);
 
 		//remove any whitespace that occurs after/before an operator
-		$line = preg_replace("/\s*([!\}\{;,&=\|\-\+\*\/\)\(:])\s*/","\\1",$line);
+		$line = preg_replace("/\s*([!\}\{;,&=\|\-\+\*\/\)\(:])\s*/", "\\1", $line);
 
 		$lines[$i] = $line;
 	}
 
 	//implode the lines
-	$sJS = implode("\n",$lines);
+	$sJS = implode("\n", $lines);
 
 	//make sure there is a max of 1 \n after each line
-	$sJS = preg_replace("/[\n]+/","\n",$sJS);
+	$sJS = preg_replace("/[\n]+/", "\n", $sJS);
 
 	//strip out line breaks that immediately follow a semi-colon
-	$sJS = preg_replace("/;\n/",";",$sJS);
+	$sJS = preg_replace("/;\n/", ";", $sJS);
 
 	//curly brackets aren't on their own
-	$sJS = preg_replace("/[\n]*\{[\n]*/","{",$sJS);
+	$sJS = preg_replace("/[\n]*\{[\n]*/", "{", $sJS);
 
 	//finally loop through and replace all the literal strings:
-	for($i=0;$i<count($literal_strings);$i++)
-		$sJS = str_replace("___".$i."___",$literal_strings[$i],$sJS);
+	for ($i = 0; $i < count($literal_strings); $i++)
+		$sJS = str_replace("___".$i."___", $literal_strings[$i], $sJS);
 
 	return $sJS;
 }

main/inc/lib/text.lib.php

Spacing +74 added lines, -74 removed lines

@@ -58,10 +58,10 @@ 
     if (@preg_match('/(.*<head.*)(<meta[^>]*content=[^>]*>)(.*<\/head>.*)/si', $string, $matches)) {
         $meta = $matches[2];
         if (@preg_match("/(<meta[^>]*charset=)(.*)([\"';][^>]*>)/si", $meta, $matches1)) {
-            $meta = $matches1[1] . $encoding . $matches1[3];
-            $string = $matches[1] . $meta . $matches[3];
+            $meta = $matches1[1].$encoding.$matches1[3];
+            $string = $matches[1].$meta.$matches[3];
         } else {
-            $string = $matches[1] . '<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>' . $matches[3];
+            $string = $matches[1].'<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>'.$matches[3];
         }
     } else {
         $count = 1;
@@ -168,9 +168,9 @@ 
     if (!preg_match(_PCRE_XML_ENCODING, $string)) {
         if (strpos($matches[0], 'standalone') !== false) {
             // The encoding option should precede the standalone option, othewise DOMDocument fails to load the document.
-            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone' , $matches[0]);
+            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone', $matches[0]);
         } else {
-            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>' , $matches[0]);
+            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>', $matches[0]);
         }
         return api_convert_encoding(str_replace($matches[0], $replace, $string), $to_encoding, $from_encoding);
     }
@@ -335,7 +335,7 @@ 
 function _make_url_clickable_cb($matches) {
     $url = $matches[2];
 
-    if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+    if (')' == $matches[3] && strpos($url, '(')) {
         // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
         // Then we can let the parenthesis balancer do its thing below.
         $url .= $matches[3];
@@ -345,16 +345,16 @@ 
     }
 
     // Include parentheses in the URL only if paired
-    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-        $suffix = strrchr( $url, ')' ) . $suffix;
-        $url = substr( $url, 0, strrpos( $url, ')' ) );
+    while (substr_count($url, '(') < substr_count($url, ')')) {
+        $suffix = strrchr($url, ')').$suffix;
+        $url = substr($url, 0, strrpos($url, ')'));
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
+    if (empty($url))
         return $matches[0];
 
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+    return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -374,10 +374,10 @@ 
  * @param string $_context Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
     //$original_url = $url;
 
-    if ( '' == $url )
+    if ('' == $url)
         return $url;
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
@@ -387,9 +387,9 @@ 
      * presume it needs http:// appended (unless a relative
      * link starting with /, # or ? or a php file).
      */
-    if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+    if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) &&
+        !preg_match('/^[a-z0-9-]+?\.php/i', $url))
+        $url = 'http://'.$url;
 
     return Security::remove_XSS($url);
 
@@ -437,12 +437,12 @@ 
  * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
     $subject = (string) $subject;
 
     $count = 1;
-    while ( $count ) {
-        $subject = str_replace( $search, '', $subject, $count );
+    while ($count) {
+        $subject = str_replace($search, '', $subject, $count);
     }
 
     return $subject;
@@ -464,17 +464,17 @@ 
 function _make_web_ftp_clickable_cb($matches) {
     $ret = '';
     $dest = $matches[2];
-    $dest = 'http://' . $dest;
+    $dest = 'http://'.$dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
+    if (empty($dest))
         return $matches[0];
 
     // removed trailing [.,;:)] from URL
-    if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+    if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
         $ret = substr($dest, -1);
-        $dest = substr($dest, 0, strlen($dest)-1);
+        $dest = substr($dest, 0, strlen($dest) - 1);
     }
-    return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+    return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -490,8 +490,8 @@ 
  * @return string HTML A element with email address.
  */
 function _make_email_clickable_cb($matches) {
-    $email = $matches[2] . '@' . $matches[3];
-    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+    $email = $matches[2].'@'.$matches[3];
+    return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -505,30 +505,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
     $r = '';
-    $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+    $textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-    foreach ( $textarr as $piece ) {
+    foreach ($textarr as $piece) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
+        if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece))
             $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
+        elseif (('</code>' === strtolower($piece) || '</pre>' === strtolower($piece)) && $nested_code_pre)
             $nested_code_pre--;
 
-        if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+        if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && !preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
             $r .= $piece;
             continue;
         }
 
         // Long strings might contain expensive edge cases ...
-        if ( 10000 < strlen( $piece ) ) {
+        if (10000 < strlen($piece)) {
             // ... break it up
-            foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-                if ( 2101 < strlen( $chunk ) ) {
+            foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+                if (2101 < strlen($chunk)) {
                     $r .= $chunk; // Too big, no whitespace: bail.
                 } else {
-                    $r .= make_clickable( $chunk );
+                    $r .= make_clickable($chunk);
                 }
             }
         } else {
@@ -549,18 +549,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
             // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-            $ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+            $ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-            $ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-            $ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+            $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+            $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-            $ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+            $ret = substr($ret, 1, -1); // Remove our whitespace padding.
             $r .= $ret;
         }
     }
 
     // Cleanup of accidental links within links
-    $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+    $r = preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
     return $r;
 }
 
@@ -595,27 +595,27 @@ 
  * @param int $goal The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
     $chunks = array();
 
-    $string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+    $string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-    while ( $goal < strlen( $string_nullspace ) ) {
-        $pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+    while ($goal < strlen($string_nullspace)) {
+        $pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-        if ( false === $pos ) {
-            $pos = strpos( $string_nullspace, "\000", $goal + 1 );
-            if ( false === $pos ) {
+        if (false === $pos) {
+            $pos = strpos($string_nullspace, "\000", $goal + 1);
+            if (false === $pos) {
                 break;
             }
         }
 
-        $chunks[] = substr( $string, 0, $pos + 1 );
-        $string = substr( $string, $pos + 1 );
-        $string_nullspace = substr( $string_nullspace, $pos + 1 );
+        $chunks[] = substr($string, 0, $pos + 1);
+        $string = substr($string, $pos + 1);
+        $string_nullspace = substr($string_nullspace, $pos + 1);
     }
 
-    if ( $string ) {
+    if ($string) {
         $chunks[] = $string;
     }
 
@@ -693,7 +693,7 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
+       $time = api_strtotime($date, 'UTC');
        return date('W', $time);
     } else {
         return date('W');
@@ -710,17 +710,17 @@ 
  * @return a reduce string
  */
 
-function substrwords($text,$maxchar,$end='...')
+function substrwords($text, $maxchar, $end = '...')
 {
-	if(strlen($text)>$maxchar)
+	if (strlen($text) > $maxchar)
 	{
-		$words=explode(" ",$text);
+		$words = explode(" ", $text);
 		$output = '';
-		$i=0;
-		while(1)
+		$i = 0;
+		while (1)
 		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
+			$length = (strlen($output) + strlen($words[$i]));
+			if ($length > $maxchar)
 			{
 				break;
 			}
@@ -742,7 +742,7 @@ 
 function implode_with_key($glue, $array) {
     if (!empty($array)) {
         $string = '';
-        foreach($array as $key => $value) {
+        foreach ($array as $key => $value) {
             if (empty($value)) {
                 $value = 'null';
             }
@@ -764,13 +764,13 @@ 
 {
     $file_size = intval($file_size);
     if ($file_size >= 1073741824) {
-        $file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
-    } elseif($file_size >= 1048576) {
-        $file_size = round($file_size / 1048576 * 100) / 100 . 'M';
-    } elseif($file_size >= 1024) {
-        $file_size = round($file_size / 1024 * 100) / 100 . 'k';
+        $file_size = round($file_size / 1073741824 * 100) / 100.'G';
+    } elseif ($file_size >= 1048576) {
+        $file_size = round($file_size / 1048576 * 100) / 100.'M';
+    } elseif ($file_size >= 1024) {
+        $file_size = round($file_size / 1024 * 100) / 100.'k';
     } else {
-        $file_size = $file_size . 'B';
+        $file_size = $file_size.'B';
     }
     return $file_size;
 }
@@ -779,18 +779,18 @@ 
 {
     $year	 = '0000';
     $month = $day = $hours = $minutes = $seconds = '00';
-    if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
+    if (isset($array['Y']) && (isset($array['F']) || isset($array['M'])) && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
-        $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        $month = isset($array['F']) ? $array['F'] : $array['M'];
+        if (intval($month) < 10) $month = '0'.$month;
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10) $day = '0'.$day;
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10) $hours = '0'.$hours;
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10) $minutes = '0'.$minutes;
     }
-    if (checkdate($month,$day,$year)) {
+    if (checkdate($month, $day, $year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;
     }
     return $datetime;