BOINC / boinc

html/inc/forum_email.inc

Doc Comments +4 added lines

@@ -196,6 +196,10 @@
 
 //////////////////// a banishment vote has been started  ///////////
 //
+/**
+ * @param integer $duration
+ * @param integer $end_time
+ */
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
 	global $master_url;
     $now=time();

Indentation +8 added lines, -8 removed lines

@@ -128,7 +128,7 @@ 
     $link = secure_url_base() . "forum_thread.php?id=" . $thread->id;
     $body = "Another " . PROJECT . " user has posted to the thread
 \"" . $thread->title . "\".\n"
-           ."To view the updated thread, visit:\n$link
+            ."To view the updated thread, visit:\n$link
 
 --------------------------
 To change email preferences, visit:
@@ -141,7 +141,7 @@ 
 //////////////////// a user clicks the red "x" to report a post ///////////
 //
 function send_report_post_email($user, $forum, $thread,  $post, $message) {
-	global $master_url;
+    global $master_url;
 
     $body = "";
     $owner = BoincUser::lookup_id($post->user);
@@ -197,7 +197,7 @@ 
 //////////////////// a banishment vote has been started  ///////////
 //
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
-	global $master_url;
+    global $master_url;
     $now=time();
     $subject = PROJECT." banishment vote underway";
     $vote_url = $master_url."forum_banishment_vote.php";
@@ -219,11 +219,11 @@ 
     pm_send_msg($user, $user, $subject, $body, false);
 
     $body .= "\n\n<a href=".$vote_url."?action=yes&userid="
-             .$user->id
-           .">[vote to banish author]</a>\n\n"
-           ."<a href=".$vote_url."?action=no&userid="
-             .$user->id
-           .">[vote not to banish author]</a>";
+                .$user->id
+            .">[vote to banish author]</a>\n\n"
+            ."<a href=".$vote_url."?action=no&userid="
+                .$user->id
+            .">[vote not to banish author]</a>";
 
     $forum = new BoincForum;
     $forum->parent_type = 0;

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
 // - project forums: everyone in POST_REPORT_EMAILS
 // - team message board: team founder and admins
 //
-function mail_report_list($forum, $subject, $body, $must_send=false) {
+function mail_report_list($forum, $subject, $body, $must_send = false) {
     $success = true;
     switch ($forum->parent_type) {
     case 0:
@@ -62,7 +62,7 @@ 
 function send_moderation_email($forum, $post, $thread, $explanation, $action) {
     global $master_url;
 
-    $moderator=get_logged_in_user();
+    $moderator = get_logged_in_user();
     $body = "";
     $user = BoincUser::lookup_id($post->user);
 
@@ -123,11 +123,11 @@ 
 // If a user is subscribed to a thread that is replied to,
 // send them an email notifying them of the reply.
 //
-function send_reply_notification_email($thread, $user){
-    $title = PROJECT . ": A user has posted to '". $thread->title ."'";
-    $link = secure_url_base() . "forum_thread.php?id=" . $thread->id;
-    $body = "Another " . PROJECT . " user has posted to the thread
-\"" . $thread->title . "\".\n"
+function send_reply_notification_email($thread, $user) {
+    $title = PROJECT.": A user has posted to '".$thread->title."'";
+    $link = secure_url_base()."forum_thread.php?id=".$thread->id;
+    $body = "Another ".PROJECT." user has posted to the thread
+\"" . $thread->title."\".\n"
            ."To view the updated thread, visit:\n$link
 
 --------------------------
@@ -140,7 +140,7 @@ 
 
 //////////////////// a user clicks the red "x" to report a post ///////////
 //
-function send_report_post_email($user, $forum, $thread,  $post, $message) {
+function send_report_post_email($user, $forum, $thread, $post, $message) {
 	global $master_url;
 
     $body = "";
@@ -198,16 +198,16 @@ 
 //
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
 	global $master_url;
-    $now=time();
+    $now = time();
     $subject = PROJECT." banishment vote underway";
     $vote_url = $master_url."forum_banishment_vote.php";
     $body = "
 A vote has been started to banish you
 from the ".PROJECT." message boards until ".date('M j,
-Y G:i', $duration+$now).",
+Y G:i', $duration + $now).",
 because your postings have not followed our guidelines.
 
-This vote will last until ".date('M j, Y G:i',$end_time)." or until a majority
+This vote will last until ".date('M j, Y G:i', $end_time)." or until a majority
 decision has been reached.  If the vote does not result in banishment, you will be
 able to resume posting at that time.
     ";

html/inc/forum_rss.inc

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
     return false;
 }
 
+/**
+ * @param boolean $no_images
+ */
 function show_forum_rss_item($thread, $userid, $threads_only, $no_images) {
     $unique_url=secure_url_base()."forum_thread.php?id=".$thread->id;
 

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 }
 
 function show_forum_rss_item($thread, $userid, $threads_only, $no_images) {
-    $unique_url=secure_url_base()."forum_thread.php?id=".$thread->id;
+    $unique_url = secure_url_base()."forum_thread.php?id=".$thread->id;
 
     $clause2 = " and hidden=0 ";
     if ($userid) $clause2 .= "and user=$userid";
@@ -41,7 +41,7 @@ 
     }
     if (!count($posts)) return;
     $post = $posts[0];
-    $post_date = gmdate('D, d M Y H:i:s',$post->timestamp).' GMT';
+    $post_date = gmdate('D, d M Y H:i:s', $post->timestamp).' GMT';
     $post_user = BOincUser::lookup_id($post->user);
     BoincForumPrefs::lookup($post_user);
     $options = new output_options();
@@ -84,25 +84,25 @@ 
 
     // Now construct header
     //
-    header ("Expires: " . gmdate('D, d M Y H:i:s', time()+86400) . " GMT");
+    header("Expires: ".gmdate('D, d M Y H:i:s', time() + 86400)." GMT");
     if (sizeof($threads)) {
         $t = $threads[0];
-        $last_mod_time = $threads_only?$t->create_time:$t->timestamp;
-        $create_date  = gmdate('D, d M Y H:i:s', $last_mod_time) . ' GMT'; 
-        header ("Last-Modified: " . $create_date);
+        $last_mod_time = $threads_only ? $t->create_time : $t->timestamp;
+        $create_date  = gmdate('D, d M Y H:i:s', $last_mod_time).' GMT'; 
+        header("Last-Modified: ".$create_date);
     } else {
-        $create_date  = gmdate('D, d M Y H:i:s') . ' GMT'; 
+        $create_date  = gmdate('D, d M Y H:i:s').' GMT'; 
     }
-    header ("Content-Type: application/xml");
+    header("Content-Type: application/xml");
 
-    $forum=BoincForum::lookup_id($forumid);
+    $forum = BoincForum::lookup_id($forumid);
     // Create channel header and open XML content
     //
     $description = PROJECT.": $forum->title";
     if ($userid) {
         $description .= " (posts by $user->name)";
     }
-    $channel_image = secure_url_base() . "rss_image.gif";
+    $channel_image = secure_url_base()."rss_image.gif";
     $language = "en-us";
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
         <rss version=\"2.0\">

Braces +21 added lines, -7 removed lines

@@ -23,9 +23,15 @@ 
 // return true if the given HTML may contain images or video
 //
 function contains_image_or_video($x) {
-    if (strstr($x, "<img ")) return true;
-    if (strstr($x, "<object ")) return true;
-    if (strstr($x, "<iframe ")) return true;
+    if (strstr($x, "<img ")) {
+        return true;
+    }
+    if (strstr($x, "<object ")) {
+        return true;
+    }
+    if (strstr($x, "<iframe ")) {
+        return true;
+    }
     return false;
 }
 
@@ -33,13 +39,17 @@ 
     $unique_url=secure_url_base()."forum_thread.php?id=".$thread->id;
 
     $clause2 = " and hidden=0 ";
-    if ($userid) $clause2 .= "and user=$userid";
+    if ($userid) {
+        $clause2 .= "and user=$userid";
+    }
     if ($threads_only) {
         $posts = BoincPost::enum("thread=$thread->id $clause2 order by id limit 1");
     } else {
         $posts = BoincPost::enum("thread=$thread->id $clause2 order by timestamp desc limit 1");
     }
-    if (!count($posts)) return;
+    if (!count($posts)) {
+        return;
+    }
     $post = $posts[0];
     $post_date = gmdate('D, d M Y H:i:s',$post->timestamp).' GMT';
     $post_user = BOincUser::lookup_id($post->user);
@@ -49,7 +59,9 @@ 
         $options->htmlitems = false;
     }
     $t = output_transform($post->content, $options);
-    if ($no_images && contains_image_or_video($t)) return;
+    if ($no_images && contains_image_or_video($t)) {
+        return;
+    }
     echo "<item>
         <title><![CDATA[".sanitize_tags(bb2html($thread->title))."]]></title>
         <link>$unique_url</link>
@@ -65,7 +77,9 @@ 
 
     if ($userid) {
         $user = BoincUser::lookup_id($userid);
-        if (!$user) error_page("no such user");
+        if (!$user) {
+            error_page("no such user");
+        }
         $clause .= " and owner=$userid";
     }
 

html/inc/geoip.inc

Doc Comments +13 added lines

@@ -229,6 +229,9 @@ 
   shmop_close ($shmid);
 }
 
+/**
+ * @param GeoIP $gi
+ */
 function _setup_segments($gi){
   $gi->databaseType = GEOIP_COUNTRY_EDITION;
   $gi->record_length = STANDARD_RECORD_LENGTH;
@@ -311,6 +314,10 @@ 
   return $gi;
 }
 
+/**
+ * @param string $filename
+ * @param integer $flags
+ */
 function geoip_open($filename, $flags) {
   $gi = new GeoIP;
   $gi->flags = $flags;
@@ -419,6 +426,9 @@ 
   return false;
 }
 
+/**
+ * @param integer $ipnum
+ */
 function _get_org($gi,$ipnum){
   $seek_org = _geoip_seek_country($gi,$ipnum);
   if ($seek_org == $gi->databaseSegments) {
@@ -443,6 +453,9 @@ 
   return _get_org($gi, $ipnum);
 }
 
+/**
+ * @param integer $ipnum
+ */
 function _get_region($gi,$ipnum){
   if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
     $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;

Indentation +112 added lines, -112 removed lines

@@ -213,26 +213,26 @@ 
 }
 function geoip_load_shared_mem ($file) {
 
-  $fp = fopen($file, "rb");
-  if (!$fp) {
+    $fp = fopen($file, "rb");
+    if (!$fp) {
     print "error opening $file: $php_errormsg\n";
     exit;
-  }
-  $s_array = fstat($fp);
-  $size = $s_array['size'];
-  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
+    }
+    $s_array = fstat($fp);
+    $size = $s_array['size'];
+    if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
     shmop_delete ($shmid);
     shmop_close ($shmid);
-  }
-  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
-  shmop_write ($shmid, fread($fp, $size), 0);
-  shmop_close ($shmid);
+    }
+    $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
+    shmop_write ($shmid, fread($fp, $size), 0);
+    shmop_close ($shmid);
 }
 
 function _setup_segments($gi){
-  $gi->databaseType = GEOIP_COUNTRY_EDITION;
-  $gi->record_length = STANDARD_RECORD_LENGTH;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    $gi->databaseType = GEOIP_COUNTRY_EDITION;
+    $gi->record_length = STANDARD_RECORD_LENGTH;
+    if ($gi->flags & GEOIP_SHARED_MEMORY) {
     $offset = @shmop_size ($gi->shmid) - 3;
     for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
         $delim = @shmop_read ($gi->shmid, $offset, 3);
@@ -245,19 +245,19 @@ 
                 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
             } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
                 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
+        } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
                      ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
                     || ($gi->databaseType == GEOIP_ORG_EDITION)
-		    || ($gi->databaseType == GEOIP_ISP_EDITION)
-		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+            || ($gi->databaseType == GEOIP_ISP_EDITION)
+            || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
                 $gi->databaseSegments = 0;
                 $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
                 for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
                     $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
                 }
-	            if (($gi->databaseType == GEOIP_ORG_EDITION)||
-			($gi->databaseType == GEOIP_ISP_EDITION)) {
-	                $gi->record_length = ORG_RECORD_LENGTH;
+                if (($gi->databaseType == GEOIP_ORG_EDITION)||
+            ($gi->databaseType == GEOIP_ISP_EDITION)) {
+                    $gi->record_length = ORG_RECORD_LENGTH;
                 }
             }
             break;
@@ -270,7 +270,7 @@ 
         ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
-  } else {
+    } else {
     $filepos = ftell($gi->filehandle);
     fseek($gi->filehandle, -3, SEEK_END);
     for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
@@ -281,19 +281,19 @@ 
             $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
         }
         else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+        $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
                 }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
                  ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || 
                  ($gi->databaseType == GEOIP_ORG_EDITION) || 
-		 ($gi->databaseType == GEOIP_ISP_EDITION) || 
+         ($gi->databaseType == GEOIP_ISP_EDITION) || 
                  ($gi->databaseType == GEOIP_ASNUM_EDITION)){
             $gi->databaseSegments = 0;
             $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
             for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
             $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
             }
-	    if ($gi->databaseType == GEOIP_ORG_EDITION) {
-	    $gi->record_length = ORG_RECORD_LENGTH;
+        if ($gi->databaseType == GEOIP_ORG_EDITION) {
+        $gi->record_length = ORG_RECORD_LENGTH;
             }
         }
         break;
@@ -304,17 +304,17 @@ 
     if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
         ($gi->databaseType == GEOIP_PROXY_EDITION)||
         ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+            $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
     fseek($gi->filehandle,$filepos,SEEK_SET);
-  }
-  return $gi;
+    }
+    return $gi;
 }
 
 function geoip_open($filename, $flags) {
-  $gi = new GeoIP;
-  $gi->flags = $flags;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    $gi = new GeoIP;
+    $gi->flags = $flags;
+    if ($gi->flags & GEOIP_SHARED_MEMORY) {
     $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
     } else {
     $gi->filehandle = fopen($filename,"rb");
@@ -322,174 +322,174 @@ 
         $s_array = fstat($gi->filehandle);
         $gi->memory_buffer = fread($gi->filehandle, $s_array[size]);
     }
-  }
+    }
 
-  $gi = _setup_segments($gi);
-  return $gi;
+    $gi = _setup_segments($gi);
+    return $gi;
 }
 
 function geoip_close($gi) {
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    if ($gi->flags & GEOIP_SHARED_MEMORY) {
     return true;
-  }
+    }
 
-  return fclose($gi->filehandle);
+    return fclose($gi->filehandle);
 }
 
 function geoip_country_id_by_name($gi, $name) {
-  $addr = gethostbyname($name);
-  if (!$addr || $addr == $name) {
+    $addr = gethostbyname($name);
+    if (!$addr || $addr == $name) {
     return false;
-  }
-  return geoip_country_id_by_addr($gi, $addr);
+    }
+    return geoip_country_id_by_addr($gi, $addr);
 }
 
 function geoip_country_code_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
-  if ($country_id !== false) {
+    $country_id = geoip_country_id_by_name($gi,$name);
+    if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_CODES[$country_id];
-  }
-  return false;
+    }
+    return false;
 }
 
 function geoip_country_name_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
-  if ($country_id !== false) {
+    $country_id = geoip_country_id_by_name($gi,$name);
+    if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-  }
-  return false;
+    }
+    return false;
 }
 
 function geoip_country_id_by_addr($gi, $addr) {
-  $ipnum = ip2long($addr);
-  return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
+    $ipnum = ip2long($addr);
+    return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
 }
 
 function geoip_country_code_by_addr($gi, $addr) {
-  $country_id = geoip_country_id_by_addr($gi,$addr);
-  if ($country_id !== false) {
+    $country_id = geoip_country_id_by_addr($gi,$addr);
+    if ($country_id !== false) {
     return $gi->GEOIP_COUNTRY_CODES[$country_id];
-  }
-  return false;
+    }
+    return false;
 }
 
 function geoip_country_name_by_addr($gi, $addr) {
-  $country_id = geoip_country_id_by_addr($gi,$addr);
-  if ($country_id !== false) {
+    $country_id = geoip_country_id_by_addr($gi,$addr);
+    if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-  }
-  return false;
+    }
+    return false;
 }
 
 function _geoip_seek_country($gi, $ipnum) {
-  $offset = 0;
-  for ($depth = 31; $depth >= 0; --$depth) {
+    $offset = 0;
+    for ($depth = 31; $depth >= 0; --$depth) {
     if ($gi->flags & GEOIP_MEMORY_CACHE) {
-      $buf = substr($gi->memory_buffer,
+        $buf = substr($gi->memory_buffer,
                             2 * $gi->record_length * $offset,
                             2 * $gi->record_length);
         } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-      $buf = @shmop_read ($gi->shmid, 
+        $buf = @shmop_read ($gi->shmid, 
                             2 * $gi->record_length * $offset,
                             2 * $gi->record_length );
         } else {
-      fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+        fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
         or die("fseek failed");
-      $buf = fread($gi->filehandle, 2 * $gi->record_length);
+        $buf = fread($gi->filehandle, 2 * $gi->record_length);
     }
     $x = array(0,0);
     for ($i = 0; $i < 2; ++$i) {
-      for ($j = 0; $j < $gi->record_length; ++$j) {
+        for ($j = 0; $j < $gi->record_length; ++$j) {
         $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
-      }
+        }
     }
     if ($ipnum & (1 << $depth)) {
-      if ($x[1] >= $gi->databaseSegments) {
+        if ($x[1] >= $gi->databaseSegments) {
         return $x[1];
-      }
-      $offset = $x[1];
+        }
+        $offset = $x[1];
         } else {
-      if ($x[0] >= $gi->databaseSegments) {
+        if ($x[0] >= $gi->databaseSegments) {
         return $x[0];
-      }
-      $offset = $x[0];
+        }
+        $offset = $x[0];
+    }
     }
-  }
-  trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
-  return false;
+    trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
+    return false;
 }
 
 function _get_org($gi,$ipnum){
-  $seek_org = _geoip_seek_country($gi,$ipnum);
-  if ($seek_org == $gi->databaseSegments) {
+    $seek_org = _geoip_seek_country($gi,$ipnum);
+    if ($seek_org == $gi->databaseSegments) {
     return NULL;
-  }
-  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+    }
+    $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
+    if ($gi->flags & GEOIP_SHARED_MEMORY) {
     $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
     } else {
     fseek($gi->filehandle, $record_pointer, SEEK_SET);
     $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
-  }
-  $org_buf = substr($org_buf, 0, strpos($org_buf, 0));
-  return $org_buf;
+    }
+    $org_buf = substr($org_buf, 0, strpos($org_buf, 0));
+    return $org_buf;
 }
 
 function geoip_org_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
