BOINC / boinc

html/inc/db_ops.inc

Doc Comments +26 added lines

@@ -103,6 +103,9 @@ 
 
 // Function prints a description of $table 
 //
+/**
+ * @param integer $which
+ */
 function print_describe_table_onecol($table, $which, $columns) {
     $db = BoincDb::get(true);
     $result = $db->do_query("SELECT * from $table LIMIT 1");
@@ -262,6 +265,10 @@ 
             $this->urlquery .= "&clauses=$clause";
         }
     }
+
+    /**
+     * @param string $name
+     */
     function addeq($name) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -273,6 +280,10 @@ 
             $this->urlquery .= "&$name=".urlencode($value);
         }
     }
+
+    /**
+     * @param string $name
+     */
     function addeq_not_CHOOSE_ALL($name) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -287,6 +298,10 @@ 
             $this->urlquery .= "&$name=".urlencode($value);
         }
     }
+
+    /**
+     * @param string $name
+     */
     function addgt($name) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -298,6 +313,11 @@ 
             $this->urlquery .= "&$name=".urlencode($value);
         }
     }
+
+    /**
+     * @param string $name
+     * @param string $order
+     */
     function addsort($name, $order) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -375,6 +395,9 @@ 
 }
 
 
+/**
+ * @param string $mq
+ */
 function link_results($n, $mq, $query, $clauses) {
     if ($n == '0') { // intentional compare by string
         return "0";
@@ -824,6 +847,9 @@ 
     return number_format($x/86400, 2)." days";
 }
 
+/**
+ * @param integer $x
+ */
 function resource_name($x) {
     switch ($x) {
     case 2: return "CPU";

Indentation +5 added lines, -5 removed lines

@@ -305,9 +305,9 @@ 
             $value=null;
         }
         if (isset($_GET[$order])) {
-             $order = $_GET[$order];
+                $order = $_GET[$order];
         } else {
-             $order = null;
+                $order = null;
         }
         if (strlen($value)) {
             if ($order == 'asc') {
@@ -575,7 +575,7 @@ 
         $res = new StdClass;
         $res->server_state = $ss;
         row2(result_server_state_string($res),
-             link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
+                link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
         );
     }
     echo "</table></td>";
@@ -1026,8 +1026,8 @@ 
 
 function validate_color($validate_state) {
     switch ($validate_state) {
-   case 1: return '33cc33'; // valid, green
-   case 2: return 'ffa500'; // invalid result, orange
+    case 1: return '33cc33'; // valid, green
+    case 2: return 'ffa500'; // invalid result, orange
     }
     return '';
 }

Braces +8 added lines, -6 removed lines

@@ -96,7 +96,9 @@ 
     if (!isset($types)) {
         $types = array();
         $constants = get_defined_constants(true);
-        foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
+        foreach ($constants['mysqli'] as $c => $n) {
+            if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
+        }
     }
     return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown";
 }
@@ -376,13 +378,13 @@ 
 
 
 function link_results($n, $mq, $query, $clauses) {
-    if ($n == '0') { // intentional compare by string
+    if ($n == '0') {
+// intentional compare by string
         return "0";
     } else {
         if(strlen($clauses)) {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>";
-        }
-        else {
+        } else {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&sort_by=mod_time&detail=low\">$n</a>";
         }
         
@@ -392,7 +394,7 @@ 
 // Determines if in stderr_out is an error reported and prints as human readable String
 // @return String A human readable string if error otherwise FALSE
 // @param String $stderr_out the stderr_out value to parse
-function stderr_error_string($stderr_out){
+function stderr_error_string($stderr_out) {
     $y = parse_element($stderr_out, "<error_code>");
     $x = 0;
     if ($y) {
@@ -1146,7 +1148,7 @@ 
         // result has not been received yet, so show report deadline either
         // in green if in the future or in red if in the past.
         $timenow=time();
-        if ($result->report_deadline==0)  {
+        if ($result->report_deadline==0) {
             // not sent -- show create time in purple 
             $received = "<font color=\"9900cc\">". time_str($result->create_time) . "</font>";
         } else if ($result->report_deadline>=$timenow) {

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

@@ -399,7 +399,7 @@ 
         $x = (int)$y;
     }
     if (0<=$x && $x<=9) {
-        return FALSE;
+        return false;
     } else {
         return "$x ".error_code_str($x);
     }
@@ -891,7 +891,7 @@ 
     row("Domain name", $host->domain_name);
     $x = $host->timezone/3600;
     if ($x >= 0) $x="+$x";
-    row("Local Standard Time", "UTC $x hours");
+    row("Local Standard Time", "utc $x hours");
     row("Number of CPUs", $host->p_ncpus);
     row("CPU", "$host->p_vendor $host->p_model");
     row("GFLOPS", number_format($host->p_fpops/1e9, 2));

Spacing +106 added lines, -106 removed lines

@@ -40,27 +40,27 @@ 
 // @return String A user readable DateTime-String in UTC
 // @param Integer $x The mysql-Timestamp to convert
 function mysqltime_str($x) {
-    if(strpos($x,"-")==4) {
+    if (strpos($x, "-") == 4) {
         // Syntax of supplied mysql-timestamp is YYYY-MM-DD HH:MM:SS
-        $year = substr($x,0,4);
-        $month = substr($x,5,2);
-        $day = substr($x,8,2);
-        $hour = substr($x,11,2);
-        $minute = substr($x,14,2);
-        $second = substr($x,17,2);
+        $year = substr($x, 0, 4);
+        $month = substr($x, 5, 2);
+        $day = substr($x, 8, 2);
+        $hour = substr($x, 11, 2);
+        $minute = substr($x, 14, 2);
+        $second = substr($x, 17, 2);
     } else {
         // Syntax of supplied mysql-timestamp is YYYYMMDDHHMMSS
-        $year = substr($x,0,4);
-        $month = substr($x,4,2);
-        $day = substr($x,6,2);
-        $hour = substr($x,8,2);
-        $minute = substr($x,10,2);
-        $second = substr($x,12,2);
+        $year = substr($x, 0, 4);
+        $month = substr($x, 4, 2);
+        $day = substr($x, 6, 2);
+        $hour = substr($x, 8, 2);
+        $minute = substr($x, 10, 2);
+        $second = substr($x, 12, 2);
     
     }
     //make a Unix-Timestamp
     // echo "Time string is " . "$x";
-    $time = mktime($hour,$minute,$second,$month,$day,$year);
+    $time = mktime($hour, $minute, $second, $month, $day, $year);
     return time_str($time);
 }
 
@@ -98,7 +98,7 @@ 
         $constants = get_defined_constants(true);
         foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
     }
-    return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown";
+    return array_key_exists($type_id, $types) ? strtolower($types[$type_id]) : "unknown";
 }
 
 // Function prints a description of $table 
@@ -108,38 +108,38 @@ 
     $result = $db->do_query("SELECT * from $table LIMIT 1");
     $fields = $result->field_count;
 
-    $avgnum=(int)($fields/$columns);
-    if ($avgnum*$columns<$fields) {
+    $avgnum = (int)($fields/$columns);
+    if ($avgnum*$columns < $fields) {
         $avgnum++;
     }
 
-    $actualcolumns=0;
-    while ($avgnum*$actualcolumns<$fields) {
+    $actualcolumns = 0;
+    while ($avgnum*$actualcolumns < $fields) {
         $actualcolumns++;
     }
 
-    if ($which>$actualcolumns) {
+    if ($which > $actualcolumns) {
         return 0;
     }
 
-    $bot=($which-1)*$avgnum;
-    $top=$which*$avgnum;
+    $bot = ($which - 1)*$avgnum;
+    $top = $which*$avgnum;
 
-    $width=100.0/$actualcolumns;
+    $width = 100.0/$actualcolumns;
 
     //  echo "<td><table border='2' width=\"$width%\">\n";
     echo "<td><table border=\"1\" width=\"100%\">\n";
     echo "<tr><th align=\"left\">NAME</th><th align=\"left\">Type</th><th align=\"left\">Bytes</th>\n";
-    for ($count=$bot; $count<$top; $count++) {
-        if ($count<$fields) {
+    for ($count = $bot; $count < $top; $count++) {
+        if ($count < $fields) {
             $x = $result->fetch_field_direct($count);
             $name = $x->name;
             $type = mysql_fieldtype_str($x->type);
             $length = $x->length;
         } else {
-            $name="<br/> ";
-            $type="<br/>";
-            $length="<br/>";
+            $name = "<br/> ";
+            $type = "<br/>";
+            $length = "<br/>";
         }
         echo "\t<tr><td><b>$name</b></td><td>$type</td><td>$length</td></tr>\n";
     }
@@ -152,7 +152,7 @@ 
     // Number of columns for showing table description
     echo "<h2>Description of <b>$table</b> table fields:</h2>\n";
     echo "<table border=\"0\" width=\"100%\">\n\t<tr>";
-    for ($i=1; $i<=$how_many_columns; $i++) {
+    for ($i = 1; $i <= $how_many_columns; $i++) {
         print_describe_table_onecol($table, $i, $how_many_columns);
     }
     echo "\t</tr>\n</table>\n";
@@ -170,10 +170,10 @@ 
 }
 
 function print_query_field() {
-    $currenttime=time();
-    $hourago=$currenttime-3600;
-    $dayago=$currenttime-24*3600;
-    $weekago=$currenttime-7*24*3600;
+    $currenttime = time();
+    $hourago = $currenttime - 3600;
+    $dayago = $currenttime - 24*3600;
+    $weekago = $currenttime - 7*24*3600;
     echo "
         <tr>
         <td align=\"right\">Additional clauses</td>
@@ -197,11 +197,11 @@ 
     }
 }
 
-function append_sql_query($original,$addition,$first) {
+function append_sql_query($original, $addition, $first) {
     if ($first == 1) {
-        return $original . " where " . $addition;
+        return $original." where ".$addition;
     } else {
-        return $original . " and " . $addition;
+        return $original." and ".$addition;
     }
 }
 
@@ -302,7 +302,7 @@ 
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
         } else {
-            $value=null;
+            $value = null;
         }
         if (isset($_GET[$order])) {
              $order = $_GET[$order];
@@ -343,7 +343,7 @@ 
     }
 
     function get_url($base = "db_action.php") {
-        $s = $base . "?table=$this->table$this->urlquery";
+        $s = $base."?table=$this->table$this->urlquery";
         return $s;
     }
 
@@ -358,7 +358,7 @@ 
         $this->addeq('app_version_id');
         $this->addeq('exit_status');
         if (isset($_GET['nsecs'])) {
-            $_GET['mod_time'] = date("YmdHis",time() - $_GET['nsecs']);
+            $_GET['mod_time'] = date("YmdHis", time() - $_GET['nsecs']);
         }
         $this->addgt('mod_time');
         $this->addeq_not_CHOOSE_ALL('server_state');
@@ -379,7 +379,7 @@ 
     if ($n == '0') { // intentional compare by string
         return "0";
     } else {
-        if(strlen($clauses)) {
+        if (strlen($clauses)) {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>";
         }
         else {
@@ -392,13 +392,13 @@ 
 // Determines if in stderr_out is an error reported and prints as human readable String
 // @return String A human readable string if error otherwise FALSE
 // @param String $stderr_out the stderr_out value to parse
-function stderr_error_string($stderr_out){
+function stderr_error_string($stderr_out) {
     $y = parse_element($stderr_out, "<error_code>");
     $x = 0;
     if ($y) {
         $x = (int)$y;
     }
-    if (0<=$x && $x<=9) {
+    if (0 <= $x && $x <= 9) {
         return FALSE;
     } else {
         return "$x ".error_code_str($x);
@@ -407,8 +407,8 @@ 
 
 function show_result_summary() {
 
-    $ntotal =0;     // TODO: how to count $result?
-    $nvalid = 0;    // for SUCCESS results
+    $ntotal = 0; // TODO: how to count $result?
+    $nvalid = 0; // for SUCCESS results
     $ninvalid = 0;
     $nfile_deleted = 0;
 
@@ -416,20 +416,20 @@ 
     $outcome = array();
     $client_state = array();
 
-    for ($ss=1; $ss<6; $ss++) {
+    for ($ss = 1; $ss < 6; $ss++) {
         $server_state[$ss] = 0;
     }
-    for ($ro=0; $ro<8; $ro++) {
+    for ($ro = 0; $ro < 8; $ro++) {
         $outcome[$ro] = 0;
     }
-    for ($cs=1; $cs<7; $cs++) {
+    for ($cs = 1; $cs < 7; $cs++) {
         $client_state[$cs] = 0;
     }
-    for ($fds=0; $fds<4; $fds++) {
+    for ($fds = 0; $fds < 4; $fds++) {
         $delete_state[$fds] = 0;
     }
-    for ($vs=0; $vs<NVALIDATE_STATES; $vs++) {
-        $validate_state[$vs]=0;
+    for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) {
+        $validate_state[$vs] = 0;
     }
 
     $_GET['table'] = 'result';
@@ -504,7 +504,7 @@ 
         //
         $delay = parse_config(get_config(), "<delete_delay_hours>");
         if ($delay) {
-            $start2 = $start - $delay*3600;;
+            $start2 = $start - $delay*3600; ;
             $main_query .= " and ((file_delete_state>1 and mod_time>FROM_UNIXTIME($start2)) or (mod_time>FROM_UNIXTIME($start)))";
         } else {
             $main_query .= " and mod_time > FROM_UNIXTIME($start)";
@@ -563,19 +563,19 @@ 
 
     echo "<table>";
     echo "<tr valign=\"top\">";
-    echo "<td><h2>" . link_results("$ntotal results", $urlquery, '', '') . "</h2></td>";
-    echo "<td><h2>" . link_results("'Over' results", $urlquery, "server_state=5", '') . "</h2></td>";
-    echo "<td><h2>" . link_results("'Success' results", $urlquery, "outcome=1", '') . "</h2></td>";
-    echo "<td><h2>" . link_results("'Client error' results", $urlquery, "outcome=3", '') . "</h2></td>";
+    echo "<td><h2>".link_results("$ntotal results", $urlquery, '', '')."</h2></td>";
+    echo "<td><h2>".link_results("'Over' results", $urlquery, "server_state=5", '')."</h2></td>";
+    echo "<td><h2>".link_results("'Success' results", $urlquery, "outcome=1", '')."</h2></td>";
+    echo "<td><h2>".link_results("'Client error' results", $urlquery, "outcome=3", '')."</h2></td>";
     echo "</tr>";
     echo "<tr valign=\"top\">";
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Server state</th><th># results</th></tr>\n";
-    for ($ss=1; $ss<6; $ss++) {
+    for ($ss = 1; $ss < 6; $ss++) {
         $res = new StdClass;
         $res->server_state = $ss;
         row2(result_server_state_string($res),
-             link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
+             link_results("$server_state[$ss]", $urlquery, "server_state=$ss", '')
         );
     }
     echo "</table></td>";
@@ -583,11 +583,11 @@ 
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Outcome</th><th># results</th></tr>\n";
 
-    for ($ro=0; $ro<8; $ro++) {
+    for ($ro = 0; $ro < 8; $ro++) {
         $res = new StdClass;
         $res->outcome = $ro;
         $res->exit_status = 0;
-        c_row2($outcome[$ro]?outcome_color($ro):'', result_outcome_string($res),
+        c_row2($outcome[$ro] ? outcome_color($ro) : '', result_outcome_string($res),
             link_results("$outcome[$ro]", $urlquery, "outcome=$ro", '')
         );
     }
@@ -595,18 +595,18 @@ 
 
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Validate state</th><th># results</th></tr>\n";
-    for ($vs=0; $vs<NVALIDATE_STATES; $vs++) {
+    for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) {
         $res = new StdClass;
         $res->validate_state = $vs;
         $res->exit_status = 0;
-        c_row2($validate_state[$vs]?validate_color($vs):'', validate_state_str($res),
+        c_row2($validate_state[$vs] ? validate_color($vs) : '', validate_state_str($res),
         link_results("$validate_state[$vs]", $urlquery, "validate_state=$vs", "outcome=1"));
     }
     echo "</table>";
     echo "<table border=2 cellpadding=4>\n";
     echo "<tr><th>File Delete state</th><th># results</th></tr>\n";
   
-    for ($fds=0; $fds<4; $fds++) {
+    for ($fds = 0; $fds < 4; $fds++) {
         row2(file_delete_state_str($fds),
         link_results("$file_delete[$fds]", $urlquery, "outcome=1", "file_delete_state=$fds"));
     }
@@ -616,7 +616,7 @@ 
 
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Client state</th><th># results</th></tr>\n";
-    for ($cs=1; $cs<7; $cs++) {
+    for ($cs = 1; $cs < 7; $cs++) {
         $res = new StdClass;
         $res->client_state = $cs;
         $res->exit_status = 0;
@@ -634,9 +634,9 @@ 
         <select name=\"server_state\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
     ";
-    for ($i=1; $i<6; $i++) {
+    for ($i = 1; $i < 6; $i++) {
         $res = new StdClass;
-        $res->server_state=$i;
+        $res->server_state = $i;
         echo "<option value=\"$i\"> "."[$i]&nbsp;&nbsp;".'   '.result_server_state_string($res)."</option>\n";
     }
     echo "</select>\n";
@@ -647,7 +647,7 @@ 
         <select name=\"outcome\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
     ";
-    for ($i=0; $i<8; $i++) {
+    for ($i = 0; $i < 8; $i++) {
         $res = new StdClass;
         $res->outcome = $i;
         $res->exit_status = 0;
@@ -661,7 +661,7 @@ 
         <select name=\"validate_state\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
         ";
-    for ($vs=0; $vs<NVALIDATE_STATES; $vs++) {
+    for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) {
         $res = new StdClass;
         $res->validate_state = $vs;
         $res->exit_status = 0;
@@ -675,7 +675,7 @@ 
         <select name=\"client_state\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
     ";
-    for ($i=0; $i<7; $i++) {
+    for ($i = 0; $i < 7; $i++) {
         $res = new StdClass;
         $res->client_state = $i;
         $res->exit_status = 0;
@@ -712,7 +712,7 @@ 
 }
 
 function table_title($table) {
-    switch($table) {
+    switch ($table) {
     case "platform": return "Platforms";
     case "app": return "Applications";
     case "app_version": return "Application Versions";
@@ -732,7 +732,7 @@ 
     row("Created", time_str($platform->create_time));
     row("Name", $platform->name);
     row("User friendly name", $platform->user_friendly_name);
-    row("","<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>");
+    row("", "<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>");
     end_table();
 }
 
@@ -744,8 +744,8 @@ 
     row("User-friendly name", $app->user_friendly_name);
     row("Deprecated", $app->deprecated);
     row("Homogeneous redundancy", $app->homogeneous_redundancy);
-    row("","<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>");
-    row("","<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>");
+    row("", "<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>");
+    row("", "<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>");
     end_table();
 }
 
@@ -753,9 +753,9 @@ 
     start_table();
     row("ID", $app_version->id);
     row("Created", time_str($app_version->create_time));
-    row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">" . app_name_by_id($app_version->appid) . "</a>");
+    row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">".app_name_by_id($app_version->appid)."</a>");
     row("Version num", $app_version->version_num);
-    row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">" . platform_name_by_id($app_version->platformid) . "</a>" );
+    row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">".platform_name_by_id($app_version->platformid)."</a>");
     row("Plan Class", $app_version->plan_class);
     row("XML doc", "<pre>".htmlspecialchars($app_version->xml_doc)."</pre>");
     row("min_core_version", $app_version->min_core_version);
@@ -890,7 +890,7 @@ 
     row("External IP address", "$host->external_ip_addr<br>");
     row("Domain name", $host->domain_name);
     $x = $host->timezone/3600;
-    if ($x >= 0) $x="+$x";
+    if ($x >= 0) $x = "+$x";
     row("Local Standard Time", "UTC $x hours");
     row("Number of CPUs", $host->p_ncpus);
     row("CPU", "$host->p_vendor $host->p_model");
@@ -938,10 +938,10 @@ 
     start_table();
     row("Created", time_str($wu->create_time));
     row("Transition Time", time_str($wu->transition_time));
-    row("Last time modified",mysqltime_str($wu->mod_time));
+    row("Last time modified", mysqltime_str($wu->mod_time));
     row("Name", $wu->name);
     row("XML doc", "<pre>".htmlspecialchars($wu->xml_doc)."</pre>");
-    row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">" . app_name_by_id($wu->appid) . " [".$wu->appid."]</a>");
+    row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">".app_name_by_id($wu->appid)." [".$wu->appid."]</a>");
     row("Batch", $wu->batch);
     $x = number_format($wu->rsc_fpops_est/1e9, 2);
     row("Estimated FP Operations", "$x GFLOPS");
@@ -953,12 +953,12 @@ 
     $x = $wu->rsc_disk_bound/(1024*1024);
     $y = number_format($x, 2);
     row("Max Disk Usage", "$y MB");
-    row("Need validate?", ($wu->need_validate?"yes [":"no [").$wu->need_validate."]");
+    row("Need validate?", ($wu->need_validate ? "yes [" : "no [").$wu->need_validate."]");
     row("Canonical resultid",
             "<a href=\"db_action.php?table=result&id=$wu->canonical_resultid\">".$wu->canonical_resultid."</a>");
     row("Canonical credit", $wu->canonical_credit);
     //row("Timeout check time", time_str($wu->timeout_check_time));
-    row("Delay bound", "$wu->delay_bound" . " =  " . time_diff($wu->delay_bound) );
+    row("Delay bound", "$wu->delay_bound"." =  ".time_diff($wu->delay_bound));
     row("Error mask", wu_error_mask_str($wu->error_mask));
     row("File delete state", file_delete_state_str($wu->file_delete_state)." [".$wu->file_delete_state."]");
     row("Assimilation state", assimilate_state_str($wu->assimilate_state)." [".$wu->assimilate_state."]");
@@ -968,7 +968,7 @@ 
     row("max error results", $wu->max_error_results);
     row("max total results", $wu->max_total_results);
     row("max success results", $wu->max_success_results);
-    row("result template file",$wu->result_template_file);
+    row("result template file", $wu->result_template_file);
     row("hr_class", $wu->hr_class);
     row("opaque", $wu->opaque);
     row("Priority", $wu->priority);
@@ -998,7 +998,7 @@ 
         $cr = "none";
     }
     $wu_link = "<a href=\"db_action.php?table=workunit&id=".$wu->id."&detail=high\">".$wu->id."</a>";
-    $cr = $cr. " <a href=\"db_action.php?table=result&workunitid=$wu->id&detail=low\">all</a>";
+    $cr = $cr." <a href=\"db_action.php?table=result&workunitid=$wu->id&detail=low\">all</a>";
     $e = wu_error_mask_str($wu->error_mask);
     $f = file_delete_state_str($wu->file_delete_state);
     $a = assimilate_state_str($wu->assimilate_state);
@@ -1033,7 +1033,7 @@ 
 }
 
 function outcome_color($outcome) {
-    switch($outcome) {
+    switch ($outcome) {
     case 0: return '9900cc'; // "Init", purple 
     case 1: return '33cc33'; // "Success", green
     case 3: return 'ff3333'; // "Client error", red
@@ -1060,18 +1060,18 @@ 
     row("Sent", time_str($result->sent_time));
     row("Report deadline", time_str($result->report_deadline));
     row("Received", time_str($result->received_time));
-    row("Last time modified",mysqltime_str($result->mod_time));
+    row("Last time modified", mysqltime_str($result->mod_time));
     row("Name", $result->name);
-    row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">" . wu_name_by_id($result->workunitid) . "</a> [$result->workunitid]" );
+    row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">".wu_name_by_id($result->workunitid)."</a> [$result->workunitid]");
     row("Server state", result_server_state_string($result)." [$result->server_state]");
     row("Outcome", result_outcome_string($result)." [$result->outcome]");
     row("Client state", result_client_state_string($result)." [$result->client_state]");
     row("Exit status", exit_status_string($result->exit_status));
-    row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">" . host_name_by_id($result->hostid) . "</a> [$result->hostid]");
-    row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">" . user_name_by_id($result->userid) . "</a> [$result->userid]");
+    row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">".host_name_by_id($result->hostid)."</a> [$result->hostid]");
+    row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">".user_name_by_id($result->userid)."</a> [$result->userid]");
     row("CPU time", $result->cpu_time);
     row("Elapsed time", $result->elapsed_time);
-    if($error=stderr_error_string($result->stderr_out)) {
+    if ($error = stderr_error_string($result->stderr_out)) {
         row("error in stderr out", $error);
     }
     row("Batch", $result->batch);
@@ -1088,16 +1088,16 @@ 
     row("App version", $x1.app_version_string($result).$x2);
     row("App version ID", $result->app_version_id);
     row("Estimated GFLOPS", number_format($result->flops_estimate/1e9, 2));
-    row("Random",$result->random);
-    row("Opaque",$result->opaque);
-    row("Teamid",$result->teamid);
-    row("Priority",$result->priority);
+    row("Random", $result->random);
+    row("Opaque", $result->opaque);
+    row("Teamid", $result->teamid);
+    row("Priority", $result->priority);
     row("XML doc in", "<pre>".htmlspecialchars($result->xml_doc_in)."</pre>");
     row("XML doc out", "<pre>".htmlspecialchars($result->xml_doc_out)."</pre>");
     row("stderr out", "<pre>"
         .htmlspecialchars(
             $result->stderr_out,
-            ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
+            ENT_QUOTES|(defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0),
             'utf-8'
         )
         ."</pre>"
@@ -1145,23 +1145,23 @@ 
     } else {
         // result has not been received yet, so show report deadline either
         // in green if in the future or in red if in the past.
-        $timenow=time();
-        if ($result->report_deadline==0)  {
+        $timenow = time();
+        if ($result->report_deadline == 0) {
             // not sent -- show create time in purple 
-            $received = "<font color=\"9900cc\">". time_str($result->create_time) . "</font>";
-        } else if ($result->report_deadline>=$timenow) {
+            $received = "<font color=\"9900cc\">".time_str($result->create_time)."</font>";
+        } else if ($result->report_deadline >= $timenow) {
             // overdue -- show deadline in red
-            $received = "<font color=\"#33cc33\">". time_str($result->report_deadline) . "</font>";
+            $received = "<font color=\"#33cc33\">".time_str($result->report_deadline)."</font>";
         } else {
             // in progress and not overdue -- show deadline in green
-            $received = "<font color=\"#ff3333\">". time_str($result->report_deadline) . "</font>";
+            $received = "<font color=\"#ff3333\">".time_str($result->report_deadline)."</font>";
         }
     }
     $version = app_version_string($result)." (<a href=\"db_action.php?table=app_version&id=$result->app_version_id\">$result->app_version_id</a>)";
     $outcome_color = outcome_color($result->outcome);
     $validate_color = validate_color($result->validate_state);
     $host_user = host_user_link($result->hostid);
-    $cpu_hours = sprintf("%.1f",$result->cpu_time / 3600);
+    $cpu_hours = sprintf("%.1f", $result->cpu_time/3600);
     $granted_credit = "<a href=credit.php?wu_id=$result->workunitid>".credit_str($result->granted_credit)."</a>";
     $delete_state = file_delete_state_str($result->file_delete_state);
 
@@ -1189,7 +1189,7 @@ 
     row("ID", $user->id);
     row("Created", time_str($user->create_time));
     row("Name", $user->name);
-    if(!in_rops()) {
+    if (!in_rops()) {
         row("Authenticator", $user->authenticator);
     }
     row("Email address", $user->email_addr);
@@ -1202,7 +1202,7 @@ 
     row("Default venue", $user->venue);
     row("Hosts", "<a href=\"db_action.php?table=host&userid=$user->id&detail=low\">click</a>");
     row("Cross project ID", $user->cross_project_id);
-    if(!in_rops()) {
+    if (!in_rops()) {
         row("Password Hash", $user->passwd_hash);
     }
     row("Donated", $user->donated);
@@ -1253,7 +1253,7 @@ 
     echo "</table></td>";
     echo "<td><table border=\"2\">\n";
     echo "<tr><th>User</th><th># posts</th></tr>\n";
-    for ($p=1; $p<=10; $p++) {
+    for ($p = 1; $p <= 10; $p++) {
         row2_plain(user_links_ops($top10poster[$p]), $top10poster[$p]->posts);
     }
     echo "</table></td>";
@@ -1292,10 +1292,10 @@ 
 function show_team($team) {
     start_table();
     row("ID", $team->id);
-    row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">" . user_name_by_id($team->userid) . "</a>");
+    row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">".user_name_by_id($team->userid)."</a>");
     row("Name", $team->name);
-    row("Name (HTML Formatted)", "<pre>" . htmlspecialchars($team->name_html) . "</pre>" );
-    row("Url", "<a href=\"http://$team->url\">" . $team->url . "</a>");
+    row("Name (HTML Formatted)", "<pre>".htmlspecialchars($team->name_html)."</pre>");
+    row("Url", "<a href=\"http://$team->url\">".$team->url."</a>");
     row("Type", team_type_string($team->type));
     row("Description", $team->description);
     row("", "<a href=\"db_action.php?table=user&teamid=$team->id\">List All Members</a>");
@@ -1338,7 +1338,7 @@ 
     if (!strlen($host->domain_name) && !strlen($host->last_ip_addr)) {
         return "(blank)";
     } else {
-        return $host->domain_name . " (" . $host->last_ip_addr . ")";
+        return $host->domain_name." (".$host->last_ip_addr.")";
     }
 }
 

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

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

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

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 $";
 ?>