BOINC / boinc

html/inc/dir_hier.inc

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
     return "$dirpath/$filename";
 }
 
+/**
+ * @param string $base
+ */
 function dir_hier_url($filename, $base, $fanout) {
     $dir = filename_hash($filename, $fanout);
     return "$base/$dir/$filename";

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -56,17 +56,17 @@ 
     $dl_md5_path = "$dl_path.md5";
     $have_md5_file = false;
     $md5 = md5_file($path);
-    if ($md5 === FALSE) {
+    if ($md5 === false) {
         return -2;
     }
     $size = filesize($path);
-    if ($size === FALSE) {
+    if ($size === false) {
         return -2;
     }
 
     if (file_exists($dl_md5_path)) {
         $x = file_get_contents($dl_md5_path);
-        if ($x === FALSE) {
+        if ($x === false) {
             return -2;
         }
         $x = explode(" ", $x);
@@ -78,7 +78,7 @@ 
     if (file_exists($dl_path)) {
         if ($have_md5_file) {
             $s = filesize($dl_path);
-            if ($s === FALSE) {
+            if ($s === false) {
                 return -2;
             }
             if ($s == $dl_size && $dl_md5 == $md5) {
@@ -91,11 +91,11 @@ 
             // missing the .md5 file; need to look at the file
             //
             $m = md5_file($dl_path);
-            if ($m === FALSE) {
+            if ($m === false) {
                 return -2;
             }
             if ($m == $md5) {
-                if (file_put_contents($dl_md5_path, "$md5 $size\n") === FALSE) {
+                if (file_put_contents($dl_md5_path, "$md5 $size\n") === false) {
                     return -2;
                 }
                 return 0;
@@ -103,7 +103,7 @@ 
             return -1;
         }
     } else {
-        if (file_put_contents($dl_md5_path, "$md5 $size\n") === FALSE) {
+        if (file_put_contents($dl_md5_path, "$md5 $size\n") === false) {
             return -2;
         }
         return 1;

html/inc/forum_db.inc

Doc Comments +20 added lines

@@ -115,6 +115,10 @@ 
         $db = BoincDb::get();
         return $db->enum('post', 'BoincPost', $clause);
     }
+
+    /**
+     * @param string $query
+     */
     static function enum_general($query) {
         $db = BoincDb::get();
         return $db->enum_general('BoincPost', $query);
@@ -175,6 +179,10 @@ 
         $db = BoincDb::get();
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
     }
+
+    /**
+     * @param string $clause
+     */
     static function enum($clause=null) {
         $db = BoincDb::get();
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
@@ -290,6 +298,10 @@ 
 }
 
 class BoincNotify {
+
+    /**
+     * @param string $clause
+     */
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('notify', $clause);
@@ -304,6 +316,10 @@ 
         $db = BoincDb::get();
         return $db->enum('notify', 'BoincNotify', $clause);
     }
+
+    /**
+     * @param integer $type
+     */
     static function lookup($userid, $type, $opaque) {
         $db = BoincDb::get();
         return $db->lookup('notify', 'BoincNotify', "userid=$userid and type=$type and opaque=$opaque");
@@ -316,6 +332,10 @@ 
         $db = BoincDb::get();
         $db->delete_aux('notify', $clause);
     }
+
+    /**
+     * @param string $query
+     */
     static function enum_general($query) {
         $db = BoincDb::get();
         return $db->enum_general('BoincNotify', $query);

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+            return (substr($this->special_user, $specialbit,1)==1);
     }
     function update($clause) {
         $db = BoincDb::get();

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
         $db = BoincDb::get();
         return $db->lookup('category', 'BoincCategory', $clause);
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('category', 'BoincCategory', $clause);
     }
@@ -78,7 +78,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'thread', $clause);
     }
-    static function enum($clause="") {
+    static function enum($clause = "") {
         $db = BoincDb::get();
         return $db->enum('thread', 'BoincThread', $clause);
     }
@@ -142,7 +142,7 @@ 
         $db = BoincDb::get();
         $ret = $db->insert('forum_preferences', $clause);
     }
-    static function lookup(&$user, $nocache=false) {
+    static function lookup(&$user, $nocache = false) {
         if (!$user) return;
         if (isset($user->prefs)) return;
         if (!$nocache && isset(self::$cache[$user->id])) {
@@ -164,7 +164,7 @@ 
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+         return (substr($this->special_user, $specialbit, 1) == 1);
     }
     function update($clause) {
         $db = BoincDb::get();
@@ -175,7 +175,7 @@ 
         $db = BoincDb::get();
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
     }
@@ -215,8 +215,8 @@ 
         //
         $fl = BoincForumLogging::lookup(0, 0);
         if ($fl) {
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
-                BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
+            if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) {
+                BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0");
                 BoincForumLogging::replace(0, 0, time());
             }
         } else {
@@ -322,9 +322,9 @@ 
     }
 }
 
-define ('NOTIFY_FRIEND_REQ', 1);
-define ('NOTIFY_FRIEND_ACCEPT', 2);
-define ('NOTIFY_PM', 3);
-define ('NOTIFY_SUBSCRIBED_POST', 4);
+define('NOTIFY_FRIEND_REQ', 1);
+define('NOTIFY_FRIEND_ACCEPT', 2);
+define('NOTIFY_PM', 3);
+define('NOTIFY_SUBSCRIBED_POST', 4);
 
 ?>

Braces +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
         //
         $fl = BoincForumLogging::lookup(0, 0);
         if ($fl) {
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
+            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME) {
                 BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
                 BoincForumLogging::replace(0, 0, time());
             }

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

Braces +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 // 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){
+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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 
 For assistance with ".PROJECT." go to ".$master_url;
 
-    $subject = "THREAD $action REPORT: $thread->title";
+    $subject = "thread $action REPORT: $thread->title";
     $success = mail_report_list($forum, $subject, $body);
     $success &= send_email($user, $subject, $body);
     pm_send_msg($user, $user, $subject, $body, false);

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\">

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

Braces +20 added lines, -21 removed lines

@@ -229,7 +229,7 @@ 
   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) {
@@ -241,18 +241,18 @@ 
             $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)||
                      ($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++){
+                for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++) {
                     $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
                 }
 	            if (($gi->databaseType == GEOIP_ORG_EDITION)||
@@ -267,7 +267,7 @@ 
     }
     if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
         ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)) {
         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
   } else {
@@ -275,21 +275,20 @@ 
     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))){
+        if ($delim == (chr(255).chr(255).chr(255))) {
         $gi->databaseType = ord(fread($gi->filehandle,1));
-        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 = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
-            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
+            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++) {
             $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
             }
 	    if ($gi->databaseType == GEOIP_ORG_EDITION) {
@@ -303,7 +302,7 @@ 
     }
     if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
         ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+        ($gi->databaseType == GEOIP_NETSPEED_EDITION)) {
          $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
     }
     fseek($gi->filehandle,$filepos,SEEK_SET);
@@ -419,7 +418,7 @@ 
   return false;
 }
 
-function _get_org($gi,$ipnum){
+function _get_org($gi,$ipnum) {
   $seek_org = _geoip_seek_country($gi,$ipnum);
   if ($seek_org == $gi->databaseSegments) {
     return NULL;
@@ -443,10 +442,10 @@ 
   return _get_org($gi, $ipnum);
 }
 
-function _get_region($gi,$ipnum){
-  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+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){
+    if ($seek_region >= 1000) {
       $country_code = "US";
       $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
     } else {
@@ -454,10 +453,10 @@ 
       $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){
+    if ($seek_region < US_OFFSET) {
       $country_code = "";
       $region = "";  
         } else if ($seek_region < CANADA_OFFSET) {
@@ -482,7 +481,7 @@ 
   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");

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -422,7 +422,7 @@ 
 function _get_org($gi,$ipnum){
   $seek_org = _geoip_seek_country($gi,$ipnum);
   if ($seek_org == $gi->databaseSegments) {
-    return NULL;
+    return null;
   }
   $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
@@ -436,7 +436,7 @@ 
 }
 
 function geoip_org_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
+  if ($addr == null) {
     return 0;
   }
   $ipnum = ip2long($addr);
@@ -475,7 +475,7 @@ 
 }
 
 function geoip_region_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
+  if ($addr == null) {
     return 0;
   }
   $ipnum = ip2long($addr);

Spacing +96 added lines, -96 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;
+    $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;
 }
@@ -315,9 +315,9 @@ 
   $gi = new GeoIP;
   $gi->flags = $flags;
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
+    $gi->shmid = @shmop_open(GEOIP_SHM_KEY, "a", 0, 0);
     } else {
-    $gi->filehandle = fopen($filename,"rb");
+    $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]);
@@ -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];
   }
@@ -386,24 +386,24 @@ 
   for ($depth = 31; $depth >= 0; --$depth) {
     if ($gi->flags & GEOIP_MEMORY_CACHE) {
       $buf = substr($gi->memory_buffer,
-                            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 );
+      $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;
+  $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);
+    $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;
 }

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
 ) {

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
             if ($host->last_ip_addr != $host->external_ip_addr) {
                 row2(tra("External IP address"), $host->external_ip_addr);
             }
-        } else { 
+        } else {
             row2(tra("IP address"), "<a href=show_host_detail.php?hostid=$host->id&ipprivate=1>".tra("Show IP address")."</a>");
         }
         row2(tra("Domain name"), $host->domain_name);

Spacing +16 added lines, -16 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);
@@ -245,7 +245,7 @@ 
 // Given string of the form [BOINC|vers][type|model|count|RAM|driver-vers][vbox|vers],
 // return a human-readable version of the GPU info
 //
-function gpu_desc($x, $detail=true) {
+function gpu_desc($x, $detail = true) {
     $descs = explode("]", $x);
     array_pop($descs);
     $str = "";
@@ -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
 
 ?>

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/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 +1 added lines, -1 removed lines

@@ -556,7 +556,7 @@
 function print_prefs_form(
     $action, $subset, $venue, $user, $prefs, $cols, $error=false,
     $project_error=false
-){
+) {
     if ($action == "add") {
         $script = "add_venue.php";
         $submit_value = tra("Add preferences");

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;