+    if ($addr == NULL) {
     return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_org($gi, $ipnum);
+    }
+    $ipnum = ip2long($addr);
+    return _get_org($gi, $ipnum);
 }
 
 function _get_region($gi,$ipnum){
-  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+    if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
     $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
     if ($seek_region >= 1000){
-      $country_code = "US";
-      $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
+        $country_code = "US";
+        $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
     } else {
             $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
-      $region = "";
+        $region = "";
     }
-  return array ($country_code,$region);
+    return array ($country_code,$region);
     }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
     $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
     //print $seek_region;
     if ($seek_region < US_OFFSET){
-      $country_code = "";
-      $region = "";  
+        $country_code = "";
+        $region = "";  
         } else if ($seek_region < CANADA_OFFSET) {
-      $country_code = "US";
-      $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
+        $country_code = "US";
+        $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
         } else if ($seek_region < WORLD_OFFSET) {
-      $country_code = "CA";
-      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
+        $country_code = "CA";
+        $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
     } else {
             $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
-      $region = "";
+        $region = "";
+    }
+    return array ($country_code,$region);
     }
-  return array ($country_code,$region);
-  }
 }
 
 function geoip_region_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
+    if ($addr == NULL) {
     return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_region($gi, $ipnum);
+    }
+    $ipnum = ip2long($addr);
+    return _get_region($gi, $ipnum);
 }
 
 function getdnsattributes ($l,$ip){
-  $r = new Net_DNS_Resolver();
-  $r->nameservers = array("ws1.maxmind.com");
-  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
-  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
-  ereg("\"(.*)\"",$str,$regs);
-  $str = $regs[1];
-  return $str;
+    $r = new Net_DNS_Resolver();
+    $r->nameservers = array("ws1.maxmind.com");
+    $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
+    $str = is_object($p->answer[0])?$p->answer[0]->string():'';
+    ereg("\"(.*)\"",$str,$regs);
+    $str = $regs[1];
+    return $str;
 }
 
 ?>

Spacing +103 added lines, -103 removed lines

@@ -138,25 +138,25 @@ 
 "VU", "WF", "WS", "YE", "YT", "CS", "ZA", "ZM", "ZR", "ZW", "A1", "A2", "O1"
 );
     var $GEOIP_COUNTRY_CODES3 = array(
-"","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO","AQ","ARG",
-"ASM","AUT","AUS","ABW","AZE","BIH","BRB","BGD","BEL","BFA","BGR","BHR","BDI",
-"BEN","BMU","BRN","BOL","BRA","BHS","BTN","BV","BWA","BLR","BLZ","CAN","CC",
-"COD","CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI","CUB","CPV",
-"CX","CYP","CZE","DEU","DJI","DNK","DMA","DOM","DZA","ECU","EST","EGY","ESH",
-"ERI","ESP","ETH","FIN","FJI","FLK","FSM","FRO","FRA","FX","GAB","GBR","GRD",
-"GEO","GUF","GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","GS","GTM","GUM",
-"GNB","GUY","HKG","HM","HND","HRV","HTI","HUN","IDN","IRL","ISR","IND","IO",
-"IRQ","IRN","ISL","ITA","JAM","JOR","JPN","KEN","KGZ","KHM","KIR","COM","KNA",
-"PRK","KOR","KWT","CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU",
-"LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI","MMR","MNG","MAC",
-"MNP","MTQ","MRT","MSR","MLT","MUS","MDV","MWI","MEX","MYS","MOZ","NAM","NCL",
-"NER","NFK","NGA","NIC","NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER",
-"PYF","PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW","PRY","QAT",
-"REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN","SWE","SGP","SHN","SVN","SJM",
-"SVK","SLE","SMR","SEN","SOM","SUR","STP","SLV","SYR","SWZ","TCA","TCD","TF",
-"TGO","THA","TJK","TKL","TLS","TKM","TUN","TON","TUR","TTO","TUV","TWN","TZA",
-"UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN","VGB","VIR","VNM","VUT",
-        "WLF","WSM","YEM","YT","SCG","ZAF","ZMB","ZR","ZWE","A1","A2","O1"
+"", "AP", "EU", "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "ANT", "AGO", "AQ", "ARG",
+"ASM", "AUT", "AUS", "ABW", "AZE", "BIH", "BRB", "BGD", "BEL", "BFA", "BGR", "BHR", "BDI",
+"BEN", "BMU", "BRN", "BOL", "BRA", "BHS", "BTN", "BV", "BWA", "BLR", "BLZ", "CAN", "CC",
+"COD", "CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI", "CUB", "CPV",
+"CX", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM", "DZA", "ECU", "EST", "EGY", "ESH",
+"ERI", "ESP", "ETH", "FIN", "FJI", "FLK", "FSM", "FRO", "FRA", "FX", "GAB", "GBR", "GRD",
+"GEO", "GUF", "GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "GS", "GTM", "GUM",
+"GNB", "GUY", "HKG", "HM", "HND", "HRV", "HTI", "HUN", "IDN", "IRL", "ISR", "IND", "IO",
+"IRQ", "IRN", "ISL", "ITA", "JAM", "JOR", "JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA",
+"PRK", "KOR", "KWT", "CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU",
+"LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MDG", "MHL", "MKD", "MLI", "MMR", "MNG", "MAC",
+"MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV", "MWI", "MEX", "MYS", "MOZ", "NAM", "NCL",
+"NER", "NFK", "NGA", "NIC", "NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER",
+"PYF", "PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW", "PRY", "QAT",
+"REU", "ROU", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN", "SWE", "SGP", "SHN", "SVN", "SJM",
+"SVK", "SLE", "SMR", "SEN", "SOM", "SUR", "STP", "SLV", "SYR", "SWZ", "TCA", "TCD", "TF",
+"TGO", "THA", "TJK", "TKL", "TLS", "TKM", "TUN", "TON", "TUR", "TTO", "TUV", "TWN", "TZA",
+"UKR", "UGA", "UM", "USA", "URY", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT",
+        "WLF", "WSM", "YEM", "YT", "SCG", "ZAF", "ZMB", "ZR", "ZWE", "A1", "A2", "O1"
     );
     var $GEOIP_COUNTRY_NAMES = array(
 "", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates",
@@ -208,10 +208,10 @@ 
 Grenadines", "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.",
 "Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte",
 "Serbia and Montenegro", "South Africa", "Zambia", "Zaire", "Zimbabwe",
-"Anonymous Proxy","Satellite Provider","Other"
+"Anonymous Proxy", "Satellite Provider", "Other"
 );
 }
-function geoip_load_shared_mem ($file) {
+function geoip_load_shared_mem($file) {
 
   $fp = fopen($file, "rb");
   if (!$fp) {
@@ -220,42 +220,42 @@ 
   }
   $s_array = fstat($fp);
   $size = $s_array['size'];
-  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
-    shmop_delete ($shmid);
-    shmop_close ($shmid);
+  if ($shmid = @shmop_open(GEOIP_SHM_KEY, "w", 0, 0)) {
+    shmop_delete($shmid);
+    shmop_close($shmid);
   }
-  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
-  shmop_write ($shmid, fread($fp, $size), 0);
-  shmop_close ($shmid);
+  $shmid = shmop_open(GEOIP_SHM_KEY, "c", 0644, $size);
+  shmop_write($shmid, fread($fp, $size), 0);
+  shmop_close($shmid);
 }
 
-function _setup_segments($gi){
+function _setup_segments($gi) {
   $gi->databaseType = GEOIP_COUNTRY_EDITION;
   $gi->record_length = STANDARD_RECORD_LENGTH;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $offset = @shmop_size ($gi->shmid) - 3;
+  if ($gi->flags&GEOIP_SHARED_MEMORY) {
+    $offset = @shmop_size($gi->shmid) - 3;
     for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = @shmop_read ($gi->shmid, $offset, 3);
+        $delim = @shmop_read($gi->shmid, $offset, 3);
         $offset += 3;
         if ($delim == (chr(255).chr(255).chr(255))) {
-            $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
+            $gi->databaseType = ord(@shmop_read($gi->shmid, $offset, 1));
             $offset++;
 
-            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
                 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
                 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
+	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
                      ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
                     || ($gi->databaseType == GEOIP_ORG_EDITION)
 		    || ($gi->databaseType == GEOIP_ISP_EDITION)
-		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)) {
                 $gi->databaseSegments = 0;
-                $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
-                for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-                    $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+                $buf = @shmop_read($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
+                for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
+                    $gi->databaseSegments += (ord($buf[$j]) << ($j*8));
                 }
-	            if (($gi->databaseType == GEOIP_ORG_EDITION)||
+	            if (($gi->databaseType == GEOIP_ORG_EDITION) ||
 			($gi->databaseType == GEOIP_ISP_EDITION)) {
 	                $gi->record_length = ORG_RECORD_LENGTH;
                 }
@@ -265,32 +265,32 @@ 
             $offset -= 4;
         }
     }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+    if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
+        ($gi->databaseType == GEOIP_PROXY_EDITION) ||
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)) {
         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
   } else {
     $filepos = ftell($gi->filehandle);
     fseek($gi->filehandle, -3, SEEK_END);
     for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = fread($gi->filehandle,3);
-        if ($delim == (chr(255).chr(255).chr(255))){
-        $gi->databaseType = ord(fread($gi->filehandle,1));
-        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+        $delim = fread($gi->filehandle, 3);
+        if ($delim == (chr(255).chr(255).chr(255))) {
+        $gi->databaseType = ord(fread($gi->filehandle, 1));
+        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
             $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
         }
-        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
 	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-                }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
+                } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
                  ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || 
                  ($gi->databaseType == GEOIP_ORG_EDITION) || 
 		 ($gi->databaseType == GEOIP_ISP_EDITION) || 
-                 ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+                 ($gi->databaseType == GEOIP_ASNUM_EDITION)) {
             $gi->databaseSegments = 0;
-            $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
-            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-            $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+            $buf = fread($gi->filehandle, SEGMENT_RECORD_LENGTH);
+            for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
+            $gi->databaseSegments += (ord($buf[$j]) << ($j*8));
             }
 	    if ($gi->databaseType == GEOIP_ORG_EDITION) {
 	    $gi->record_length = ORG_RECORD_LENGTH;
@@ -301,12 +301,12 @@ 
         fseek($gi->filehandle, -4, SEEK_CUR);
         }
     }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+    if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
+        ($gi->databaseType == GEOIP_PROXY_EDITION) ||
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)) {
          $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
-    fseek($gi->filehandle,$filepos,SEEK_SET);
+    fseek($gi->filehandle, $filepos, SEEK_SET);
   }
   return $gi;
 }
@@ -314,11 +314,11 @@ 
 function geoip_open($filename, $flags) {
   $gi = new GeoIP;
   $gi->flags = $flags;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
+  if ($gi->flags&GEOIP_SHARED_MEMORY) {
+    $gi->shmid = @shmop_open(GEOIP_SHM_KEY, "a", 0, 0);
     } else {
-    $gi->filehandle = fopen($filename,"rb");
-    if ($gi->flags & GEOIP_MEMORY_CACHE) {
+    $gi->filehandle = fopen($filename, "rb");
+    if ($gi->flags&GEOIP_MEMORY_CACHE) {
         $s_array = fstat($gi->filehandle);
         $gi->memory_buffer = fread($gi->filehandle, $s_array[size]);
     }
@@ -329,7 +329,7 @@ 
 }
 
 function geoip_close($gi) {
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+  if ($gi->flags&GEOIP_SHARED_MEMORY) {
     return true;
   }
 
@@ -345,7 +345,7 @@ 
 }
 
 function geoip_country_code_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
+  $country_id = geoip_country_id_by_name($gi, $name);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_CODES[$country_id];
   }
@@ -353,7 +353,7 @@ 
 }
 
 function geoip_country_name_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
+  $country_id = geoip_country_id_by_name($gi, $name);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
   }
@@ -366,7 +366,7 @@ 
 }
 
 function geoip_country_code_by_addr($gi, $addr) {
-  $country_id = geoip_country_id_by_addr($gi,$addr);
+  $country_id = geoip_country_id_by_addr($gi, $addr);
   if ($country_id !== false) {
     return $gi->GEOIP_COUNTRY_CODES[$country_id];
   }
@@ -374,7 +374,7 @@ 
 }
 
 function geoip_country_name_by_addr($gi, $addr) {
-  $country_id = geoip_country_id_by_addr($gi,$addr);
+  $country_id = geoip_country_id_by_addr($gi, $addr);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
   }
@@ -384,26 +384,26 @@ 
 function _geoip_seek_country($gi, $ipnum) {
   $offset = 0;
   for ($depth = 31; $depth >= 0; --$depth) {
-    if ($gi->flags & GEOIP_MEMORY_CACHE) {
+    if ($gi->flags&GEOIP_MEMORY_CACHE) {
       $buf = substr($gi->memory_buffer,
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length);
-        } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-      $buf = @shmop_read ($gi->shmid, 
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length );
+                            2*$gi->record_length*$offset,
+                            2*$gi->record_length);
+        } elseif ($gi->flags&GEOIP_SHARED_MEMORY) {
+      $buf = @shmop_read($gi->shmid, 
+                            2*$gi->record_length*$offset,
+                            2*$gi->record_length);
         } else {
-      fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+      fseek($gi->filehandle, 2*$gi->record_length*$offset, SEEK_SET) == 0
         or die("fseek failed");
-      $buf = fread($gi->filehandle, 2 * $gi->record_length);
+      $buf = fread($gi->filehandle, 2*$gi->record_length);
     }
-    $x = array(0,0);
+    $x = array(0, 0);
     for ($i = 0; $i < 2; ++$i) {
       for ($j = 0; $j < $gi->record_length; ++$j) {
-        $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
+        $x[$i] += ord($buf[$gi->record_length*$i + $j]) << ($j*8);
       }
     }
-    if ($ipnum & (1 << $depth)) {
+    if ($ipnum&(1 << $depth)) {
       if ($x[1] >= $gi->databaseSegments) {
         return $x[1];
       }
@@ -419,23 +419,23 @@ 
   return false;
 }
 
-function _get_org($gi,$ipnum){
-  $seek_org = _geoip_seek_country($gi,$ipnum);
+function _get_org($gi, $ipnum) {
+  $seek_org = _geoip_seek_country($gi, $ipnum);
   if ($seek_org == $gi->databaseSegments) {
     return NULL;
   }
-  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
+  $record_pointer = $seek_org + (2*$gi->record_length - 1)*$gi->databaseSegments;
+  if ($gi->flags&GEOIP_SHARED_MEMORY) {
+    $org_buf = @shmop_read($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
     } else {
     fseek($gi->filehandle, $record_pointer, SEEK_SET);
-    $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
+    $org_buf = fread($gi->filehandle, MAX_ORG_RECORD_LENGTH);
   }
   $org_buf = substr($org_buf, 0, strpos($org_buf, 0));
   return $org_buf;
 }
 
-function geoip_org_by_addr ($gi,$addr) {
+function geoip_org_by_addr($gi, $addr) {
   if ($addr == NULL) {
     return 0;
   }
@@ -443,38 +443,38 @@ 
   return _get_org($gi, $ipnum);
 }
 
-function _get_region($gi,$ipnum){
-  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
-    if ($seek_region >= 1000){
+function _get_region($gi, $ipnum) {
+  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
+    $seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV0;
+    if ($seek_region >= 1000) {
       $country_code = "US";
-      $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
+      $region = chr(($seek_region - 1000)/26 + 65).chr(($seek_region - 1000)%26 + 65);
     } else {
             $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
       $region = "";
     }
-  return array ($country_code,$region);
-    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
+  return array($country_code, $region);
+    } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+    $seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV1;
     //print $seek_region;
-    if ($seek_region < US_OFFSET){
+    if ($seek_region < US_OFFSET) {
       $country_code = "";
       $region = "";  
         } else if ($seek_region < CANADA_OFFSET) {
       $country_code = "US";
-      $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
+      $region = chr(($seek_region - US_OFFSET)/26 + 65).chr(($seek_region - US_OFFSET)%26 + 65);
         } else if ($seek_region < WORLD_OFFSET) {
       $country_code = "CA";
-      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
+      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65).chr(($seek_region - CANADA_OFFSET)%26 + 65);
     } else {
-            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
+            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET)/FIPS_RANGE];
       $region = "";
     }
-  return array ($country_code,$region);
+  return array($country_code, $region);
   }
 }
 
-function geoip_region_by_addr ($gi,$addr) {
+function geoip_region_by_addr($gi, $addr) {
   if ($addr == NULL) {
     return 0;
   }
@@ -482,12 +482,12 @@ 
   return _get_region($gi, $ipnum);
 }
 
-function getdnsattributes ($l,$ip){
+function getdnsattributes($l, $ip) {
   $r = new Net_DNS_Resolver();
   $r->nameservers = array("ws1.maxmind.com");
-  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
-  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
-  ereg("\"(.*)\"",$str,$regs);
+  $p = $r->search($l.".".$ip.".s.maxmind.com", "TXT", "IN");
+  $str = is_object($p->answer[0]) ? $p->answer[0]->string() : '';
+  ereg("\"(.*)\"", $str, $regs);
   $str = $regs[1];
   return $str;
 }

Braces +3 added lines, -4 removed lines

@@ -279,10 +279,9 @@ 
         $gi->databaseType = ord(fread($gi->filehandle,1));
         if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
             $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-        }
-        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+        } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
 	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-                }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
+                } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
                  ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || 
                  ($gi->databaseType == GEOIP_ORG_EDITION) || 
 		 ($gi->databaseType == GEOIP_ISP_EDITION) || 
@@ -454,7 +453,7 @@ 
       $region = "";
     }
   return array ($country_code,$region);
