chamilo / chamilo-lms

main/inc/lib/specific_fields_manager.lib.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 function delete_specific_field($id)
 {
     $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-    $id = (int)$id;
+    $id = (int) $id;
     if (!is_numeric($id)) {
         return false;
     }
@@ -60,7 +60,7 @@ 
 function edit_specific_field($id, $name)
 {
     $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-    $id = (int)$id;
+    $id = (int) $id;
     if (!is_numeric($id)) {
         return false;
     }

main/inc/lib/timeline.lib.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
 	public function __construct()
     {
-        $this->table =  Database::get_course_table(TABLE_TIMELINE);
+        $this->table = Database::get_course_table(TABLE_TIMELINE);
 	}
 
     /**
@@ -46,7 +46,7 @@ 
      */
     public function get_all($where_conditions = array())
     {
-        return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'headline ASC'));
+        return Database::select('*', $this->table, array('where'=>$where_conditions, 'order' =>'headline ASC'));
     }
 
     /**
@@ -57,7 +57,7 @@ 
 		// action links
 		$html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', '32').'</a>';
 		$html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
@@ -244,7 +244,7 @@ 
         }
         unset($item['end_date']);
         // Assets
-        $item['asset'] = array( 'media'     => $item['media'],
+        $item['asset'] = array('media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
          );

main/inc/lib/classmanager.lib.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
         $sql = "SELECT * FROM $table_class_user cu, $table_user u WHERE cu.class_id = '".$class_id."' AND cu.user_id = u.user_id";
         $res = Database::query($sql);
-        $users = array ();
+        $users = array();
         while ($user = Database::fetch_array($res, 'ASSOC')) {
             $users[] = $user;
         }
@@ -117,7 +117,7 @@ 
         $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
         $courses = ClassManager :: get_courses($class_id);
         if (count($courses) != 0) {
-            $course_codes = array ();
+            $course_codes = array();
             foreach ($courses as $index => $course) {
                 $course_codes[] = $course['course_code'];
                 $sql = "SELECT DISTINCT user_id FROM $table_class_user t1, $table_course_class t2 WHERE t1.class_id=t2.class_id AND course_code = '".$course['course_code']."' AND user_id = $user_id AND t2.class_id<>'$class_id'";
@@ -142,7 +142,7 @@ 
         $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
         $sql = "SELECT * FROM $table_class_course cc, $table_course c WHERE cc.class_id = '".$class_id."' AND cc.course_code = c.code";
         $res = Database::query($sql);
-        $courses = array ();
+        $courses = array();
         while ($course = Database::fetch_array($res, 'ASSOC')) {
             $courses[] = $course;
         }
@@ -217,7 +217,7 @@ 
         $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS);
         $sql = "SELECT cl.* FROM $table_class cl, $table_course_class cc WHERE cc.course_code = '".Database::escape_string($course_code)."' AND cc.class_id = cl.id";
         $res = Database::query($sql);
-        $classes = array ();
+        $classes = array();
         while ($class = Database::fetch_array($res, 'ASSOC')) {
             $classes[] = $class;
         }

main/inc/lib/app_view.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
      * Constructor, init tool path for rendering
      * @param string  tool name (optional)
      */