-    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+    } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
     $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
     //print $seek_region;
     if ($seek_region < US_OFFSET){

html/inc/host.inc

Doc Comments +14 added lines

@@ -324,6 +324,11 @@ 
 // so it's OK to show the domain name etc.
 // If private is false, show the owner's name only if they've given permission
 //
+/**
+ * @param integer $i
+ * @param boolean $show_owner
+ * @param boolean $any_product_name
+ */
 function show_host_row($host, $i, $private, $show_owner, $any_product_name) {
     $anonymous = false;
     if (!$private) {
@@ -503,6 +508,9 @@ 
 // that their time intervals are disjoint.
 // So the CPU/OS checks don't have to be very strict.
 //
+/**
+ * @param boolean $show_detail
+ */
 function hosts_compatible($host1, $host2, $show_detail) {
     // A host is "new" if it has no credit and no results.
     // Skip disjoint-time check if one host or other is new
@@ -642,6 +650,9 @@ 
     return "hosts_user.php?sort=$sort&rev=$rev&show_all=$show_all$x";
 }
 
+/**
+ * @param string $sort
+ */
 function link_url_rev($actual_sort, $sort, $rev, $show_all) {
     if ($actual_sort == $sort) {
         $rev = 1 - $rev;
@@ -661,6 +672,9 @@ 
     echo "<p>";
 }
 
+/**
+ * @param boolean $any_product_name
+ */
 function user_host_table_start(
     $private, $sort, $rev, $show_all, $any_product_name
 ) {

Spacing +15 added lines, -15 removed lines

@@ -32,12 +32,12 @@ 
 
 function sched_log_name($x) {
     if ($x == 0) return "NO_SUCH_LOG";
-    return gmdate('Y-m-d_H/Y-m-d_H:i', $x) . ".txt";
+    return gmdate('Y-m-d_H/Y-m-d_H:i', $x).".txt";
 }
 
 function sched_log_link($x) {
     if (file_exists("sched_logs")) {
-        return "<a href=\"../sched_logs/" . sched_log_name($x) . "\">" . time_str($x) . "</a>";
+        return "<a href=\"../sched_logs/".sched_log_name($x)."\">".time_str($x)."</a>";
     } else {
         return time_str($x);
     }
@@ -45,7 +45,7 @@ 
 
 function location_form($host) {
     $none = "selected";
-    $h=$w=$s=$m="";
+    $h = $w = $s = $m = "";
     if ($host->venue == "home") $h = "selected";
     if ($host->venue == "work") $w = "selected";
     if ($host->venue == "school") $s = "selected";
@@ -98,7 +98,7 @@ 
             row2(tra("Product name"), $host->product_name);
         }
         $x = $host->timezone/3600;
-        if ($x >= 0) $x="+$x";
+        if ($x >= 0) $x = "+$x";
         row2(tra("Local Standard Time"), tra("UTC %1 hours", $x));
     } else {
         $owner = BoincUser::lookup_id($host->userid);
@@ -256,7 +256,7 @@ 
         if ($d[0] == "BOINC") continue;
         if ($d[0] == "vbox") continue;
         if ($str) $str .= "<p>";
-        if ($d[2]!="" && $d[2]!="1") $str .= "[".$d[2]."] ";
+        if ($d[2] != "" && $d[2] != "1") $str .= "[".$d[2]."] ";
         if ($d[0] == "CUDA") {
             $str .= "NVIDIA";
         } else if ($d[0] == "CAL") {
@@ -449,14 +449,14 @@ 
     if ($pos1 === false) return $x;
     $pos2 = strpos($model, ']');
     if ($pos2 === false) return $x;
-    $a = substr($model, $pos1+1, $pos2-$pos1-1);
+    $a = substr($model, $pos1 + 1, $pos2 - $pos1 - 1);
     $y = explode(" ", $a);
     if (count($y) == 0) return $x;
     if ($y[0] == "Family") {
         $x->info = $a;
     } else {
         $x->arch = $y[0];
-        $x->info = substr($a, strlen($y[0])+1);
+        $x->info = substr($a, strlen($y[0]) + 1);
     }
     return $x;
 }
@@ -545,7 +545,7 @@ 
     $avg_time = 0;
 
     $results = BoincResult::enum("hostid=$hostid order by received_time");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         if ($result->granted_credit <= 0) continue;
         $total += $result->granted_credit;
 
@@ -638,7 +638,7 @@ 
 
 function link_url($sort, $rev, $show_all) {
     global $userid;
-    $x = $userid ? "&userid=$userid":"";
+    $x = $userid ? "&userid=$userid" : "";
     return "hosts_user.php?sort=$sort&rev=$rev&show_all=$show_all$x";
 }
 
@@ -710,7 +710,7 @@ 
 }
 
 function show_user_hosts($userid, $private, $show_all, $sort, $rev) {
-    $desc = false;  // whether the sort order's default is decreasing
+    $desc = false; // whether the sort order's default is decreasing
     switch ($sort) {
     case "total_credit": $sort_clause = "total_credit"; $desc = true; break;
     case "expavg_credit": $sort_clause = "expavg_credit"; $desc = true; break;
@@ -733,7 +733,7 @@ 
     more_or_less($sort, $rev, $show_all);
 
     $now = time();
-    $old_hosts=0;
+    $old_hosts = 0;
     $i = 1;
     $hosts = BoincHost::enum("userid=$userid order by $sort_clause");
     $any_product_name = false;
@@ -745,9 +745,9 @@ 
     }
     user_host_table_start($private, $sort, $rev, $show_all, $any_product_name);
     foreach ($hosts as $host) {
-        $is_old=false;
+        $is_old = false;
         if (($now - $host->rpc_time) > 30*86400) {
-            $is_old=true;
+            $is_old = true;
             $old_hosts++;
         }
         if (!$show_all && $is_old) continue;
@@ -756,7 +756,7 @@ 
     }
     end_table();
 
-    if ($old_hosts>0) {
+    if ($old_hosts > 0) {
         more_or_less($sort, $rev, $show_all);
     }
 
@@ -776,6 +776,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Braces +102 added lines, -34 removed lines

@@ -22,16 +22,24 @@ 
 require_once("../inc/user.inc");
 
 function link_to_results($host) {
-    if (!$host) return tra("No host");
+    if (!$host) {
+        return tra("No host");
+    }
     $config = get_config();
-    if (!parse_bool($config, "show_results")) return tra("Unavailable");
+    if (!parse_bool($config, "show_results")) {
+        return tra("Unavailable");
+    }
     $nresults = host_nresults($host);
-    if (!$nresults) return "0";
+    if (!$nresults) {
+        return "0";
+    }
     return "<a href=results.php?hostid=$host->id>$nresults</a>";
 }
 
 function sched_log_name($x) {
-    if ($x == 0) return "NO_SUCH_LOG";
+    if ($x == 0) {
+        return "NO_SUCH_LOG";
+    }
     return gmdate('Y-m-d_H/Y-m-d_H:i', $x) . ".txt";
 }
 
@@ -46,9 +54,15 @@ 
 function location_form($host) {
     $none = "selected";
     $h=$w=$s=$m="";
-    if ($host->venue == "home") $h = "selected";
-    if ($host->venue == "work") $w = "selected";
-    if ($host->venue == "school") $s = "selected";
+    if ($host->venue == "home") {
+        $h = "selected";
+    }
+    if ($host->venue == "work") {
+        $w = "selected";
+    }
+    if ($host->venue == "school") {
+        $s = "selected";
+    }
     $x = "<form action=host_venue_action.php>
         <input type=hidden name=hostid value=$host->id>
         <select class=\"form-control\" name=venue>
@@ -98,7 +112,9 @@ 
             row2(tra("Product name"), $host->product_name);
         }
         $x = $host->timezone/3600;
-        if ($x >= 0) $x="+$x";
+        if ($x >= 0) {
+            $x="+$x";
+        }
         row2(tra("Local Standard Time"), tra("UTC %1 hours", $x));
     } else {
         $owner = BoincUser::lookup_id($host->userid);
@@ -253,10 +269,18 @@ 
         $desc = trim($desc, "[");
         $d = explode("|", $desc);
         //print_r($d);
-        if ($d[0] == "BOINC") continue;
-        if ($d[0] == "vbox") continue;
-        if ($str) $str .= "<p>";
-        if ($d[2]!="" && $d[2]!="1") $str .= "[".$d[2]."] ";
+        if ($d[0] == "BOINC") {
+            continue;
+        }
+        if ($d[0] == "vbox") {
+            continue;
+        }
+        if ($str) {
+            $str .= "<p>";
+        }
+        if ($d[2]!="" && $d[2]!="1") {
+            $str .= "[".$d[2]."] ";
+        }
         if ($d[0] == "CUDA") {
             $str .= "NVIDIA";
         } else if ($d[0] == "CAL") {
@@ -297,7 +321,9 @@ 
 
 
     }
-    if (!$str) $str = "---";
+    if (!$str) {
+        $str = "---";
+    }
     return $str;
 }
 
@@ -305,7 +331,9 @@ 
 //
 function boinc_version($x) {
     $y = strstr($x, 'BOINC');
-    if (!$y) return '';
+    if (!$y) {
+        return '';
+    }
     $z = explode("]", $y, 2);
     $a = explode('|', $z[0]);
     $v = $a[1];
@@ -442,16 +470,26 @@ 
     $x->arch = null;
     $x->info = null;
     foreach ($y as $z) {
-        if (strstr($z, "GHz")) $x->speed = $z;
-        if (strstr($z, "MHz")) $x->speed = $z;
+        if (strstr($z, "GHz")) {
+            $x->speed = $z;
+        }
+        if (strstr($z, "MHz")) {
+            $x->speed = $z;
+        }
     }
     $pos1 = strpos($model, '[');
-    if ($pos1 === false) return $x;
+    if ($pos1 === false) {
+        return $x;
+    }
     $pos2 = strpos($model, ']');
-    if ($pos2 === false) return $x;
+    if ($pos2 === false) {
+        return $x;
+    }
     $a = substr($model, $pos1+1, $pos2-$pos1-1);
     $y = explode(" ", $a);
-    if (count($y) == 0) return $x;
+    if (count($y) == 0) {
+        return $x;
+    }
     if ($y[0] == "Family") {
         $x->info = $a;
     } else {
@@ -462,38 +500,64 @@ 
 }
 
 function cpus_compatible($host1, $host2) {
-    if ($host1->p_ncpus != $host2->p_ncpus) return false;
-    if ($host1->p_vendor != $host2->p_vendor) return false;
+    if ($host1->p_ncpus != $host2->p_ncpus) {
+        return false;
+    }
+    if ($host1->p_vendor != $host2->p_vendor) {
+        return false;
+    }
     $x1 = parse_model($host1->p_model);
     $x2 = parse_model($host2->p_model);
     if ($x1->info && $x2->info) {
-        if ($x1->info != $x2->info) return false;
+        if ($x1->info != $x2->info) {
+            return false;
+        }
         if ($x1->speed && $x2->speed) {
-            if ($x1->speed != $x2->speed) return false;
+            if ($x1->speed != $x2->speed) {
+                return false;
+            }
         }
         if ($x1->arch && $x2->arch) {
-            if ($x1->arch != $x2->arch) return false;
+            if ($x1->arch != $x2->arch) {
+                return false;
+            }
         }
         return true;
     }
-    if ($host1->p_model != $host2->p_model) return false;
+    if ($host1->p_model != $host2->p_model) {
+        return false;
+    }
     return true;
 }
 
 // does one host strictly precede the other?
 //
 function times_disjoint($host1, $host2) {
-    if ($host1->rpc_time < $host2->create_time) return true;
-    if ($host2->rpc_time < $host1->create_time) return true;
+    if ($host1->rpc_time < $host2->create_time) {
+        return true;
+    }
+    if ($host2->rpc_time < $host1->create_time) {
+        return true;
+    }
     return false;
 }
 
 function os_compatible($host1, $host2) {
-    if (strstr($host1->os_name, "Windows") && strstr($host2->os_name, "Windows")) return true;
-    if (strstr($host1->os_name, "Linux") && strstr($host2->os_name, "Linux")) return true;
-    if (strstr($host1->os_name, "Darwin") && strstr($host2->os_name, "Darwin")) return true;
-    if (strstr($host1->os_name, "SunOS") && strstr($host2->os_name, "SunOS")) return true;
-    if ($host1->os_name == $host2->os_name) return true;
+    if (strstr($host1->os_name, "Windows") && strstr($host2->os_name, "Windows")) {
+        return true;
+    }
+    if (strstr($host1->os_name, "Linux") && strstr($host2->os_name, "Linux")) {
+        return true;
+    }
+    if (strstr($host1->os_name, "Darwin") && strstr($host2->os_name, "Darwin")) {
+        return true;
+    }
+    if (strstr($host1->os_name, "SunOS") && strstr($host2->os_name, "SunOS")) {
+        return true;
+    }
+    if ($host1->os_name == $host2->os_name) {
+        return true;
+    }
     return false;
 }
 
@@ -546,7 +610,9 @@ 
 
     $results = BoincResult::enum("hostid=$hostid order by received_time");
     foreach($results as $result) {
-        if ($result->granted_credit <= 0) continue;
+        if ($result->granted_credit <= 0) {
+            continue;
+        }
         $total += $result->granted_credit;
 
         update_average(
@@ -750,7 +816,9 @@ 
             $is_old=true;
             $old_hosts++;
         }
-        if (!$show_all && $is_old) continue;
+        if (!$show_all && $is_old) {
+            continue;
+        }
         show_host_row($host, $i, $private, false, $any_product_name);
         $i++;
     }

html/inc/htmLawed.php

Doc Comments +4 added lines

@@ -616,6 +616,10 @@
 // eof 
 } 
 
+/**
+ * @param string $e
+ * @param string $a
+ */
 function hl_tag2(&$e, &$a, $t=1){ 
 // transform tag 
 if($e == 'center'){$e = 'div'; return 'text-align: center;';} 

Indentation +340 added lines, -340 removed lines

@@ -12,49 +12,49 @@ 
 function htmLawed($t, $C=1, $S=array()){ 
 $C = is_array($C) ? $C : array(); 
 if(!empty($C['valid_xhtml'])){ 
- $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements']; 
- $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2; 
- $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2; 
+    $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements']; 
+    $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2; 
+    $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2; 
 } 
 // config eles 
 $e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1); // 86/deprecated+embed+ruby 
 if(!empty($C['safe'])){ 
- unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']); 
+    unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']); 
 } 
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*'; 
 if($x == '-*'){$e = array();} 
 elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));} 
 else{ 
- if(isset($x[1])){ 
-  preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER); 
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];} 
-  foreach($m as $v){ 
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;} 
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);} 
-  } 
- } 
+    if(isset($x[1])){ 
+    preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER); 
+    for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];} 
+    foreach($m as $v){ 
+    if($v[0] == '+'){$e[substr($v, 1)] = 1;} 
+    if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);} 
+    } 
+    } 
 } 
 $C['elements'] =& $e; 
 // config attrs 
 $x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : ''; 
 $x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : ''))); 
 if(isset($x['on*'])){ 
- unset($x['on*']); 
- $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1); 
+    unset($x['on*']); 
+    $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1); 
 } 
 $C['deny_attribute'] = $x; 
 // config URL 
 $x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https'; 
 $C['schemes'] = array(); 
 foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){ 
- $x = $x2 = null; list($x, $x2) = explode(':', $v, 2); 
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));} 
+    $x = $x2 = null; list($x, $x2) = explode(':', $v, 2); 
+    if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));} 
 } 
 if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);} 
 if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);} 
 $C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0; 
 if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){ 
- $C['base_url'] = $C['abs_url'] = 0; 
+    $C['base_url'] = $C['abs_url'] = 0; 
 } 
 // config rest 
 $C['and_mark'] = empty($C['and_mark']) ? 0 : 1; 
@@ -89,16 +89,16 @@ 
 
 $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t); 
 if($C['clean_ms_char']){ 
- $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ'); 
- $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"')); 
- $t = strtr($t, $x); 
+    $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ'); 
+    $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"')); 
+    $t = strtr($t, $x); 
 } 
 if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);} 
 $t = preg_replace_callback('`&amp;([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'hl_ent', str_replace('&', '&amp;', $t)); 
 if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();} 
 if($C['hook']){$t = $C['hook']($t, $C, $S);} 
 if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){ 
- $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime()); 
+    $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime()); 
 } 
 // main 
 $t = preg_replace_callback('`<(?:(?:\s|$)|(?:[^>]*(?:>|$)))|>`m', 'hl_tag', $t); 
@@ -116,25 +116,25 @@ 
 // check attr val against $S 
 $o = 1; $l = strlen($t); 
 foreach($p as $k=>$v){ 
- switch($k){ 
-  case 'maxlen':if($l > $v){$o = 0;} 
-  break; case 'minlen': if($l < $v){$o = 0;} 
-  break; case 'maxval': if((float)($t) > $v){$o = 0;} 
-  break; case 'minval': if((float)($t) < $v){$o = 0;} 
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;} 
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} 
-  break; case 'oneof': 
+    switch($k){ 
+    case 'maxlen':if($l > $v){$o = 0;} 
+    break; case 'minlen': if($l < $v){$o = 0;} 
+    break; case 'maxval': if((float)($t) > $v){$o = 0;} 
+    break; case 'minval': if((float)($t) < $v){$o = 0;} 
+    break; case 'match': if(!preg_match($v, $t)){$o = 0;} 
+    break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} 
+    break; case 'oneof': 
    $m = 0; 
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} 
-   $o = $m; 
-  break; case 'noneof': 
+    foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} 
+    $o = $m; 
+    break; case 'noneof': 
    $m = 1; 
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} 
-   $o = $m; 
-  break; default: 
+    foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} 
+    $o = $m; 
+    break; default: 
   break; 
- } 
- if(!$o){break;} 
+    } 
+    if(!$o){break;} 
 } 
 return ($o ? $t : (isset($p['default']) ? $p['default'] : 0)); 
 // eof 
@@ -164,7 +164,7 @@ 
 // $in sets allowed child 
 $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div'; 
 if(isset($cE[$in])){ 
- return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t)); 
+    return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t)); 
 } 
 if(isset($cS[$in])){$inOk = $cS[$in];} 
 elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
@@ -178,116 +178,116 @@ 
 ob_start(); 
 
 for($i=-1, $ci=count($t); ++$i<$ci;){ 
- // allowed $ok in parent $p 
- if($ql = count($q)){ 
-  $p = array_pop($q); 
-  $q[] = $p; 
-  if(isset($cS[$p])){$ok = $cS[$p];} 
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
- // bad tags, & ele content 
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
-  echo '&lt;', $s, $e, $a, '&gt;'; 
- } 
- if(isset($x[0])){ 
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
-   echo '<div>', $x, '</div>'; 
-  } 
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
-  elseif(strpos($x, "\x02\x04")){ 
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
+    // allowed $ok in parent $p 
+    if($ql = count($q)){ 
+    $p = array_pop($q); 
+    $q[] = $p; 
+    if(isset($cS[$p])){$ok = $cS[$p];} 
+    elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
+    elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
+    elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
+    if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
+    if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
+    }else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
+    // bad tags, & ele content 
+    if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
+    echo '&lt;', $s, $e, $a, '&gt;'; 
+    } 
+    if(isset($x[0])){ 
+    if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
+    echo '<div>', $x, '</div>'; 
+    } 
+    elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
+    elseif(strpos($x, "\x02\x04")){ 
+    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
-   } 
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
- } 
- // get markup 
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;} 
- $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r; 
- // close tag 
- if($s){ 
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen 
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open 
-  $add = ''; // Nesting - close open tags that need to be 
-  for($j=-1, $cj=count($q); ++$j<$cj;){   
-   if(($d = array_pop($q)) == $e){break;} 
-   else{$add .= "</{$d}>";} 
-  } 
-  echo $add, '</', $e, '>'; unset($e); continue; 
- } 
- // open tag 
- // $cB ele needs $eB ele as child 
- if(isset($cB[$e]) && strlen(trim($x))){ 
-  $t[$i] = "{$e}{$a}>"; 
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue; 
- } 
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){ 
-  array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue; 
- } 
- // if no open ele, $in = parent; mostly immediate parent-child relation should hold 
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){ 
-  if(!isset($ok[$e])){ 
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;} 
-   continue; 
-  } 
-  if(!isset($cE[$e])){$q[] = $e;} 
-  echo '<', $e, $a, '>'; unset($e); continue; 
- } 
- // specific parent-child 
- if(isset($cS[$p][$e])){ 
-  if(!isset($cE[$e])){$q[] = $e;} 
-  echo '<', $e, $a, '>'; unset($e); continue; 
- } 
- // nesting 
- $add = ''; 
- $q2 = array(); 
- for($k=-1, $kc=count($q); ++$k<$kc;){ 
-  $d = $q[$k]; 
-  $ok2 = array(); 
-  if(isset($cS[$d])){$q2[] = $d; continue;} 
-  $ok2 = isset($cI[$d]) ? $eI : $eF; 
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];} 
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);} 
-  if(!isset($ok2[$e])){ 
-   if(!$k && !isset($inOk[$e])){continue 2;} 
-   $add = "</{$d}>"; 
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";} 
-   break; 
-  } 
-  else{$q2[] = $d;} 
- } 
- $q = $q2; 
- if(!isset($cE[$e])){$q[] = $e;} 
- echo $add, '<', $e, $a, '>'; unset($e); continue; 
+    } 
+    }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+    } 
+    // get markup 
+    if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;} 
+    $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r; 
+    // close tag 
+    if($s){ 
+    if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen 
+    if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open 
+    $add = ''; // Nesting - close open tags that need to be 
+    for($j=-1, $cj=count($q); ++$j<$cj;){   
+    if(($d = array_pop($q)) == $e){break;} 
+    else{$add .= "</{$d}>";} 
+    } 
+    echo $add, '</', $e, '>'; unset($e); continue; 
+    } 
+    // open tag 
+    // $cB ele needs $eB ele as child 
+    if(isset($cB[$e]) && strlen(trim($x))){ 
+    $t[$i] = "{$e}{$a}>"; 
+    array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue; 
+    } 
+    if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){ 
+    array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue; 
+    } 
+    // if no open ele, $in = parent; mostly immediate parent-child relation should hold 
+    if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){ 
+    if(!isset($ok[$e])){ 
+    if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;} 
+    continue; 
+    } 
+    if(!isset($cE[$e])){$q[] = $e;} 
+    echo '<', $e, $a, '>'; unset($e); continue; 
+    } 
+    // specific parent-child 
+    if(isset($cS[$p][$e])){ 
+    if(!isset($cE[$e])){$q[] = $e;} 
+    echo '<', $e, $a, '>'; unset($e); continue; 
+    } 
+    // nesting 
+    $add = ''; 
+    $q2 = array(); 
+    for($k=-1, $kc=count($q); ++$k<$kc;){ 
+    $d = $q[$k]; 
+    $ok2 = array(); 
+    if(isset($cS[$d])){$q2[] = $d; continue;} 
+    $ok2 = isset($cI[$d]) ? $eI : $eF; 
+    if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];} 
+    if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);} 
+    if(!isset($ok2[$e])){ 
+    if(!$k && !isset($inOk[$e])){continue 2;} 
+    $add = "</{$d}>"; 
+    for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";} 
+    break; 
+    } 
+    else{$q2[] = $d;} 
+    } 
+    $q = $q2; 
+    if(!isset($cE[$e])){$q[] = $e;} 
+    echo $add, '<', $e, $a, '>'; unset($e); continue; 
 } 
 
 // end 
 if($ql = count($q)){ 
- $p = array_pop($q); 
- $q[] = $p; 
- if(isset($cS[$p])){$ok = $cS[$p];} 
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
- if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
+    $p = array_pop($q); 
+    $q[] = $p; 
+    if(isset($cS[$p])){$ok = $cS[$p];} 
+    elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
+    elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
+    elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
+    if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
+    if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
 }else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
 if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
- echo '&lt;', $s, $e, $a, '&gt;'; 
+    echo '&lt;', $s, $e, $a, '&gt;'; 
 } 
 if(isset($x[0])){ 
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
-  echo '<div>', $x, '</div>'; 
- } 
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
- elseif(strpos($x, "\x02\x04")){ 
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
-   echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
-  } 
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+    if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
+    echo '<div>', $x, '</div>'; 
+    } 
+    elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
+    elseif(strpos($x, "\x02\x04")){ 
+    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
+    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
+    } 
+    }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
 } 
 while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';} 
 $o = ob_get_contents(); 
@@ -303,7 +303,7 @@ 
 if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;} 
 if($v == 1){return '';} 
 if($n == 'comment'){ 
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';} 
+    if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';} 
 } 
 else{$t = substr($t, 1, -1);} 
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t; 
@@ -318,10 +318,10 @@ 
 static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1); 
 static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255'); 
 if($t[0] != '#'){ 
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';'; 
+    return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';'; 
 } 
 if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){ 
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};"; 
+    return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};"; 
 } 
 return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
 // eof 
@@ -337,24 +337,24 @@ 
 if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";} 
 if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param 
 if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot 
- return "{$b}{$d}{$p}{$a}"; 
+    return "{$b}{$d}{$p}{$a}"; 
 } 
 if($C['abs_url']){ 
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel 
-  $p = substr($p, strlen($C['base_url'])); 
- }elseif(empty($m[1])){ // Make URL abs 
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} 
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} 
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;} 
-  else{ 
-   preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m); 
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p); 
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){ 
+    if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel 
+    $p = substr($p, strlen($C['base_url'])); 
+    }elseif(empty($m[1])){ // Make URL abs 
+    if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} 
+    elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} 
+    elseif(strcspn($p, './')){$p = $C['base_url']. $p;} 
+    else{ 
+    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m); 
+    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p); 
+    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){ 
     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p); 
-   } 
-   $p = $m[1]. $p; 
-  } 
- } 
+    } 
+    $p = $m[1]. $p; 
+    } 
+    } 
 } 
 return "{$b}{$p}{$a}"; 
 // eof 
@@ -381,27 +381,27 @@ 
 $s = array(); 
 $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t))); 
 for($i = count(($t = explode(';', $t))); --$i>=0;){ 
- $w = $t[$i]; 
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;} 
- $y = $n = array(); 
- foreach(explode(',', $a) as $v){ 
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;} 
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;} 
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;} 
-  if(!isset($m[2])){$y[$x] = 1; continue;} 
-  foreach(explode('/', $m[2]) as $m){ 
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;} 
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1)); 
-  } 
-  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);} 
-  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);} 
- } 
- if(!count($y) && !count($n)){continue;} 
- foreach(explode(',', substr($w, 0, $e)) as $v){ 
-  if(!strlen(($v = strtolower($v)))){continue;} 
-  if(count($y)){$s[$v] = $y;} 
-  if(count($n)){$s[$v]['n'] = $n;} 
- } 
+    $w = $t[$i]; 
+    if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;} 
+    $y = $n = array(); 
+    foreach(explode(',', $a) as $v){ 
+    if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;} 
+    if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;} 
+    if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;} 
+    if(!isset($m[2])){$y[$x] = 1; continue;} 
+    foreach(explode('/', $m[2]) as $m){ 
+    if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;} 
+    $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1)); 
+    } 
+    if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);} 
+    if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);} 
+    } 
+    if(!count($y) && !count($n)){continue;} 
+    foreach(explode(',', substr($w, 0, $e)) as $v){ 
+    if(!strlen(($v = strtolower($v)))){continue;} 
+    if(count($y)){$s[$v] = $y;} 
+    if(count($n)){$s[$v]['n'] = $n;} 
+    } 
 } 
 return $s; 
 // eof 
@@ -415,22 +415,22 @@ 
 if($t == '< '){return '&lt; ';} 
 if($t == '>'){return '&gt;';} 
 if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){ 
- return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t); 
+    return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t); 
 }elseif(!isset($C['elements'][($e = strtolower($m[2]))])){ 
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); 
+    return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); 
 } 
 // attr string 
 $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3])); 
 // tag transform 
 static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
 if($C['make_tag_strict'] && isset($eD[$e])){ 
- $trt = hl_tag2($e, $a, $C['make_tag_strict']); 
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');} 
+    $trt = hl_tag2($e, $a, $C['make_tag_strict']); 
+    if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');} 
 } 
 // close tag 
 static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele 
 if(!empty($m[1])){ 
- return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '')); 
+    return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '')); 
 } 
 
 // open tag & attr 
@@ -440,49 +440,49 @@ 
 static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeydown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeypress'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeyup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousedown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousemove'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseout'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseover'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'style'=>array('param'=>1, 'script'=>1), 'title'=>array('param'=>1, 'script'=>1)); // Univ & exceptions 
 
 if($C['lc_std_val']){ 
- // predef attr vals for $eAL & $aNE ele 
- static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1); 
- static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1); 
- $lcase = isset($eAL[$e]) ? 1 : 0; 
+    // predef attr vals for $eAL & $aNE ele 
+    static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1); 
+    static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1); 
+    $lcase = isset($eAL[$e]) ? 1 : 0; 
 } 
 
 $depTr = 0; 
 if($C['no_deprecated_attr']){ 
- // dep attr:applicable ele 
- static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1)); 
- static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1); 
- $depTr = isset($eAD[$e]) ? 1 : 0; 
+    // dep attr:applicable ele 
+    static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1)); 
+    static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1); 
+    $depTr = isset($eAD[$e]) ? 1 : 0; 
 } 
 
 // attr name-vals 
 if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec 
 $mode = 0; $a = trim($a, ' /'); $aA = array(); 
 while(strlen($a)){ 
- $w = 0; 
- switch($mode){ 
-  case 0: // Name 
+    $w = 0; 
+    switch($mode){ 
+    case 0: // Name 
    if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ 
     $nm = strtolower($m[0]); 
     $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); 
-   } 
-  break; case 1: 
+    } 
+    break; case 1: 
    if($a[0] == '='){ // = 
     $w = 1; $mode = 2; $a = ltrim($a, '= '); 
-   }else{ // No val 
+    }else{ // No val 
     $w = 1; $mode = 0; $a = ltrim($a); 
     $aA[$nm] = ''; 
-   } 
-  break; case 2: // Val 
+    } 
+    break; case 2: // Val 
    if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ 
     $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; 
     $aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); 
-   } 
-  break; 
- } 
- if($w == 0){ // Parse errs, deal with space, " & ' 
-  $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a); 
-  $mode = 0; 
- } 
+    } 
+    break; 
+    } 
+    if($w == 0){ // Parse errs, deal with space, " & ' 
+    $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a); 
+    $mode = 0; 
+    } 
 } 
 if($mode == 1){$aA[$nm] = '';} 
 
@@ -491,126 +491,126 @@ 
 $rl = isset($S[$e]) ? $S[$e] : array(); 
 $a = array(); $nfr = 0; 
 foreach($aA as $k=>$v){ 
-  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){ 
-  if(isset($aNE[$k])){$v = $k;} 
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues 
-   $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v; 
-  } 
-  if($k == 'style' && !$C['style_pass']){ 
-   if(false !== strpos($v, '&#')){ 
+    if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){ 
+    if(isset($aNE[$k])){$v = $k;} 
+    elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues 
+    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v; 
+    } 
+    if($k == 'style' && !$C['style_pass']){ 
+    if(false !== strpos($v, '&#')){ 
     static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\'); 
     $v = strtr($v, $sC); 
-   } 
-   $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v); 
-   $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v; 
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){ 
-   $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); 
-   $v = hl_prot($v, $k); 
-   if($k == 'href'){ // X-spam 
+    } 
+    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v); 
+    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v; 
+    }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){ 
+    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); 
+    $v = hl_prot($v, $k); 
+    if($k == 'href'){ // X-spam 
     if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){ 
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v); 
+        $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v); 
     }elseif($C['anti_link_spam']){ 
-     $r1 = $C['anti_link_spam'][1]; 
-     if(!empty($r1) && preg_match($r1, $v)){continue;} 
-     $r0 = $C['anti_link_spam'][0]; 
-     if(!empty($r0) && preg_match($r0, $v)){ 
-      if(isset($a['rel'])){ 
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';} 
-      }elseif(isset($aA['rel'])){ 
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;} 
-      }else{$a['rel'] = 'nofollow';} 
-     } 
-    } 
-   } 
-  } 
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;} 
-  $a[$k] = str_replace('"', '&quot;', $v); 
- } 
+        $r1 = $C['anti_link_spam'][1]; 
+        if(!empty($r1) && preg_match($r1, $v)){continue;} 
+        $r0 = $C['anti_link_spam'][0]; 
+        if(!empty($r0) && preg_match($r0, $v)){ 
+        if(isset($a['rel'])){ 
+        if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';} 
+        }elseif(isset($aA['rel'])){ 
+        if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;} 
+        }else{$a['rel'] = 'nofollow';} 
+        } 
+    } 
+    } 
+    } 
+    if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;} 
+    $a[$k] = str_replace('"', '&quot;', $v); 
+    } 
 } 
 if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';} 
 
 // rqd attr 
 static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50')); 
 if(isset($eAR[$e])){ 
- foreach($eAR[$e] as $k=>$v){ 
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;} 
- } 
+    foreach($eAR[$e] as $k=>$v){ 
+    if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;} 
+    } 
 } 
 
 // depr attrs 
 if($depTr){ 
- $c = array(); 
- foreach($a as $k=>$v){ 
-  if($k == 'style' or !isset($aND[$k][$e])){continue;} 
-  if($k == 'align'){ 
-   unset($a['align']); 
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} 
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} 
-   else{$c[] = 'text-align: '. $v;} 
-  }elseif($k == 'bgcolor'){ 
-   unset($a['bgcolor']); 
-   $c[] = 'background-color: '. $v; 
-  }elseif($k == 'border'){ 
-   unset($a['border']); $c[] = "border: {$v}px"; 
-  }elseif($k == 'bordercolor'){ 
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v; 
-  }elseif($k == 'clear'){ 
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both'); 
-  }elseif($k == 'compact'){ 
-   unset($a['compact']); $c[] = 'font-size: 85%'; 
-  }elseif($k == 'height' or $k == 'width'){ 
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto'); 
-  }elseif($k == 'hspace'){ 
-   unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px"; 
-  }elseif($k == 'language' && !isset($a['type'])){ 
-   unset($a['language']); 
-   $a['type'] = 'text/'. strtolower($v); 
-  }elseif($k == 'name'){ 
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);} 
-   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;} 
-  }elseif($k == 'noshade'){ 
-   unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray'; 
-  }elseif($k == 'nowrap'){ 
-   unset($a['nowrap']); $c[] = 'white-space: nowrap'; 
-  }elseif($k == 'size'){ 
-   unset($a['size']); $c[] = 'size: '. $v. 'px'; 
-  }elseif($k == 'start' or $k == 'value'){ 
-   unset($a[$k]); 
-  }elseif($k == 'type'){ 
-   unset($a['type']); 
-   static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal'); 
-   $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal'); 
-  }elseif($k == 'vspace'){ 
-   unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px"; 
-  } 
- } 
- if(count($c)){ 
-  $c = implode('; ', $c); 
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';'; 
- } 
+    $c = array(); 
+    foreach($a as $k=>$v){ 
+    if($k == 'style' or !isset($aND[$k][$e])){continue;} 
+    if($k == 'align'){ 
+    unset($a['align']); 
+    if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} 
+    elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} 
+    else{$c[] = 'text-align: '. $v;} 
+    }elseif($k == 'bgcolor'){ 
+    unset($a['bgcolor']); 
+    $c[] = 'background-color: '. $v; 
+    }elseif($k == 'border'){ 
+    unset($a['border']); $c[] = "border: {$v}px"; 
+    }elseif($k == 'bordercolor'){ 
+    unset($a['bordercolor']); $c[] = 'border-color: '. $v; 
+    }elseif($k == 'clear'){ 
+    unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both'); 
+    }elseif($k == 'compact'){ 
+    unset($a['compact']); $c[] = 'font-size: 85%'; 
+    }elseif($k == 'height' or $k == 'width'){ 
+    unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto'); 
+    }elseif($k == 'hspace'){ 
+    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px"; 
+    }elseif($k == 'language' && !isset($a['type'])){ 
+    unset($a['language']); 
+    $a['type'] = 'text/'. strtolower($v); 
+    }elseif($k == 'name'){ 
+    if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);} 
+    if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;} 
+    }elseif($k == 'noshade'){ 
+    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray'; 
+    }elseif($k == 'nowrap'){ 
+    unset($a['nowrap']); $c[] = 'white-space: nowrap'; 
+    }elseif($k == 'size'){ 
+    unset($a['size']); $c[] = 'size: '. $v. 'px'; 
+    }elseif($k == 'start' or $k == 'value'){ 
+    unset($a[$k]); 
+    }elseif($k == 'type'){ 
+    unset($a['type']); 
+    static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal'); 
+    $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal'); 
+    }elseif($k == 'vspace'){ 
+    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px"; 
+    } 
+    } 
+    if(count($c)){ 
+    $c = implode('; ', $c); 
+    $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';'; 
+    } 
 } 
 // unique ID 
 if($C['unique_ids'] && isset($a['id'])){ 
- if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']); 
- }else{ 
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;} 
-  $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1; 
- } 
+    if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']); 
+    }else{ 
+    while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;} 
+    $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1; 
+    } 
 } 
 // xml:lang 
 if($C['xml:lang'] && isset($a['lang'])){ 
- $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang']; 
- if($C['xml:lang'] == 2){unset($a['lang']);} 
+    $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang']; 
+    if($C['xml:lang'] == 2){unset($a['lang']);} 
 } 
 // for transformed tag 
 if(!empty($trt)){ 
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt; 
+    $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt; 
 } 
 // return with empty ele / 
 if(empty($C['hook_tag'])){ 
- $aA = ''; 
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";} 
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>'; 
+    $aA = ''; 
+    foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";} 
+    return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>'; 
 } 
 else{return $C['hook_tag']($e, $a);} 
 // eof 