-    public function __construct($toolname = '', $template_path=null)
+    public function __construct($toolname = '', $template_path = null)
     {
         if (!empty($toolname)) {
             if (isset($template_path)) {
@@ -30,7 +30,7 @@ 
             if (is_dir($path)) {
                 $this->tool_path = $path;
             } else {
-                throw new ViewException('View::__construct() $path directory does not exist ' . $path);
+                throw new ViewException('View::__construct() $path directory does not exist '.$path);
             }
         }
     }
@@ -42,7 +42,7 @@ 
     public function set_data($data)
     {
         if (!is_array($data)) {
-            throw new ViewException('View::set_data() $data must to be an array, you have sent a' . gettype( $data ));
+            throw new ViewException('View::set_data() $data must to be an array, you have sent a'.gettype($data));
         }
         $this->data = $data;
     }
@@ -51,7 +51,7 @@ 
      * Set layout view sent from a controller
      * @param string layout view
      */
-    public function set_layout( $layout )
+    public function set_layout($layout)
     {
         $this->layout = $layout;
     }

main/inc/lib/add_courses_to_session_functions.lib.php

Spacing +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
 		$course_title = null;
 		$xajax_response = new xajaxResponse();
 		$return = '';
-		if(!empty($needle) && !empty($type)) {
+		if (!empty($needle) && !empty($type)) {
 			// xajax send utf8 datas... datas in db can be non-utf8 datas
 			$charset = api_get_system_encoding();
 			$needle = api_convert_encoding($needle, $charset, 'utf-8');
@@ -38,13 +38,13 @@ 
 					while ($row = Database::fetch_row($res)) {
 						$course_codes .= '\''.$row[0].'\',';
 					}
-					$course_codes = substr($course_codes,0,(strlen($course_codes)-1));
+					$course_codes = substr($course_codes, 0, (strlen($course_codes) - 1));
 
 					$cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
 				}
 			}
 
-			if ($type=='single') {
+			if ($type == 'single') {
 				// search users where username or firstname or lastname begins likes $needle
 				$sql = 'SELECT
 							course.code,
@@ -69,9 +69,9 @@ 
 			if (api_is_multiple_url_enabled()) {
 				$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
 				$access_url_id = api_get_current_access_url_id();
-				if ($access_url_id != -1){
+				if ($access_url_id != -1) {
 
-					if ($type=='single') {
+					if ($type == 'single') {
 						$sql = 'SELECT
 						            course.code,
 						            course.visual_code,
@@ -101,24 +101,24 @@ 
 
 			$rs = Database::query($sql);
 			$course_list = array();
-			if ($type=='single') {
+			if ($type == 'single') {
 
-				while($course = Database :: fetch_array($rs)) {
+				while ($course = Database :: fetch_array($rs)) {
 					$course_list[] = $course['code'];
-					$course_title=str_replace("'","\'",$course_title);
+					$course_title = str_replace("'", "\'", $course_title);
 					$return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['code'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />';
 				}
-				$xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return));
+				$xajax_response -> addAssign('ajax_list_courses_single', 'innerHTML', api_utf8_encode($return));
 			} else {
 				$return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
-				while($course = Database :: fetch_array($rs)) {
+				while ($course = Database :: fetch_array($rs)) {
 					$course_list[] = $course['code'];
-					$course_title=str_replace("'","\'",$course_title);
-					$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')',ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';
+					$course_title = str_replace("'", "\'", $course_title);
+					$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')', ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';
 				}
 				$return .= '</select>';
 
-				$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+				$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 			}
 		}
 		$_SESSION['course_list'] = $course_list;

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

Spacing +10 added lines, -15 removed lines

@@ -73,9 +73,9 @@ 
 # matches stray ">" characters.
 ###############################################################################
 {
-  return preg_replace('%(<'.   # EITHER: <
-                      '[^>]*'. # things that aren't >
-                      '(>|$)'. # > or end of string
+  return preg_replace('%(<'.# EITHER: <
+                      '[^>]*'.# things that aren't >
+                      '(>|$)'.# > or end of string
                       '|>)%e', # OR: just a >
                       "kses_split2('\\1', \$allowed_html, ".
                       '$allowed_protocols)',
@@ -228,8 +228,7 @@ 
         if (preg_match('/^\s+/', $attr)) # valueless
         {
           $working = 1; $mode = 0;
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => '',
                          'whole' => $attrname,
                          'vless' => 'y');
@@ -245,8 +244,7 @@ 
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => $thisval,
                          'whole' => "$attrname=\"$thisval\"",
                          'vless' => 'n');
@@ -260,8 +258,7 @@ 
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => $thisval,
                          'whole' => "$attrname='$thisval'",
                          'vless' => 'n');
@@ -275,8 +272,7 @@ 
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => $thisval,
                          'whole' => "$attrname=\"$thisval\"",
                          'vless' => 'n');
@@ -298,8 +294,7 @@ 
   if ($mode == 1)
   # special case, for when the attribute list ends with a valueless
   # attribute like "selected"
-    $attrarr[] = array
-                  ('name'  => $attrname,
+    $attrarr[] = array('name'  => $attrname,
                    'value' => '',
                    'whole' => $attrname,
                    'vless' => 'y');
@@ -470,9 +465,9 @@ 
 ###############################################################################
 {
 	$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 = 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;
 } # function kses_bad_protocol_once

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");