@@ -624,17 +624,17 @@ 
 if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';} 
 static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%'); 
 if($e == 'font'){ 
- $a2 = ''; 
- if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){ 
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';'; 
- } 
- if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){ 
-  $a2 .= ' color: '. trim($m[2]). ';'; 
- } 
- if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){ 
-  $a2 .= ' font-size: '. $fs[$m]. ';'; 
- } 
- $e = 'span'; return ltrim($a2); 
+    $a2 = ''; 
+    if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){ 
+    $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';'; 
+    } 
+    if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){ 
+    $a2 .= ' color: '. trim($m[2]). ';'; 
+    } 
+    if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){ 
+    $a2 .= ' font-size: '. $fs[$m]. ';'; 
+    } 
+    $e = 'span'; return ltrim($a2); 
 } 
 if($t == 2){$e = 0; return 0;} 
 return ''; 
@@ -646,7 +646,7 @@ 
 if(strpos(' pre,script,textarea', "$p,")){return $t;} 
 $t = preg_replace('`\s+`', ' ', preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t)); 
 if(($w = strtolower($w)) == -1){ 
- return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
+    return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
 } 
 $s = strpos(" $w", 't') ? "\t" : ' '; 
 $s = preg_match('`\d`', $w, $m) ? str_repeat($s, $m[0]) : str_repeat($s, ($s == "\t" ? 1 : 2)); 
@@ -658,39 +658,39 @@ 
 $T = explode('<', $t); 
 $X = 1; 
 while($X){ 
- $n = $N; 
- $t = $T; 
- ob_start(); 
- if(isset($d[$p])){echo str_repeat($s, ++$n);} 
- echo ltrim(array_shift($t)); 
- for($i=-1, $j=count($t); ++$i<$j;){ 
-  $r = ''; list($e, $r) = explode('>', $t[$i]); 
-  $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1)); 
-  $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0); 
-  $e = "<$e>"; 
-  if(isset($d[$y])){ 
-   if(!$x){ 
+    $n = $N; 
+    $t = $T; 
+    ob_start(); 
+    if(isset($d[$p])){echo str_repeat($s, ++$n);} 
+    echo ltrim(array_shift($t)); 
+    for($i=-1, $j=count($t); ++$i<$j;){ 
+    $r = ''; list($e, $r) = explode('>', $t[$i]); 
+    $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1)); 
+    $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0); 
+    $e = "<$e>"; 
+    if(isset($d[$y])){ 
+    if(!$x){ 
     if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} 
     else{++$N; ob_end_clean(); continue 2;} 
-   } 
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} 
-   echo $r; continue; 
-  } 
-  $f = "\n". str_repeat($s, $n); 
-  if(isset($c[$y])){ 
-   if(!$x){echo $e, $f, $r;} 
-   else{echo $f, $e, $r;} 
-  }elseif(isset($b[$y])){echo $f, $e, $r; 
-  }elseif(isset($a[$y])){echo $e, $f, $r; 
-  }elseif(!$y){echo $f, $e, $f, $r; 
-  }else{echo $e, $r;} 
- } 
- $X = 0; 
+    } 
+    else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} 
+    echo $r; continue; 
+    } 
+    $f = "\n". str_repeat($s, $n); 
+    if(isset($c[$y])){ 
+    if(!$x){echo $e, $f, $r;} 
+    else{echo $f, $e, $r;} 
+    }elseif(isset($b[$y])){echo $f, $e, $r; 
+    }elseif(isset($a[$y])){echo $e, $f, $r; 
+    }elseif(!$y){echo $f, $e, $f, $r; 
+    }else{echo $e, $r;} 
+    } 
+    $X = 0; 
 } 
 $t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents())); 
 ob_end_clean(); 
 if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){ 
- $t = str_replace("\n", $l, $t); 
+    $t = str_replace("\n", $l, $t); 
 } 
 return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
 // eof 
@@ -705,7 +705,7 @@ 
 function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){ 
 // kses compat 
 foreach($h as $k=>$v){ 
- $h[$k]['n']['*'] = 1; 
+    $h[$k]['n']['*'] = 1; 
 } 
 $C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0; 
 $C['keep_bad'] = 1; 

Switch Indentation +34 added lines, -34 removed lines

@@ -117,22 +117,22 @@ 
 $o = 1; $l = strlen($t); 
 foreach($p as $k=>$v){ 
  switch($k){ 
-  case 'maxlen':if($l > $v){$o = 0;} 
-  break; case 'minlen': if($l < $v){$o = 0;} 
-  break; case 'maxval': if((float)($t) > $v){$o = 0;} 
-  break; case 'minval': if((float)($t) < $v){$o = 0;} 
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;} 
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} 
-  break; case 'oneof': 
-   $m = 0; 
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} 
-   $o = $m; 
-  break; case 'noneof': 
-   $m = 1; 
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} 
-   $o = $m; 
-  break; default: 
-  break; 
+ case 'maxlen':if($l > $v){$o = 0;} 
+ break; case 'minlen': if($l < $v){$o = 0;} 
+ break; case 'maxval': if((float)($t) > $v){$o = 0;} 
+ break; case 'minval': if((float)($t) < $v){$o = 0;} 
+ break; case 'match': if(!preg_match($v, $t)){$o = 0;} 
+ break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} 
+ break; case 'oneof': 
+  $m = 0; 
+  foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} 
+  $o = $m; 
+ break; case 'noneof': 
+  $m = 1; 
+  foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} 
+  $o = $m; 
+ break; default: 
+ break; 
  } 
  if(!$o){break;} 
 } 
@@ -460,24 +460,24 @@ 
 while(strlen($a)){ 
  $w = 0; 
  switch($mode){ 
-  case 0: // Name 
-   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ 
-    $nm = strtolower($m[0]); 
-    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); 
-   } 
-  break; case 1: 
-   if($a[0] == '='){ // = 
-    $w = 1; $mode = 2; $a = ltrim($a, '= '); 
-   }else{ // No val 
-    $w = 1; $mode = 0; $a = ltrim($a); 
-    $aA[$nm] = ''; 
-   } 
-  break; case 2: // Val 
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ 
-    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; 
-    $aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); 
-   } 
-  break; 
+ case 0: // Name 
+  if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ 
+   $nm = strtolower($m[0]); 
+   $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); 
+  } 
+ break; case 1: 
+  if($a[0] == '='){ // = 
+   $w = 1; $mode = 2; $a = ltrim($a, '= '); 
+  }else{ // No val 
+   $w = 1; $mode = 0; $a = ltrim($a); 
+   $aA[$nm] = ''; 
+  } 
+ break; case 2: // Val 
+  if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ 
+   $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; 
+   $aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); 
+  } 
+ break; 
  } 
  if($w == 0){ // Parse errs, deal with space, " & ' 
   $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a); 

Spacing +285 added lines, -285 removed lines

@@ -9,36 +9,36 @@ 
 See htmLawed_README.txt/htm 
 */ 
 
-function htmLawed($t, $C=1, $S=array()){ 
+function htmLawed($t, $C = 1, $S = array()) { 
 $C = is_array($C) ? $C : array(); 
-if(!empty($C['valid_xhtml'])){ 
+if (!empty($C['valid_xhtml'])) { 
  $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements']; 
  $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2; 
  $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2; 
 } 
 // config eles 
 $e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1); // 86/deprecated+embed+ruby 
-if(!empty($C['safe'])){ 
+if (!empty($C['safe'])) { 
  unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']); 
 } 
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*'; 
-if($x == '-*'){$e = array();} 
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));} 
-else{ 
- if(isset($x[1])){ 
+if ($x == '-*') {$e = array(); } 
+elseif (strpos($x, '*') === false) {$e = array_flip(explode(',', $x)); } 
+else { 
+ if (isset($x[1])) { 
   preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER); 
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];} 
-  foreach($m as $v){ 
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;} 
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);} 
+  for ($i = count($m); --$i >= 0;) {$m[$i] = $m[$i][0]; } 
+  foreach ($m as $v) { 
+   if ($v[0] == '+') {$e[substr($v, 1)] = 1; } 
+   if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'.$v, $m)) {unset($e[$v]); } 
   } 
  } 
 } 
-$C['elements'] =& $e; 
+$C['elements'] = & $e; 
 // config attrs 
 $x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : ''; 
-$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : ''))); 
-if(isset($x['on*'])){ 
+$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x.(!empty($C['safe']) ? ',on*' : ''))); 
+if (isset($x['on*'])) { 
  unset($x['on*']); 
  $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1); 
 } 
@@ -46,14 +46,14 @@ 
 // config URL 
 $x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https'; 
 $C['schemes'] = array(); 
-foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){ 
+foreach (explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v) { 
  $x = $x2 = null; list($x, $x2) = explode(':', $v, 2); 
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));} 
+ if ($x2) {$C['schemes'][$x] = array_flip(explode(',', $x2)); } 
 } 
-if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);} 
-if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);} 
+if (!isset($C['schemes']['*'])) {$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,); } 
+if (!empty($C['safe']) && empty($C['schemes']['style'])) {$C['schemes']['style'] = array('!'=>1); } 
 $C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0; 
-if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){ 
+if (!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])) { 
  $C['base_url'] = $C['abs_url'] = 0; 
 } 
 // config rest 
@@ -81,23 +81,23 @@ 
 $C['unique_ids'] = isset($C['unique_ids']) ? $C['unique_ids'] : 1; 
 $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 0; 
 
-if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];} 
+if (isset($GLOBALS['C'])) {$reC = $GLOBALS['C']; } 
 $GLOBALS['C'] = $C; 
 $S = is_array($S) ? $S : hl_spec($S); 
-if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];} 
+if (isset($GLOBALS['S'])) {$reS = $GLOBALS['S']; } 
 $GLOBALS['S'] = $S; 
 
 $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t); 
-if($C['clean_ms_char']){ 
+if ($C['clean_ms_char']) { 
  $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ'); 
  $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"')); 
  $t = strtr($t, $x); 
 } 
-if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);} 
+if ($C['cdata'] or $C['comment']) {$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t); } 
 $t = preg_replace_callback('`&amp;([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'hl_ent', str_replace('&', '&amp;', $t)); 
-if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();} 
-if($C['hook']){$t = $C['hook']($t, $C, $S);} 
-if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){ 
+if ($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])) {$GLOBALS['hl_Ids'] = array(); } 
+if ($C['hook']) {$t = $C['hook']($t, $C, $S); } 
+if ($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])) { 
  $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime()); 
 } 
 // main 
@@ -106,41 +106,41 @@ 
 $t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t; 
 $t = $C['tidy'] ? hl_tidy($t, $C['tidy'], $C['parent']) : $t; 
 unset($C, $e); 
-if(isset($reC)){$GLOBALS['C'] = $reC;} 
-if(isset($reS)){$GLOBALS['S'] = $reS;} 
+if (isset($reC)) {$GLOBALS['C'] = $reC; } 
+if (isset($reS)) {$GLOBALS['S'] = $reS; } 
 return $t; 
 // eof 
 } 
 
-function hl_attrval($t, $p){ 
+function hl_attrval($t, $p) { 
 // check attr val against $S 
 $o = 1; $l = strlen($t); 
-foreach($p as $k=>$v){ 
- switch($k){ 
-  case 'maxlen':if($l > $v){$o = 0;} 
-  break; case 'minlen': if($l < $v){$o = 0;} 
-  break; case 'maxval': if((float)($t) > $v){$o = 0;} 
-  break; case 'minval': if((float)($t) < $v){$o = 0;} 
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;} 
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;} 
+foreach ($p as $k=>$v) { 
+ switch ($k) { 
+  case 'maxlen':if ($l > $v) {$o = 0; } 
+  break; case 'minlen': if ($l < $v) {$o = 0; } 
+  break; case 'maxval': if ((float)($t) > $v) {$o = 0; } 
+  break; case 'minval': if ((float)($t) < $v) {$o = 0; } 
+  break; case 'match': if (!preg_match($v, $t)) {$o = 0; } 
+  break; case 'nomatch': if (preg_match($v, $t)) {$o = 0; } 
   break; case 'oneof': 
    $m = 0; 
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}} 
+   foreach (explode('|', $v) as $n) {if ($t == $n) {$m = 1; break; }} 
    $o = $m; 
   break; case 'noneof': 
    $m = 1; 
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}} 
+   foreach (explode('|', $v) as $n) {if ($t == $n) {$m = 0; break; }} 
    $o = $m; 
   break; default: 
   break; 
  } 
- if(!$o){break;} 
+ if (!$o) {break; } 
 } 
 return ($o ? $t : (isset($p['default']) ? $p['default'] : 0)); 
 // eof 
 } 
 
-function hl_bal($t, $do=1, $in='div'){ 
+function hl_bal($t, $do = 1, $in = 'div') { 
 // balance tags 
 // by content 
 $cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block 
@@ -151,7 +151,7 @@ 
 $cN2 = array_keys($cN); 
 $cR = array('blockquote'=>1, 'dir'=>1, 'dl'=>1, 'form'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1); 
 $cS = array('colgroup'=>array('col'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, 'tr'=>1, 'thead'=>1), 'tbody'=>array('tr'=>1), 'tfoot'=>array('tr'=>1), 'textarea'=>array('#pcdata'=>1), 'thead'=>array('tr'=>1), 'tr'=>array('td'=>1, 'th'=>1), 'ul'=>array('li'=>1)); // Specific - immediate parent-child 
-if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);} 
+if ($GLOBALS['C']['direct_list_nest']) {$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1); } 
 $cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'blockquote'=>array('script'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1)); // Other 
 $cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
 // block/inline type; ins & del both type; #pcdata: text 
@@ -163,196 +163,196 @@ 
 
 // $in sets allowed child 
 $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div'; 
-if(isset($cE[$in])){ 
+if (isset($cE[$in])) { 
  return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t)); 
 } 
-if(isset($cS[$in])){$inOk = $cS[$in];} 
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);} 
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);} 
-if(isset($cO[$in])){$inOk = $inOk + $cO[$in];} 
-if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);} 
+if (isset($cS[$in])) {$inOk = $cS[$in]; } 
+elseif (isset($cI[$in])) {$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1; } 
+elseif (isset($cF[$in])) {$inOk = $eF; unset($cI['del'], $cI['ins']); } 
+elseif (isset($cB[$in])) {$inOk = $eB; unset($cI['del'], $cI['ins']); } 
+if (isset($cO[$in])) {$inOk = $inOk + $cO[$in]; } 
+if (isset($cN[$in])) {$inOk = array_diff_assoc($inOk, $cN[$in]); } 
 
 $t = explode('<', $t); 
 $ok = $q = array(); // $q seq list of open non-empty ele 
 ob_start(); 
 
-for($i=-1, $ci=count($t); ++$i<$ci;){ 
+for ($i = -1, $ci = count($t); ++$i < $ci;) { 
  // allowed $ok in parent $p 
- if($ql = count($q)){ 
+ if ($ql = count($q)) { 
   $p = array_pop($q); 
   $q[] = $p; 
-  if(isset($cS[$p])){$ok = $cS[$p];} 
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
+  if (isset($cS[$p])) {$ok = $cS[$p]; } 
+  elseif (isset($cI[$p])) {$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1; } 
+  elseif (isset($cF[$p])) {$ok = $eF; unset($cI['del'], $cI['ins']); } 
+  elseif (isset($cB[$p])) {$ok = $eB; unset($cI['del'], $cI['ins']); } 
+  if (isset($cO[$p])) {$ok = $ok + $cO[$p]; } 
+  if (isset($cN[$p])) {$ok = array_diff_assoc($ok, $cN[$p]); } 
+ } else {$ok = $inOk; unset($cI['del'], $cI['ins']); } 
  // bad tags, & ele content 
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
+ if (isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))) { 
   echo '&lt;', $s, $e, $a, '&gt;'; 
  } 
- if(isset($x[0])){ 
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
+ if (isset($x[0])) { 
+  if (strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))) { 
    echo '<div>', $x, '</div>'; 
   } 
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
-  elseif(strpos($x, "\x02\x04")){ 
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
+  elseif ($do < 3 or isset($ok['#pcdata'])) {echo $x; } 
+  elseif (strpos($x, "\x02\x04")) { 
+   foreach (preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY) as $v) { 
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
    } 
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+  }elseif ($do > 4) {echo preg_replace('`\S`', '', $x); } 
  } 
  // get markup 
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;} 
+ if (!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)) {$x = $t[$i]; continue; } 
  $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r; 
  // close tag 
- if($s){ 
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen 
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open 
+ if ($s) { 
+  if (isset($cE[$e]) or !in_array($e, $q)) {continue; } // Empty/unopen 
+  if ($p == $e) {array_pop($q); echo '</', $e, '>'; unset($e); continue; } // Last open 
   $add = ''; // Nesting - close open tags that need to be 
-  for($j=-1, $cj=count($q); ++$j<$cj;){   
-   if(($d = array_pop($q)) == $e){break;} 
-   else{$add .= "</{$d}>";} 
+  for ($j = -1, $cj = count($q); ++$j < $cj;) {   
+   if (($d = array_pop($q)) == $e) {break; } 
+   else {$add .= "</{$d}>"; } 
   } 
   echo $add, '</', $e, '>'; unset($e); continue; 
  } 
  // open tag 
  // $cB ele needs $eB ele as child 
- if(isset($cB[$e]) && strlen(trim($x))){ 
+ if (isset($cB[$e]) && strlen(trim($x))) { 
   $t[$i] = "{$e}{$a}>"; 
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue; 
+  array_splice($t, $i + 1, 0, 'div>'.$x); unset($e, $x); ++$ci; --$i; continue; 
  } 
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){ 
+ if ((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])) { 
   array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue; 
  } 
  // if no open ele, $in = parent; mostly immediate parent-child relation should hold 
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){ 
-  if(!isset($ok[$e])){ 
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;} 
+ if (!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)) { 
+  if (!isset($ok[$e])) { 
+   if ($ql && isset($cT[$p])) {echo '</', array_pop($q), '>'; unset($e, $x); --$i; } 
    continue; 
   } 
-  if(!isset($cE[$e])){$q[] = $e;} 
+  if (!isset($cE[$e])) {$q[] = $e; } 
   echo '<', $e, $a, '>'; unset($e); continue; 
  } 
  // specific parent-child 
- if(isset($cS[$p][$e])){ 
-  if(!isset($cE[$e])){$q[] = $e;} 
+ if (isset($cS[$p][$e])) { 
+  if (!isset($cE[$e])) {$q[] = $e; } 
   echo '<', $e, $a, '>'; unset($e); continue; 
  } 
  // nesting 
  $add = ''; 
  $q2 = array(); 
- for($k=-1, $kc=count($q); ++$k<$kc;){ 
+ for ($k = -1, $kc = count($q); ++$k < $kc;) { 
   $d = $q[$k]; 
   $ok2 = array(); 
-  if(isset($cS[$d])){$q2[] = $d; continue;} 
+  if (isset($cS[$d])) {$q2[] = $d; continue; } 
   $ok2 = isset($cI[$d]) ? $eI : $eF; 
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];} 
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);} 
-  if(!isset($ok2[$e])){ 
-   if(!$k && !isset($inOk[$e])){continue 2;} 
+  if (isset($cO[$d])) {$ok2 = $ok2 + $cO[$d]; } 
+  if (isset($cN[$d])) {$ok2 = array_diff_assoc($ok2, $cN[$d]); } 
+  if (!isset($ok2[$e])) { 
+   if (!$k && !isset($inOk[$e])) {continue 2; } 
    $add = "</{$d}>"; 
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";} 
+   for (;++$k < $kc;) {$add = "</{$q[$k]}>{$add}"; } 
    break; 
   } 
-  else{$q2[] = $d;} 
+  else {$q2[] = $d; } 
  } 
  $q = $q2; 
- if(!isset($cE[$e])){$q[] = $e;} 
+ if (!isset($cE[$e])) {$q[] = $e; } 
  echo $add, '<', $e, $a, '>'; unset($e); continue; 
 } 
 
 // end 
-if($ql = count($q)){ 
+if ($ql = count($q)) { 
  $p = array_pop($q); 
  $q[] = $p; 
- if(isset($cS[$p])){$ok = $cS[$p];} 
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
- if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
-if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
+ if (isset($cS[$p])) {$ok = $cS[$p]; } 
+ elseif (isset($cI[$p])) {$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1; } 
+ elseif (isset($cF[$p])) {$ok = $eF; unset($cI['del'], $cI['ins']); } 
+ elseif (isset($cB[$p])) {$ok = $eB; unset($cI['del'], $cI['ins']); } 
+ if (isset($cO[$p])) {$ok = $ok + $cO[$p]; } 
+ if (isset($cN[$p])) {$ok = array_diff_assoc($ok, $cN[$p]); } 
+} else {$ok = $inOk; unset($cI['del'], $cI['ins']); } 
+if (isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))) { 
  echo '&lt;', $s, $e, $a, '&gt;'; 
 } 
-if(isset($x[0])){ 
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
+if (isset($x[0])) { 
+ if (strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))) { 
   echo '<div>', $x, '</div>'; 
  } 
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
- elseif(strpos($x, "\x02\x04")){ 
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
+ elseif ($do < 3 or isset($ok['#pcdata'])) {echo $x; } 
+ elseif (strpos($x, "\x02\x04")) { 
+  foreach (preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY) as $v) { 
    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
   } 
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+ }elseif ($do > 4) {echo preg_replace('`\S`', '', $x); } 
 } 
-while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';} 
+while (!empty($q) && ($e = array_pop($q))) {echo '</', $e, '>'; } 
 $o = ob_get_contents(); 
 ob_end_clean(); 
 return $o; 
 // eof 
 } 
 
-function hl_cmtcd($t){ 
+function hl_cmtcd($t) { 
 // comment/CDATA sec handler 
 $t = $t[0]; 
 global $C; 
-if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;} 
-if($v == 1){return '';} 
-if($n == 'comment'){ 
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';} 
+if (!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])) {return $t; } 
+if ($v == 1) {return ''; } 
+if ($n == 'comment') { 
+ if (substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' ') {$t .= ' '; } 
 } 
-else{$t = substr($t, 1, -1);} 
+else {$t = substr($t, 1, -1); } 
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t; 
 return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01")); 
 // eof 
 } 
 
-function hl_ent($t){ 
+function hl_ent($t) { 
 // entitity handler 
 global $C; 
 $t = $t[1]; 
-static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1); 
-static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255'); 
-if($t[0] != '#'){ 
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';'; 
+static $U = array('quot'=>1, 'amp'=>1, 'lt'=>1, 'gt'=>1); 
+static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39', 'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255'); 
+if ($t[0] != '#') { 
+ return ($C['and_mark'] ? "\x06" : '&').(isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'.($C['hexdec_entity'] > 1 ? 'x'.dechex($N[$t]) : $N[$t]) : $t) : 'amp;'.$t)).';'; 
 } 
-if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){ 
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};"; 
+if (($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))) { 
+ return ($C['and_mark'] ? "\x06" : '&')."amp;#{$t};"; 
 } 
-return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
+return ($C['and_mark'] ? "\x06" : '&').'#'.(((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'.dechex($n)).';';
 // eof 
 } 
 
-function hl_prot($p, $c=null){ 
+function hl_prot($p, $c = null) { 
 // check URL scheme 
 global $C; 
 $b = $a = ''; 
-if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);} 
+if ($c == null) {$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]); } 
 $c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*']; 
 static $d = 'denied:'; 
-if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";} 
-if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param 
-if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot 
+if (isset($c['!']) && substr($p, 0, 7) != $d) {$p = "$d$p"; } 
+if (isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)) {return "{$b}{$p}{$a}"; } // All ok, frag, query, param 
+if (preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])) { // Denied prot 
  return "{$b}{$d}{$p}{$a}"; 
 } 
-if($C['abs_url']){ 
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel 
+if ($C['abs_url']) { 
+ if ($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0) { // Make url rel 
   $p = substr($p, strlen($C['base_url'])); 
- }elseif(empty($m[1])){ // Make URL abs 
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} 
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} 
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;} 
-  else{ 
+ }elseif (empty($m[1])) { // Make URL abs 
+  if (substr($p, 0, 2) == '//') {$p = substr($C['base_url'], 0, strpos($C['base_url'], ':') + 1).$p; } 
+  elseif ($p[0] == '/') {$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']).$p; } 
+  elseif (strcspn($p, './')) {$p = $C['base_url'].$p; } 
+  else { 
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m); 
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p); 
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){ 
+   $p = preg_replace('`(?<=/)\./`', '', $m[2].$p); 
+   while (preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)) { 
     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p); 
    } 
-   $p = $m[1]. $p; 
+   $p = $m[1].$p; 
   } 
  } 
 } 
@@ -360,76 +360,76 @@ 
 // eof 
 } 
 
-function hl_regex($p){ 
+function hl_regex($p) { 
 // ?regex 
-if(empty($p)){return 0;} 
-if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;} 
-else{ini_set('track_errors', 1);} 
+if (empty($p)) {return 0; } 
+if ($t = ini_get('track_errors')) {$o = isset($php_errormsg) ? $php_errormsg : null; } 
+else {ini_set('track_errors', 1); } 
 unset($php_errormsg); 
-if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);} 
+if (($d = ini_get('display_errors'))) {ini_set('display_errors', 0); } 
 preg_match($p, ''); 
-if($d){ini_set('display_errors', 1);} 
+if ($d) {ini_set('display_errors', 1); } 
 $r = isset($php_errormsg) ? 0 : 1; 
-if($t){$php_errormsg = isset($o) ? $o : null;} 
-else{ini_set('track_errors', 0);} 
+if ($t) {$php_errormsg = isset($o) ? $o : null; } 
+else {ini_set('track_errors', 0); } 
 return $r; 
 // eof 
 } 
 
-function hl_spec($t){ 
+function hl_spec($t) { 
 // final $spec 
 $s = array(); 
 $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t))); 
-for($i = count(($t = explode(';', $t))); --$i>=0;){ 
+for ($i = count(($t = explode(';', $t))); --$i >= 0;) { 
  $w = $t[$i]; 
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;} 
+ if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a = substr($w, $e + 1)))) {continue; } 
  $y = $n = array(); 
- foreach(explode(',', $a) as $v){ 
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;} 
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;} 
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;} 
-  if(!isset($m[2])){$y[$x] = 1; continue;} 
-  foreach(explode('/', $m[2]) as $m){ 
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;} 
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1)); 
+ foreach (explode(',', $a) as $v) { 
+  if (!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)) {continue; } 
+  if (($x = strtolower($m[1])) == '-*') {$n['*'] = 1; continue; } 
+  if ($x[0] == '-') {$n[substr($x, 1)] = 1; continue; } 
+  if (!isset($m[2])) {$y[$x] = 1; continue; } 
+  foreach (explode('/', $m[2]) as $m) { 
+   if (empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5) {$y[$x] = 1; continue; } 
+   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p + 1)); 
   } 
-  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);} 
-  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);} 
+  if (isset($y[$x]['match']) && !hl_regex($y[$x]['match'])) {unset($y[$x]['match']); } 
+  if (isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])) {unset($y[$x]['nomatch']); } 
  } 
- if(!count($y) && !count($n)){continue;} 
- foreach(explode(',', substr($w, 0, $e)) as $v){ 
-  if(!strlen(($v = strtolower($v)))){continue;} 
-  if(count($y)){$s[$v] = $y;} 
-  if(count($n)){$s[$v]['n'] = $n;} 
+ if (!count($y) && !count($n)) {continue; } 
+ foreach (explode(',', substr($w, 0, $e)) as $v) { 
+  if (!strlen(($v = strtolower($v)))) {continue; } 
+  if (count($y)) {$s[$v] = $y; } 
+  if (count($n)) {$s[$v]['n'] = $n; } 
  } 
 } 
 return $s; 
 // eof 
 } 
 
-function hl_tag($t){ 
+function hl_tag($t) { 
 // tag/attribute handler 
 global $C; 
 $t = $t[0]; 
 // invalid < > 
-if($t == '< '){return '&lt; ';} 
-if($t == '>'){return '&gt;';} 
-if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){ 
+if ($t == '< ') {return '&lt; '; } 
+if ($t == '>') {return '&gt;'; } 
+if (!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)) { 
  return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t); 
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){ 
+}elseif (!isset($C['elements'][($e = strtolower($m[2]))])) { 
  return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); 
 } 
 // attr string 
 $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3])); 
 // tag transform 
 static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
-if($C['make_tag_strict'] && isset($eD[$e])){ 
+if ($C['make_tag_strict'] && isset($eD[$e])) { 
  $trt = hl_tag2($e, $a, $C['make_tag_strict']); 
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');} 
+ if (!$e) {return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); } 
 } 
 // close tag 
 static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele 
-if(!empty($m[1])){ 
+if (!empty($m[1])) { 
  return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '')); 
 } 
 
@@ -439,7 +439,7 @@ 
 static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'usemap'=>1); // Need scheme check; excludes style, on* & src 
 static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeydown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeypress'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeyup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousedown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousemove'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseout'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseover'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'style'=>array('param'=>1, 'script'=>1), 'title'=>array('param'=>1, 'script'=>1)); // Univ & exceptions 
 
-if($C['lc_std_val']){ 
+if ($C['lc_std_val']) { 
  // predef attr vals for $eAL & $aNE ele 
  static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1); 
  static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1); 
@@ -447,7 +447,7 @@ 
 } 
 
 $depTr = 0; 
-if($C['no_deprecated_attr']){ 
+if ($C['no_deprecated_attr']) { 
  // dep attr:applicable ele 
  static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1)); 
  static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1); 
@@ -455,197 +455,197 @@ 
 } 
 
 // attr name-vals 
-if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec 
+if (strpos($a, "\x01") !== false) {$a = preg_replace('`\x01[^\x01]*\x01`', '', $a); } // No comment/CDATA sec 
 $mode = 0; $a = trim($a, ' /'); $aA = array(); 
-while(strlen($a)){ 
+while (strlen($a)) { 
  $w = 0; 
- switch($mode){ 
+ switch ($mode) { 
   case 0: // Name 
-   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){ 
+   if (preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)) { 
     $nm = strtolower($m[0]); 
     $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0]))); 
    } 
   break; case 1: 
-   if($a[0] == '='){ // = 
+   if ($a[0] == '=') { // = 
     $w = 1; $mode = 2; $a = ltrim($a, '= '); 
-   }else{ // No val 
+   } else { // No val 
     $w = 1; $mode = 0; $a = ltrim($a); 
     $aA[$nm] = ''; 
    } 
   break; case 2: // Val 
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){ 
+   if (preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)) { 
     $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0; 
     $aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m)); 
    } 
   break; 
  } 
- if($w == 0){ // Parse errs, deal with space, " & ' 
+ if ($w == 0) { // Parse errs, deal with space, " & ' 
   $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a); 
   $mode = 0; 
  } 
 } 
-if($mode == 1){$aA[$nm] = '';} 
+if ($mode == 1) {$aA[$nm] = ''; } 
 
 // clean attrs 
 global $S; 
 $rl = isset($S[$e]) ? $S[$e] : array(); 
 $a = array(); $nfr = 0; 
-foreach($aA as $k=>$v){ 
-  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){ 
-  if(isset($aNE[$k])){$v = $k;} 
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues 
+foreach ($aA as $k=>$v) { 
+  if (((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])) { 
+  if (isset($aNE[$k])) {$v = $k; } 
+  elseif (!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')) { // Rather loose but ?not cause issues 
    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v; 
   } 
-  if($k == 'style' && !$C['style_pass']){ 
-   if(false !== strpos($v, '&#')){ 
+  if ($k == 'style' && !$C['style_pass']) { 
+   if (false !== strpos($v, '&#')) { 
     static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\'); 
     $v = strtr($v, $sC); 
    } 
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v); 
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v; 
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){ 
+  }elseif (isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o') { 
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); 
    $v = hl_prot($v, $k); 
-   if($k == 'href'){ // X-spam 
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){ 
+   if ($k == 'href') { // X-spam 
+    if ($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0) { 
      $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v); 
-    }elseif($C['anti_link_spam']){ 
+    }elseif ($C['anti_link_spam']) { 
      $r1 = $C['anti_link_spam'][1]; 
-     if(!empty($r1) && preg_match($r1, $v)){continue;} 
+     if (!empty($r1) && preg_match($r1, $v)) {continue; } 
      $r0 = $C['anti_link_spam'][0]; 
-     if(!empty($r0) && preg_match($r0, $v)){ 
-      if(isset($a['rel'])){ 
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';} 
-      }elseif(isset($aA['rel'])){ 
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;} 
-      }else{$a['rel'] = 'nofollow';} 
+     if (!empty($r0) && preg_match($r0, $v)) { 
+      if (isset($a['rel'])) { 
+       if (!preg_match('`\bnofollow\b`i', $a['rel'])) {$a['rel'] .= ' nofollow'; } 
+      }elseif (isset($aA['rel'])) { 
+       if (!preg_match('`\bnofollow\b`i', $aA['rel'])) {$nfr = 1; } 
+      } else {$a['rel'] = 'nofollow'; } 
      } 
     } 
    } 
   } 
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;} 
+  if (isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0) {continue; } 
   $a[$k] = str_replace('"', '&quot;', $v); 
  } 
 } 
-if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';} 
+if ($nfr) {$a['rel'] = isset($a['rel']) ? $a['rel'].' nofollow' : 'nofollow'; } 
 
 // rqd attr 
 static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50')); 
-if(isset($eAR[$e])){ 
- foreach($eAR[$e] as $k=>$v){ 
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;} 
+if (isset($eAR[$e])) { 
+ foreach ($eAR[$e] as $k=>$v) { 
+  if (!isset($a[$k])) {$a[$k] = isset($v[0]) ? $v : $k; } 
  } 
 } 
 
 // depr attrs 
-if($depTr){ 
+if ($depTr) { 
  $c = array(); 
- foreach($a as $k=>$v){ 
-  if($k == 'style' or !isset($aND[$k][$e])){continue;} 
-  if($k == 'align'){ 
+ foreach ($a as $k=>$v) { 
+  if ($k == 'style' or !isset($aND[$k][$e])) {continue; } 
+  if ($k == 'align') { 
    unset($a['align']); 
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} 
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} 
-   else{$c[] = 'text-align: '. $v;} 
-  }elseif($k == 'bgcolor'){ 
+   if ($e == 'img' && ($v == 'left' or $v == 'right')) {$c[] = 'float: '.$v; } 
+   elseif (($e == 'div' or $e == 'table') && $v == 'center') {$c[] = 'margin: auto'; } 
+   else {$c[] = 'text-align: '.$v; } 
+  }elseif ($k == 'bgcolor') { 
    unset($a['bgcolor']); 
-   $c[] = 'background-color: '. $v; 
-  }elseif($k == 'border'){ 
+   $c[] = 'background-color: '.$v; 
+  }elseif ($k == 'border') { 
    unset($a['border']); $c[] = "border: {$v}px"; 
-  }elseif($k == 'bordercolor'){ 
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v; 
-  }elseif($k == 'clear'){ 
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both'); 
-  }elseif($k == 'compact'){ 
+  }elseif ($k == 'bordercolor') { 
+   unset($a['bordercolor']); $c[] = 'border-color: '.$v; 
+  }elseif ($k == 'clear') { 
+   unset($a['clear']); $c[] = 'clear: '.($v != 'all' ? $v : 'both'); 
+  }elseif ($k == 'compact') { 
    unset($a['compact']); $c[] = 'font-size: 85%'; 
-  }elseif($k == 'height' or $k == 'width'){ 
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto'); 
-  }elseif($k == 'hspace'){ 
+  }elseif ($k == 'height' or $k == 'width') { 
+   unset($a[$k]); $c[] = $k.': '.($v[0] != '*' ? $v.(ctype_digit($v) ? 'px' : '') : 'auto'); 
+  }elseif ($k == 'hspace') { 
    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px"; 
-  }elseif($k == 'language' && !isset($a['type'])){ 
+  }elseif ($k == 'language' && !isset($a['type'])) { 
    unset($a['language']); 
-   $a['type'] = 'text/'. strtolower($v); 
-  }elseif($k == 'name'){ 
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);} 
-   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;} 
-  }elseif($k == 'noshade'){ 
+   $a['type'] = 'text/'.strtolower($v); 
+  }elseif ($k == 'name') { 
+   if ($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')) {unset($a['name']); } 
+   if (!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)) {$a['id'] = $v; } 
+  }elseif ($k == 'noshade') { 
    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray'; 
-  }elseif($k == 'nowrap'){ 
+  }elseif ($k == 'nowrap') { 
    unset($a['nowrap']); $c[] = 'white-space: nowrap'; 
-  }elseif($k == 'size'){ 
-   unset($a['size']); $c[] = 'size: '. $v. 'px'; 
-  }elseif($k == 'start' or $k == 'value'){ 
+  }elseif ($k == 'size') { 
+   unset($a['size']); $c[] = 'size: '.$v.'px'; 
+  }elseif ($k == 'start' or $k == 'value') { 
    unset($a[$k]); 
-  }elseif($k == 'type'){ 
+  }elseif ($k == 'type') { 
    unset($a['type']); 
    static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal'); 
-   $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal'); 
-  }elseif($k == 'vspace'){ 
+   $c[] = 'list-style-type: '.(isset($ol_type[$v]) ? $ol_type[$v] : 'decimal'); 
+  }elseif ($k == 'vspace') { 
    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px"; 
   } 
  } 
- if(count($c)){ 
+ if (count($c)) { 
   $c = implode('; ', $c); 
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';'; 
+  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$c.';' : $c.';'; 
  } 
 } 
 // unique ID 
-if($C['unique_ids'] && isset($a['id'])){ 
- if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']); 
- }else{ 
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;} 
+if ($C['unique_ids'] && isset($a['id'])) { 
+ if (!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)) {unset($a['id']); 
+ } else { 
+  while (isset($GLOBALS['hl_Ids'][$id])) {$id = $C['unique_ids'].$id; } 
   $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1; 
  } 
 } 
 // xml:lang 
-if($C['xml:lang'] && isset($a['lang'])){ 
+if ($C['xml:lang'] && isset($a['lang'])) { 
  $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang']; 
- if($C['xml:lang'] == 2){unset($a['lang']);} 
+ if ($C['xml:lang'] == 2) {unset($a['lang']); } 
 } 
 // for transformed tag 
-if(!empty($trt)){ 
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt; 
+if (!empty($trt)) { 
+ $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$trt : $trt; 
 } 
 // return with empty ele / 
-if(empty($C['hook_tag'])){ 
+if (empty($C['hook_tag'])) { 
  $aA = ''; 
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";} 
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>'; 
+ foreach ($a as $k=>$v) {$aA .= " {$k}=\"{$v}\""; } 
+ return "<{$e}{$aA}".(isset($eE[$e]) ? ' /' : '').'>'; 
 } 
-else{return $C['hook_tag']($e, $a);} 
+else {return $C['hook_tag']($e, $a); } 
 // eof 
 } 
 
-function hl_tag2(&$e, &$a, $t=1){ 
+function hl_tag2(&$e, &$a, $t = 1) { 
 // transform tag 
-if($e == 'center'){$e = 'div'; return 'text-align: center;';} 
-if($e == 'dir' or $e == 'menu'){$e = 'ul'; return '';} 
-if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';} 
-if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';} 
+if ($e == 'center') {$e = 'div'; return 'text-align: center;'; } 
+if ($e == 'dir' or $e == 'menu') {$e = 'ul'; return ''; } 
+if ($e == 's' or $e == 'strike') {$e = 'span'; return 'text-decoration: line-through;'; } 
+if ($e == 'u') {$e = 'span'; return 'text-decoration: underline;'; } 
 static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%'); 
-if($e == 'font'){ 
+if ($e == 'font') { 
  $a2 = ''; 
- if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){ 
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';'; 
+ if (preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)) { 
+  $a2 .= ' font-family: '.str_replace('"', '\'', trim($m[2])).';'; 
  } 
- if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){ 
-  $a2 .= ' color: '. trim($m[2]). ';'; 
+ if (preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)) { 
+  $a2 .= ' color: '.trim($m[2]).';'; 
  } 
- if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){ 
-  $a2 .= ' font-size: '. $fs[$m]. ';'; 
+ if (preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])) { 
+  $a2 .= ' font-size: '.$fs[$m].';'; 
  } 
  $e = 'span'; return ltrim($a2); 
 } 
-if($t == 2){$e = 0; return 0;} 
+if ($t == 2) {$e = 0; return 0; } 
 return ''; 
 // eof 
 } 
 
-function hl_tidy($t, $w, $p){ 
+function hl_tidy($t, $w, $p) { 
 // Tidy/compact HTM 
-if(strpos(' pre,script,textarea', "$p,")){return $t;} 
+if (strpos(' pre,script,textarea', "$p,")) {return $t; } 
 $t = preg_replace('`\s+`', ' ', preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t)); 
-if(($w = strtolower($w)) == -1){ 
+if (($w = strtolower($w)) == -1) { 
  return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
 } 
 $s = strpos(" $w", 't') ? "\t" : ' '; 
@@ -657,66 +657,66 @@ 
 $d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1); 
 $T = explode('<', $t); 
 $X = 1; 
-while($X){ 
+while ($X) { 
  $n = $N; 
  $t = $T; 
  ob_start(); 
- if(isset($d[$p])){echo str_repeat($s, ++$n);} 
+ if (isset($d[$p])) {echo str_repeat($s, ++$n); } 
  echo ltrim(array_shift($t)); 
- for($i=-1, $j=count($t); ++$i<$j;){ 
+ for ($i = -1, $j = count($t); ++$i < $j;) { 
   $r = ''; list($e, $r) = explode('>', $t[$i]); 
   $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1)); 
   $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0); 
   $e = "<$e>"; 
-  if(isset($d[$y])){ 
-   if(!$x){ 
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} 
-    else{++$N; ob_end_clean(); continue 2;} 
+  if (isset($d[$y])) { 
+   if (!$x) { 
+    if ($n) {echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n); } 
+    else {++$N; ob_end_clean(); continue 2; } 
    } 
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} 
+   else {echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n)); } 
    echo $r; continue; 
   } 
-  $f = "\n". str_repeat($s, $n); 
-  if(isset($c[$y])){ 
-   if(!$x){echo $e, $f, $r;} 
-   else{echo $f, $e, $r;} 
-  }elseif(isset($b[$y])){echo $f, $e, $r; 
-  }elseif(isset($a[$y])){echo $e, $f, $r; 
-  }elseif(!$y){echo $f, $e, $f, $r; 
-  }else{echo $e, $r;} 
+  $f = "\n".str_repeat($s, $n); 
+  if (isset($c[$y])) { 
+   if (!$x) {echo $e, $f, $r; } 
+   else {echo $f, $e, $r; } 
+  }elseif (isset($b[$y])) {echo $f, $e, $r; 
+  }elseif (isset($a[$y])) {echo $e, $f, $r; 
+  }elseif (!$y) {echo $f, $e, $f, $r; 
+  } else {echo $e, $r; } 
  } 
  $X = 0; 
 } 
 $t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents())); 
 ob_end_clean(); 
-if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){ 
+if (($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)) { 
  $t = str_replace("\n", $l, $t); 
 } 
 return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t); 
 // eof 
 } 
 
-function hl_version(){ 
+function hl_version() { 
 // rel 
 return '1.1.18'; 
 // eof 
 } 
 
-function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){ 
+function kses($t, $h, $p = array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')) { 
 // kses compat 
-foreach($h as $k=>$v){ 
+foreach ($h as $k=>$v) { 
  $h[$k]['n']['*'] = 1; 
 } 
 $C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0; 
 $C['keep_bad'] = 1; 
 $C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*'; 
 $C['hook'] = 'kses_hook'; 
-$C['schemes'] = '*:'. implode(',', $p); 
+$C['schemes'] = '*:'.implode(',', $p); 
 return htmLawed($t, $C, $h); 
 // eof 
 } 
 
-function kses_hook($t, &$C, &$S){ 
+function kses_hook($t, &$C, &$S) { 
 // kses compat 
 return $t; 
 // eof 

Braces +49 added lines, -79 removed lines

@@ -22,9 +22,7 @@ 
  unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']); 
 } 
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*'; 
-if($x == '-*'){$e = array();} 
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));} 
-else{ 
+if($x == '-*'){$e = array();} elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));} else{ 
  if(isset($x[1])){ 
   preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER); 
   for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];} 
@@ -166,10 +164,7 @@ 
 if(isset($cE[$in])){ 
  return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t)); 
 } 
-if(isset($cS[$in])){$inOk = $cS[$in];} 
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);} 
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);} 
+if(isset($cS[$in])){$inOk = $cS[$in];} elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;} elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);} elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);} 
 if(isset($cO[$in])){$inOk = $inOk + $cO[$in];} 
 if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);} 
 
@@ -182,13 +177,10 @@ 
  if($ql = count($q)){ 
   $p = array_pop($q); 
   $q[] = $p; 
-  if(isset($cS[$p])){$ok = $cS[$p];} 
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
+  if(isset($cS[$p])){$ok = $cS[$p];} elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
   if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
   if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
+ } else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
  // bad tags, & ele content 
  if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
   echo '&lt;', $s, $e, $a, '&gt;'; 
@@ -196,13 +188,11 @@ 
  if(isset($x[0])){ 
   if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
    echo '<div>', $x, '</div>'; 
-  } 
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
-  elseif(strpos($x, "\x02\x04")){ 
+  } elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} elseif(strpos($x, "\x02\x04")){ 
    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
    } 
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+  } elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
  } 
  // get markup 
  if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;} 
@@ -213,8 +203,7 @@ 
   if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open 
   $add = ''; // Nesting - close open tags that need to be 
   for($j=-1, $cj=count($q); ++$j<$cj;){   
-   if(($d = array_pop($q)) == $e){break;} 
-   else{$add .= "</{$d}>";} 
+   if(($d = array_pop($q)) == $e){break;} else{$add .= "</{$d}>";} 
   } 
   echo $add, '</', $e, '>'; unset($e); continue; 
  } 
@@ -256,8 +245,7 @@ 
    $add = "</{$d}>"; 
    for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";} 
    break; 
-  } 
-  else{$q2[] = $d;} 
+  } else{$q2[] = $d;} 
  } 
  $q = $q2; 
  if(!isset($cE[$e])){$q[] = $e;} 
@@ -268,26 +256,21 @@ 
 if($ql = count($q)){ 
  $p = array_pop($q); 
  $q[] = $p; 
- if(isset($cS[$p])){$ok = $cS[$p];} 
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} 
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} 
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
+ if(isset($cS[$p])){$ok = $cS[$p];} elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;} elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);} elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);} 
  if(isset($cO[$p])){$ok = $ok + $cO[$p];} 
  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);} 
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
+} else{$ok = $inOk; unset($cI['del'], $cI['ins']);} 
 if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){ 
  echo '&lt;', $s, $e, $a, '&gt;'; 
 } 
 if(isset($x[0])){ 
  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){ 
   echo '<div>', $x, '</div>'; 
- } 
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} 
- elseif(strpos($x, "\x02\x04")){ 
+ } elseif($do < 3 or isset($ok['#pcdata'])){echo $x;} elseif(strpos($x, "\x02\x04")){ 
   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){ 
    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : '')); 
   } 
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
+ } elseif($do > 4){echo preg_replace('`\S`', '', $x);} 
 } 
 while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';} 
 $o = ob_get_contents(); 
@@ -304,8 +287,7 @@ 
 if($v == 1){return '';} 
 if($n == 'comment'){ 
  if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';} 
-} 
-else{$t = substr($t, 1, -1);} 
+} else{$t = substr($t, 1, -1);} 
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t; 
 return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01")); 
 // eof 
@@ -342,11 +324,8 @@ 
 if($C['abs_url']){ 
  if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel 
   $p = substr($p, strlen($C['base_url'])); 
- }elseif(empty($m[1])){ // Make URL abs 
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} 
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} 
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;} 
-  else{ 
+ } elseif(empty($m[1])){ // Make URL abs 
+  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;} elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;} elseif(strcspn($p, './')){$p = $C['base_url']. $p;} else{ 
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m); 
    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p); 
    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){ 
@@ -363,15 +342,13 @@ 
 function hl_regex($p){ 
 // ?regex 
 if(empty($p)){return 0;} 
-if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;} 
-else{ini_set('track_errors', 1);} 
+if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;} else{ini_set('track_errors', 1);} 
 unset($php_errormsg); 
 if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);} 
 preg_match($p, ''); 
 if($d){ini_set('display_errors', 1);} 
 $r = isset($php_errormsg) ? 0 : 1; 
-if($t){$php_errormsg = isset($o) ? $o : null;} 
-else{ini_set('track_errors', 0);} 
+if($t){$php_errormsg = isset($o) ? $o : null;} else{ini_set('track_errors', 0);} 
 return $r; 
 // eof 
 } 
@@ -416,7 +393,7 @@ 
 if($t == '>'){return '&gt;';} 
 if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){ 
  return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t); 
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){ 
+} elseif(!isset($C['elements'][($e = strtolower($m[2]))])){ 
  return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); 
 } 
 // attr string 
@@ -468,7 +445,7 @@ 
   break; case 1: 
    if($a[0] == '='){ // = 
     $w = 1; $mode = 2; $a = ltrim($a, '= '); 
-   }else{ // No val 
+   } else{ // No val 
     $w = 1; $mode = 0; $a = ltrim($a); 
     $aA[$nm] = ''; 
    } 
@@ -492,8 +469,7 @@ 
 $a = array(); $nfr = 0; 
 foreach($aA as $k=>$v){ 
   if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){ 
-  if(isset($aNE[$k])){$v = $k;} 
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues 
+  if(isset($aNE[$k])){$v = $k;} elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues 
    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v; 
   } 
   if($k == 'style' && !$C['style_pass']){ 
@@ -503,22 +479,22 @@ 
    } 
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v); 
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v; 
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){ 
+  } elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){ 
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); 
    $v = hl_prot($v, $k); 
    if($k == 'href'){ // X-spam 
     if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){ 
      $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v); 
-    }elseif($C['anti_link_spam']){ 
+    } elseif($C['anti_link_spam']){ 
      $r1 = $C['anti_link_spam'][1]; 
      if(!empty($r1) && preg_match($r1, $v)){continue;} 
      $r0 = $C['anti_link_spam'][0]; 
      if(!empty($r0) && preg_match($r0, $v)){ 
       if(isset($a['rel'])){ 
        if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';} 
-      }elseif(isset($aA['rel'])){ 
+      } elseif(isset($aA['rel'])){ 
        if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;} 
-      }else{$a['rel'] = 'nofollow';} 
+      } else{$a['rel'] = 'nofollow';} 
      } 
     } 
    } 
@@ -544,43 +520,41 @@ 
   if($k == 'style' or !isset($aND[$k][$e])){continue;} 
   if($k == 'align'){ 
    unset($a['align']); 
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} 
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} 
-   else{$c[] = 'text-align: '. $v;} 
-  }elseif($k == 'bgcolor'){ 
+   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;} elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';} else{$c[] = 'text-align: '. $v;} 
+  } elseif($k == 'bgcolor'){ 
    unset($a['bgcolor']); 
    $c[] = 'background-color: '. $v; 
-  }elseif($k == 'border'){ 
+  } elseif($k == 'border'){ 
    unset($a['border']); $c[] = "border: {$v}px"; 
-  }elseif($k == 'bordercolor'){ 
+  } elseif($k == 'bordercolor'){ 
    unset($a['bordercolor']); $c[] = 'border-color: '. $v; 
-  }elseif($k == 'clear'){ 
+  } elseif($k == 'clear'){ 
    unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both'); 
-  }elseif($k == 'compact'){ 
+  } elseif($k == 'compact'){ 
    unset($a['compact']); $c[] = 'font-size: 85%'; 
-  }elseif($k == 'height' or $k == 'width'){ 
+  } elseif($k == 'height' or $k == 'width'){ 
    unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto'); 
-  }elseif($k == 'hspace'){ 
+  } elseif($k == 'hspace'){ 
    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px"; 
-  }elseif($k == 'language' && !isset($a['type'])){ 
+  } elseif($k == 'language' && !isset($a['type'])){ 
    unset($a['language']); 
    $a['type'] = 'text/'. strtolower($v); 
-  }elseif($k == 'name'){ 
+  } elseif($k == 'name'){ 
    if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);} 
    if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;} 
-  }elseif($k == 'noshade'){ 
+  } elseif($k == 'noshade'){ 
    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray'; 
-  }elseif($k == 'nowrap'){ 
+  } elseif($k == 'nowrap'){ 
    unset($a['nowrap']); $c[] = 'white-space: nowrap'; 
-  }elseif($k == 'size'){ 
+  } elseif($k == 'size'){ 
    unset($a['size']); $c[] = 'size: '. $v. 'px'; 
-  }elseif($k == 'start' or $k == 'value'){ 
+  } elseif($k == 'start' or $k == 'value'){ 
    unset($a[$k]); 
-  }elseif($k == 'type'){ 
+  } elseif($k == 'type'){ 
    unset($a['type']); 
    static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal'); 
    $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal'); 
-  }elseif($k == 'vspace'){ 
+  } elseif($k == 'vspace'){ 
    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px"; 
   } 
  } 
@@ -592,7 +566,7 @@ 
 // unique ID 
 if($C['unique_ids'] && isset($a['id'])){ 
  if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']); 
- }else{ 
+ } else{ 
   while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;} 
   $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1; 
  } 
@@ -611,8 +585,7 @@ 
  $aA = ''; 
  foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";} 
  return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>'; 
-} 
-else{return $C['hook_tag']($e, $a);} 
+} else{return $C['hook_tag']($e, $a);} 
 // eof 
 } 
 
@@ -670,20 +643,17 @@ 
   $e = "<$e>"; 
   if(isset($d[$y])){ 
    if(!$x){ 
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} 
-    else{++$N; ob_end_clean(); continue 2;} 
-   } 
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} 
+    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);} else{++$N; ob_end_clean(); continue 2;} 
+   } else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));} 
    echo $r; continue; 
   } 
   $f = "\n". str_repeat($s, $n); 
   if(isset($c[$y])){ 
-   if(!$x){echo $e, $f, $r;} 
-   else{echo $f, $e, $r;} 
-  }elseif(isset($b[$y])){echo $f, $e, $r; 
-  }elseif(isset($a[$y])){echo $e, $f, $r; 
-  }elseif(!$y){echo $f, $e, $f, $r; 
-  }else{echo $e, $r;} 
+   if(!$x){echo $e, $f, $r;} else{echo $f, $e, $r;} 
+  } elseif(isset($b[$y])){echo $f, $e, $r; 
+  } elseif(isset($a[$y])){echo $e, $f, $r; 
+  } elseif(!$y){echo $f, $e, $f, $r; 
+  } else{echo $e, $r;} 
  } 
  $X = 0; 
 } 

html/inc/news.inc

Doc Comments +4 added lines

@@ -65,6 +65,10 @@
     return $forum->parent_type == 0 && ($forum->title === $forum_name);
 }
 
+/**
+ * @param integer $start
+ * @param integer $count
+ */
 function show_news($start, $count) {
     $forum = news_forum();
     if (!$forum) {

Spacing +1 added lines, -1 removed lines

@@ -118,5 +118,5 @@
     ";
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/pm.inc

Doc Comments +13 added lines

@@ -27,6 +27,10 @@ 
     echo "</div>\n";
 }
 
+/**
+ * @param null|integer $teamid
+ * @param string $error
+ */
 function pm_team_form($user, $teamid, $error=null) {
     global $bbcode_html, $bbcode_js;
     $team = BoincTeam::lookup_id($teamid);
@@ -78,6 +82,9 @@ 
     page_tail();
 }
 
+/**
+ * @param string $error
+ */
 function pm_form($replyto, $userid, $error = null) {
     global $bbcode_html, $bbcode_js;
     global $g_logged_in_user;
@@ -196,6 +203,9 @@ 
     return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject";
 }
 
+/**
+ * @param boolean $send_email
+ */
 function pm_send_msg($from_user, $to_user, $subject, $content, $send_email) {
     $sql_subject = BoincDb::escape_string(sanitize_tags($subject));
     $sql_content = BoincDb::escape_string($content);
@@ -224,6 +234,9 @@ 
     BoincNotify::insert("(userid, create_time, type, opaque) values ($to_user->id, ".time().", ".NOTIFY_PM.", $mid)");
 }
 
+/**
+ * @param integer $duration
+ */
 function pm_count($userid, $duration) {
     $time = time() - $duration;
 

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
     echo "</div>\n";
 }
 
-function pm_team_form($user, $teamid, $error=null) {
+function pm_team_form($user, $teamid, $error = null) {
     global $bbcode_html, $bbcode_js;
     $team = BoincTeam::lookup_id($teamid);
     if (!$team) {
@@ -37,7 +37,7 @@ 
         error_page("not admin");
     }
 
-    page_head(tra("Send message to team"),'','','', $bbcode_js);
+    page_head(tra("Send message to team"), '', '', '', $bbcode_js);
 
     $subject = post_str("subject", true);
     $content = post_str("content", true);
@@ -81,7 +81,7 @@ 
 function pm_form($replyto, $userid, $error = null) {
     global $bbcode_html, $bbcode_js;
     global $g_logged_in_user;
-    page_head(tra("Send private message"),'','','', $bbcode_js);
+    page_head(tra("Send private message"), '', '', '', $bbcode_js);
     
     if (post_str("preview", true) == tra("Preview")) {
         $content = post_str("content", true);
@@ -163,7 +163,7 @@ 
 function send_pm_notification_email(
     $logged_in_user, $to_user, $subject, $content
 ) {
-    $message  = "
+    $message = "
 You have received a new private message at ".PROJECT.".
 
 From: $logged_in_user->name (ID $logged_in_user->id)
@@ -193,7 +193,7 @@ 
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
     if (!$pm || !$from_user) return null;
-    return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject";
+    return "<a href=pm.php>".tra("Private message%1 from %2, subject:", "</a>", $from_user->name)." $pm->subject";
 }
 
 function pm_send_msg($from_user, $to_user, $subject, $content, $send_email) {
@@ -257,11 +257,11 @@ 
 
 function pm_email_remind($user) {
     if (!$user->prefs->pm_notification) {
-        return "<br><small>" .
+        return "<br><small>".
             tra(
                 "For email notification, %1edit community prefs%2",
                 '<a href="edit_forum_preferences_form.php">', '</a>'
-            ) .
+            ).
             "</small>"
         ;
     }
@@ -287,5 +287,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id: pm.inc 14019 2007-11-01 23:04:39Z davea $";
+$cvs_version_tracker[] = "\$Id: pm.inc 14019 2007-11-01 23:04:39Z davea $";
 ?>

Braces +6 added lines, -2 removed lines

@@ -185,14 +185,18 @@
 function pm_email_line($notify) {
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
-    if (!$pm || !$from_user) return null;
+    if (!$pm || !$from_user) {
+        return null;
+    }
     return "$from_user->name ".tra("sent you a private message; subject:")." '$pm->subject'";
 }
 
 function pm_web_line($notify) {
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
-    if (!$pm || !$from_user) return null;
+    if (!$pm || !$from_user) {
+        return null;
+    }
     return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject";
 }
 

html/inc/prefs.inc

Doc Comments +11 added lines

@@ -291,6 +291,9 @@ 
     return $dp;
 }
 
+/**
+ * @param string $t
+ */
 function group_header($t) {
     echo "<tr><th class=\"bg-info\">$t</th><td class=\"bg-info\" colspan=4><br></td></tr>\n";
 }
@@ -413,6 +416,9 @@ 
 
 // Display all venues as columns next to descriptions
 //
+/**
+ * @param stdClass $prefs
+ */
 function prefs_show_columns_global($prefs) {
     global $cpu_prefs;
     global $disk_prefs;
@@ -483,6 +489,11 @@ 
     return PROJECT;
 }
 
+/**
+ * @param stdClass $prefs
+ * @param string $venue
+ * @param string $subset
+ */
 function prefs_display_venue($prefs, $venue, $subset) {
     global $g_logged_in_user;
     $tokens = url_tokens($g_logged_in_user->authenticator);

Spacing +15 added lines, -15 removed lines

@@ -276,9 +276,9 @@ 
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
     // set some defaults if not found
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
+    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0; // no limit
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1; // 1 GB
     // set mininimum free space scheduler allows 
     // - depends on which scheduler is running
     $dp->new_sched_flag = 1;
@@ -304,7 +304,7 @@ 
     global $text;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         if (array_key_exists("name", $attrs)) {
             $venue_name = $attrs["name"];
@@ -350,7 +350,7 @@ 
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -509,7 +509,7 @@ 
     }
 }
 
-function print_prefs_display_global($user, $columns=false) {
+function print_prefs_display_global($user, $columns = false) {
     $global_prefs = prefs_parse_global($user->global_prefs);
 
     echo tra("These settings apply to all computers using this account except")
@@ -519,7 +519,7 @@ 
         .tra("Android devices")
         ."</ul>
     ";
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=".(int)!$columns.">".tra("(Switch view)")."</a></font>";
     if ($columns) {
         echo "<h3>".tra("Combined preferences").$switch_link."</h3>";
         start_table();
@@ -554,9 +554,9 @@ 
 // otherwise false
 //
 function print_prefs_form(
-    $action, $subset, $venue, $user, $prefs, $cols, $error=false,
-    $project_error=false
-){
+    $action, $subset, $venue, $user, $prefs, $cols, $error = false,
+    $project_error = false
+) {
     if ($action == "add") {
         $script = "add_venue.php";
         $submit_value = tra("Add preferences");
@@ -595,7 +595,7 @@ 
 //
 // Functions to display preference subsets as forms
 //
-function prefs_form_global($user, $prefs, $error=false) {
+function prefs_form_global($user, $prefs, $error = false) {
     global $cpu_prefs;
     global $disk_prefs;
     global $mem_prefs;
@@ -635,9 +635,9 @@ 
 //
 function prefs_form_radio_buttons($name, $yesno) {
     $rb = tra("yes")." <input type=radio name=$name value=yes "
-        .($yesno?"checked":"")
+        .($yesno ? "checked" : "")
         ."> ".tra("no")." <input type=radio name=$name value=no "
-        .($yesno?"":"checked")
+        .($yesno ? "" : "checked")
         .">\n";
     return $rb;
 }
@@ -656,12 +656,12 @@ 
 }
 function venue_show($user) {
     $venue = $user->venue;
-    if ($venue =='') $venue = '---';
+    if ($venue == '') $venue = '---';
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
 }
 
 function venue_form($user) {
-    $n=$h=$w=$s=$m='';
+    $n = $h = $w = $s = $m = '';
     if ($user->venue == '') $n = 'selected';
     if ($user->venue == 'home') $h = 'selected';
     if ($user->venue == 'work') $w = 'selected';
@@ -717,7 +717,7 @@ 
 //
 // convert prefs from structure to XML
 //
-function global_prefs_make_xml($prefs, $primary=true) {
+function global_prefs_make_xml($prefs, $primary = true) {
     global $cpu_prefs;
     global $disk_prefs;
     global $mem_prefs;

Braces +57 added lines, -18 removed lines

@@ -276,9 +276,18 @@ 
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
     // set some defaults if not found
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
-    if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
+    if (!$dp->disk_max_used_gb) {
+        $dp->disk_max_used_gb = 0;
+    }
+    // no limit
+    if (!$dp->disk_max_used_pct) {
+        $dp->disk_max_used_pct = 90;
+    }
+    // 90 percent
+    if (!$dp->disk_min_free_gb) {
+        $dp->disk_min_free_gb = 1;
+    }
+    // 1 GB
     // set mininimum free space scheduler allows 
     // - depends on which scheduler is running
     $dp->new_sched_flag = 1;
@@ -329,7 +338,9 @@ 
     global $net_prefs;
 
     foreach ($cpu_prefs as $p) {
-        if (is_string($p)) continue;
+        if (is_string($p)) {
+            continue;
+        }
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
@@ -345,7 +356,9 @@ 
         }
     }
     foreach ($net_prefs as $p) {
-        if (is_string($p)) continue;
+        if (is_string($p)) {
+            continue;
+        }
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
@@ -381,7 +394,9 @@ 
 
     $p = new StdClass;
     foreach ($cpu_prefs as $pref) {
-        if (is_string($pref)) continue;
+        if (is_string($pref)) {
+            continue;
+        }
         $pref->set_default($p);
     }
     foreach ($disk_prefs as $pref) {
@@ -391,7 +406,9 @@ 
         $pref->set_default($p);
     }
     foreach ($net_prefs as $pref) {
-        if (is_string($pref)) continue;
+        if (is_string($pref)) {
+            continue;
+        }
         $pref->set_default($p);
     }
     return $p;
@@ -479,7 +496,9 @@ 
 }
 
 function subset_name($subset) {
-    if ($subset == "global") return tra("Computing");
+    if ($subset == "global") {
+        return tra("Computing");
+    }
     return PROJECT;
 }
 
@@ -487,7 +506,9 @@ 
     global $g_logged_in_user;
     $tokens = url_tokens($g_logged_in_user->authenticator);
     $x = false;
-    if (isset($prefs->$venue)) $x = $prefs->$venue;
+    if (isset($prefs->$venue)) {
+        $x = $prefs->$venue;
+    }
 
     if ($x) {
         start_table();
@@ -656,16 +677,26 @@ 
 }
 function venue_show($user) {
     $venue = $user->venue;
-    if ($venue =='') $venue = '---';
+    if ($venue =='') {
+        $venue = '---';
+    }
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
 }
 
 function venue_form($user) {
     $n=$h=$w=$s=$m='';
-    if ($user->venue == '') $n = 'selected';
-    if ($user->venue == 'home') $h = 'selected';
-    if ($user->venue == 'work') $w = 'selected';
-    if ($user->venue == 'school') $s = 'selected';
+    if ($user->venue == '') {
+        $n = 'selected';
+    }
+    if ($user->venue == 'home') {
+        $h = 'selected';
+    }
+    if ($user->venue == 'work') {
+        $w = 'selected';
+    }
+    if ($user->venue == 'school') {
+        $s = 'selected';
+    }
     tooltip_row2(
         VENUE_TOOLTIP,
         VENUE_DESC,
@@ -696,7 +727,9 @@ 
 
     $error = false;
     foreach ($cpu_prefs as $p) {
-        if (is_string($p)) continue;
+        if (is_string($p)) {
+            continue;
+        }
         $p->parse_form($prefs, $error);
     }
     foreach ($disk_prefs as $p) {
@@ -706,7 +739,9 @@ 
         $p->parse_form($prefs, $error);
     }
     foreach ($net_prefs as $p) {
-        if (is_string($p)) continue;
+        if (is_string($p)) {
+            continue;
+        }
         $p->parse_form($prefs, $error);
     }
     return $error;
@@ -731,7 +766,9 @@ 
     }
 
     foreach ($cpu_prefs as $p) {
-        if (is_string($p)) continue;
+        if (is_string($p)) {
+            continue;
+        }
         $xml .= $p->xml_string($prefs);
     }
     foreach ($disk_prefs as $p) {
@@ -741,7 +778,9 @@ 
         $xml .= $p->xml_string($prefs);
     }
     foreach ($net_prefs as $p) {
-        if (is_string($p)) continue;
+        if (is_string($p)) {
+            continue;
+        }
         $xml .= $p->xml_string($prefs);
     }
 

html/inc/prefs_project.inc

Doc Comments +3 added lines

@@ -241,6 +241,9 @@
     }
 }
 
+/**
+ * @param boolean $columns
+ */
 function prefs_show_privacy($user, $columns) {
     global $privacy_pref_descs;
     if ($columns) {

Spacing +18 added lines, -18 removed lines

@@ -68,7 +68,7 @@ 
 }
 
 if ($app_types->cpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use CPU"),
         "Request CPU-only tasks from this project.",
         "no_cpu",
@@ -77,7 +77,7 @@ 
     );
 }
 if ($app_types->ati) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use ATI GPU"),
         "Request ATI GPU tasks from this project.",
         "no_ati",
@@ -86,7 +86,7 @@ 
     );
 }
 if ($app_types->cuda) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use NVIDIA GPU"),
         "Request NVIDIA GPU tasks from this project.",
         "no_cuda",
@@ -95,7 +95,7 @@ 
     );
 }
 if ($app_types->intel_gpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use Intel GPU"),
         "Request Intel GPU tasks from this project.",
         "no_intel_gpu",
@@ -120,7 +120,7 @@ 
     $x = "";
 }
 
-$privacy_pref_descs = array (
+$privacy_pref_descs = array(
     new PREF_BOOL(
         tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x,
         "",
@@ -152,7 +152,7 @@ 
     global $in_project_specific;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         $venue_name = $attrs["name"];
         $top_parse_result = $parse_result;
@@ -164,7 +164,7 @@ 
         break;
     default:
         if ($in_project_specific) {
-            $text= $text."<$name>";
+            $text = $text."<$name>";
         } else {
             $text = "";
         }
@@ -179,12 +179,12 @@ 
     global $venue_name;
     global $project_pref_descs;
 
-    foreach($project_pref_descs as $p) {
+    foreach ($project_pref_descs as $p) {
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -228,7 +228,7 @@ 
     return $parse_result;
 }
 
-function prefs_show_project($prefs, $columns=false) {
+function prefs_show_project($prefs, $columns = false) {
     global $project_pref_descs;
     if ($columns) {
         foreach ($project_pref_descs as $p) {
@@ -254,7 +254,7 @@ 
     }
 }
 
-function prefs_show_project_specific($prefs, $columns=false) {
+function prefs_show_project_specific($prefs, $columns = false) {
     if ($columns) {
         $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
         $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : "";
@@ -266,10 +266,10 @@ 
     project_specific_prefs_show($project_specific_prefs, $columns);
 }
 
-function print_prefs_display_project($user, $columns=false) {
+function print_prefs_display_project($user, $columns = false) {
     $project_prefs = prefs_parse_project($user->project_prefs);
 
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=".(int)!$columns.">".tra("(Switch View)")."</a></font>";
     if ($columns) {
         start_table();
         row_heading(tra("Combined preferences").$switch_link);
@@ -311,14 +311,14 @@ 
     }
 }
 
-function prefs_form_project($prefs, $error=false) {
+function prefs_form_project($prefs, $error = false) {
     global $project_pref_descs;
     foreach ($project_pref_descs as $p) {
         $p->show_form_row($prefs, $error);
     }
 }
 
-function prefs_form_project_specific($prefs_xml, $error=false) {
+function prefs_form_project_specific($prefs_xml, $error = false) {
     $prefs = project_specific_prefs_parse($prefs_xml);
     project_specific_prefs_edit($prefs, $error);
 }
@@ -357,7 +357,7 @@ 
 
 // given a prefs structure, return the corresponding XML string
 //
-function project_prefs_make_xml($prefs, $primary=true) {
+function project_prefs_make_xml($prefs, $primary = true) {
     global $project_pref_descs;
     $xml = "";
     if ($primary) {
@@ -392,8 +392,8 @@ 
 //
 function project_prefs_update(&$user, $prefs) {
     $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs));
-    $send_email = $user->send_email?1:0;
-    $show_hosts = $user->show_hosts?1:0;
+    $send_email = $user->send_email ? 1 : 0;
+    $show_hosts = $user->show_hosts ? 1 : 0;
     $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts");
     if (!$retval) {
         return 1;