BOINC / boinc

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

html/inc/prefs.inc

Doc Comments +11 added lines

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

Spacing +15 added lines, -15 removed lines

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

Braces +1 added lines, -1 removed lines

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

html/inc/prefs_project.inc

Doc Comments +3 added lines

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

Spacing +18 added lines, -18 removed lines

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

html/inc/prefs_util.inc

Doc Comments +17 added lines

@@ -440,6 +440,10 @@ 
     }
 }
 
+/**
+ * @param string $id
+ * @param string $d
+ */
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
@@ -533,6 +537,9 @@ 
 
 // display preference subsets as columns
 //
+/**
+ * @param string $x
+ */
 function row_top($x) {
     echo "<tr class=\"bg-primary\"><th width=35%>$x</th>";
     echo "<th ><b>".tra("Default")."</b></th>
@@ -545,6 +552,13 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
+/**
+ * @param string $pre
+ * @param string $item
+ * @param string $post
+ * @param string $type
+ * @param string $tooltip
+ */
 function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
@@ -599,6 +613,9 @@ 
 //
 // row_links - Display Edit/Add/Remove links for all venues in 1 row
 //
+/**
+ * @param string $subset
+ */
 function row_links($subset, $prefs) {
     global $g_logged_in_user;
     $tokens = url_tokens($g_logged_in_user->authenticator);

Spacing +26 added lines, -26 removed lines

@@ -40,9 +40,9 @@ 
 }
 
 abstract class PREF {
-    public $desc;       // short description
-    public $tooltip;    // longer description, shown as tooltip
-    public $tag;        // the pref's primary XML tag
+    public $desc; // short description
+    public $tooltip; // longer description, shown as tooltip
+    public $tag; // the pref's primary XML tag
     function __construct($desc, $tooltip, $tag) {
         $this->desc = $desc;
         $this->tooltip = $tooltip;
@@ -120,15 +120,15 @@ 
 
 class PREF_BOOL extends PREF {
     public $default;
-    public $invert;     // show to user in opposite sense
-    function __construct($desc, $tooltip, $tag, $default, $invert=false) {
+    public $invert; // show to user in opposite sense
+    function __construct($desc, $tooltip, $tag, $default, $invert = false) {
         $this->default = $default;
         $this->invert = $invert;
         parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
-        $v = $this->invert?!$prefs->$tag:$prefs->$tag;
+        $v = $this->invert ? !$prefs->$tag : $prefs->$tag;
         echo "<td>".readonly_checkbox($v)."</td>";
     }
     function show_form($prefs, $error) {
@@ -140,7 +140,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -153,7 +153,7 @@ 
     function xml_string($prefs) {
         $tag = $this->tag;
         return "<$tag>"
-            .($prefs->$tag?"1":"0")
+            .($prefs->$tag ? "1" : "0")
             ."</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -179,7 +179,7 @@ 
         // this is the value if they check the box
     public $scale;
 
-    function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) {
+    function __construct($suffix, $min, $max, $default, $scale = 1, $default2 = 0) {
         $this->suffix = " $suffix";
         $this->min = $min;
         $this->max = $max;
@@ -198,7 +198,7 @@ 
         $v .= "$this->suffix ";
         return $v;
     }
-    function form_str($tag, $v, $had_error, $disabled=false, $id=null) {
+    function form_str($tag, $v, $had_error, $disabled = false, $id = null) {
         if (is_numeric($v)) {
             $v /= $this->scale;
             if (!$had_error && ($v < $this->min || $v > $this->max)) {
@@ -206,7 +206,7 @@ 
             }
         }
         if ($disabled) $v = "";
-        $i = $id?"id=\"$id\"":"";
+        $i = $id ? "id=\"$id\"" : "";
         return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> &nbsp; $this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
@@ -243,7 +243,7 @@ 
     function show_form($prefs, $error) {
         $tag = $this->tag;
         $had_error = isset($error->$tag);
-        $attrs = $had_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
+        $attrs = $had_error ? VALUE_ATTRS_ERR : VALUE_ATTRS;
         echo "<td $attrs>"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error)
             ."</td>
@@ -324,13 +324,13 @@ 
     function show_form($prefs, $error) {
         $tag = $this->tag;
         $had_error = isset($error->$tag);
-        $attrs = $had_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
+        $attrs = $had_error ? VALUE_ATTRS_ERR : VALUE_ATTRS;
         $checkbox_id = $this->tag."_cb";
         $text_id = $this->tag;
         $default = $this->num_spec->get_default();
         $val = $prefs->$tag;
-        $c = $val?"checked":"";
-        $d = $val?"":"disabled";
+        $c = $val ? "checked" : "";
+        $d = $val ? "" : "disabled";
         echo "<td $attrs>"
             ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c> &nbsp;"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id)
@@ -387,7 +387,7 @@ 
         $tag = $this->tag;
         $tag2 = $this->tag2;
         $had_error = isset($error->$tag) || isset($error->$tag2);
-        $attrs = $had_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
+        $attrs = $had_error ? VALUE_ATTRS_ERR : VALUE_ATTRS;
         $checkbox_id = $this->tag."_cb";
         $t1_id = $this->tag."_t1";
         $t2_id = $this->tag."_t2";
@@ -443,8 +443,8 @@ 
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
-    for ($i=0; $i<24; $i++) {
-        $sel = ($x == $i)?"selected":"";
+    for ($i = 0; $i < 24; $i++) {
+        $sel = ($x == $i) ? "selected" : "";
         $s .= "<option value=$i $sel> $i:00";
     }
     $s .= "</select>\n";
@@ -545,7 +545,7 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
-function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
+function row_defs($pre, $item, $post, $type, $prefs, $tooltip = null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
     $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
@@ -557,10 +557,10 @@ 
         echo "<tr>";
     }
     echo "<td ".NAME_ATTRS.">$pre</td>";
-    row_field($gen,  $type);
-    row_field($hom,  $type);
+    row_field($gen, $type);
+    row_field($hom, $type);
     row_field($schl, $type);
-    row_field($wrk,  $type);
+    row_field($wrk, $type);
     echo "<td align=left>$post</td></tr>\n";
 }
 
@@ -570,16 +570,16 @@ 
 function row_field($value, $type) {
     echo "<td>";
     $type = $value === "--" ? "--" : $type;
-    switch($type) {
+    switch ($type) {
     case "yesno":
-        echo $value ?tra("yes"):tra("no");
+        echo $value ? tra("yes") : tra("no");
         break;
     case "noyes":
-        echo $value ?tra("no"):tra("yes");
+        echo $value ? tra("no") : tra("yes");
         break;
     case "limit":
         $x = max_bytes_display_mode($value);
-        $y = "$x " . BYTE_ABBR;
+        $y = "$x ".BYTE_ABBR;
         echo $x ? "$y" : tra("no limit");
         break;
     case "minutes":

html/inc/profile.inc

Doc Comments +5 added lines

@@ -114,6 +114,11 @@
     return BoincProfile::delete_aux("userid=$user->id");
 }
 
+/**
+ * @param resource $image
+ * @param integer $targetWidth
+ * @param integer $targetHeight
+ */
 function scale_image(
     $image, $origWidth, $origHeight, $targetWidth, $targetHeight
 ) {

Indentation +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
     $min_credit = parse_config(get_config(), "<profile_min_credit>");
     if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) {
         error_page(
-           tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
+            tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
         );
     }
     if (is_banished($user)) {

Spacing +10 added lines, -10 removed lines

@@ -71,7 +71,7 @@ 
     if (!$user->has_profile) return null;
     $profile = BoincProfile::lookup("userid=$user->id");
     if (!$profile->has_picture) return null;
-    if (profile_screening() && $profile->verification!=1) return null;
+    if (profile_screening() && $profile->verification != 1) return null;
     return profile_thumb_url($user->id);
 }
 
@@ -125,18 +125,18 @@ 
         return $image;
     }
 
-    ($origWidth > $origHeight)? $scalar = ($origWidth / $targetWidth) : $scalar = ($origHeight / $targetHeight);
+    ($origWidth > $origHeight) ? $scalar = ($origWidth/$targetWidth) : $scalar = ($origHeight/$targetHeight);
 
     if ($scalar != 0) {
-        $destWidth = $origWidth / $scalar;
-        $destHeight = $origHeight / $scalar;
+        $destWidth = $origWidth/$scalar;
+        $destHeight = $origHeight/$scalar;
     } else {
         $destWidth = $origWidth;
         $destHeight = $origHeight;
     }
 
     $gd_info = gd_info();
-    $newGD = (strstr($gd_info["GD Version"], "2.0")!="");
+    $newGD = (strstr($gd_info["GD Version"], "2.0") != "");
     if ($newGD) {
         // If you are using a modern PHP/GD installation that does
         // 'truecolor' images, this is what's needed.
@@ -179,7 +179,7 @@ 
         $options->htmlitems = false;
         $temp = output_transform($profile->response1, $options);
         $temp = sanitize_tags($temp);
-        $description = "(\"" . sub_sentence($temp, ' ', MAX_DESC_LENGTH, true) . "\")";
+        $description = "(\"".sub_sentence($temp, ' ', MAX_DESC_LENGTH, true)."\")";
 
     }
 
@@ -189,7 +189,7 @@ 
 
 function check_whether_to_show_profile($user, $logged_in_user) {
     $min_credit = parse_config(get_config(), "<profile_min_credit>");
-    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) {
+    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit) {
         error_page(
            tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
         );
@@ -227,7 +227,7 @@ 
     //
     $show_picture = $profile->has_picture;
     if (profile_screening()) {
-        if (!$screen_mode && !$can_edit && $profile->verification!=1) {
+        if (!$screen_mode && !$can_edit && $profile->verification != 1) {
             $show_picture = false;
         }
     }
@@ -243,7 +243,7 @@ 
     // yet verified.  This will tell them if other users can't view it yet, or
     // if there is a problem with it and they need to replace it.
     //
-    if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification!=1) {
+    if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification != 1) {
         row1(offensive_profile_warning($profile->verification));
     }
 
@@ -276,6 +276,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/result.inc

Doc Comments +15 added lines

@@ -53,6 +53,9 @@ 
     return $platforms[$id];
 }
 
+/**
+ * @param string $rsc_name
+ */
 function anon_platform_string($result, $rsc_name=null) {
     $app = get_app($result->appid);
     $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
@@ -92,6 +95,9 @@ 
     return "$n v$v $c<br>$platform->name";
 }
 
+/**
+ * @param string $string_to_show
+ */
 function result_granted_credit_string($result, $string_to_show) {
     if ($result->server_state == RESULT_SERVER_STATE_IN_PROGRESS && $result->granted_credit > 0) {
         return $string_to_show;
@@ -356,6 +362,10 @@ 
     return "results.php?$c&amp;offset=$o&amp;show_names=$sn&amp;state=$st&amp;appid=$appid";
 }
 
+/**
+ * @param boolean $show_wu_link
+ * @param boolean $show_host_link
+ */
 function result_table_start($show_wu_link, $show_host_link, $info) {
     start_table('table-striped');
     $x = array();
@@ -417,6 +427,11 @@ 
     return false;
 }
 
+/**
+ * @param boolean $show_wu_link
+ * @param boolean $show_host_link
+ * @param boolean $show_name
+ */
 function show_result_row($result, $show_wu_link, $show_host_link, $show_name) {
     $s = time_str($result->sent_time);
     // if result has been reported, show the received time,

Spacing +33 added lines, -33 removed lines

@@ -53,9 +53,9 @@ 
     return $platforms[$id];
 }
 
-function anon_platform_string($result, $rsc_name=null) {
+function anon_platform_string($result, $rsc_name = null) {
     $app = get_app($result->appid);
-    $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
+    $n = $app->user_friendly_name."<br>".tra("Anonymous platform");
     if ($rsc_name) {
         $n .= " ($rsc_name)";
     }
@@ -97,7 +97,7 @@ 
         return $string_to_show;
     }
     if ($result->server_state <> RESULT_SERVER_STATE_OVER) return "---";
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_SUCCESS:
         switch ($result->validate_state) {
         case VALIDATE_STATE_INIT:
@@ -212,7 +212,7 @@ 
             ) {
                 return tra("Not started by deadline - canceled");
             }
-            switch($result->client_state) {
+            switch ($result->client_state) {
             case RESULT_FILES_DOWNLOADING: return tra("Error while downloading");
             case RESULT_FILES_DOWNLOADED:
             case RESULT_COMPUTE_ERROR: return tra("Error while computing");
@@ -231,7 +231,7 @@ 
 }
 
 function result_server_state_string($result) {
-    switch($result->server_state) {
+    switch ($result->server_state) {
     case RESULT_SERVER_STATE_INACTIVE: return tra("Inactive");
     case RESULT_SERVER_STATE_UNSENT: return tra("Unsent");
     case RESULT_SERVER_STATE_IN_PROGRESS: return tra("In progress");
@@ -241,7 +241,7 @@ 
 }
 
 function result_outcome_string($result) {
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_INIT: return "---";
     case RESULT_OUTCOME_SUCCESS: return tra("Success");
     case RESULT_OUTCOME_COULDNT_SEND: return tra("Couldn't send");
@@ -259,7 +259,7 @@ 
 }
 
 function result_client_state_string($result) {
-    switch($result->client_state) {
+    switch ($result->client_state) {
     case RESULT_NEW: return tra("New");
     case RESULT_FILES_DOWNLOADING: return tra("Downloading");
     case RESULT_FILES_DOWNLOADED: return tra("Processing");
@@ -277,7 +277,7 @@ 
 }
 
 function validate_state_str($result) {
-    switch($result->validate_state) {
+    switch ($result->validate_state) {
     case VALIDATE_STATE_INIT: return tra("Initial");
     case VALIDATE_STATE_VALID: return tra("Valid");
     case VALIDATE_STATE_INVALID:
@@ -293,7 +293,7 @@ 
 }
 
 function assimilate_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case ASSIMILATE_INIT: return "Initial";
     case ASSIMILATE_READY: return "Ready to assimilate";
     case ASSIMILATE_DONE: return "Assimilated";
@@ -302,7 +302,7 @@ 
 }
 
 function file_delete_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case FILE_DELETE_INIT: return "Initial";
     case FILE_DELETE_READY: return "Ready to delete";
     case FILE_DELETE_DONE: return "Deleted";
@@ -312,27 +312,27 @@ 
 }
 function wu_error_mask_str($s) {
     $x = "";
-    if ($s & WU_ERROR_COULDNT_SEND_RESULT) {
+    if ($s&WU_ERROR_COULDNT_SEND_RESULT) {
         $x = $x." ".tra("Couldn't send result");
         $s -= WU_ERROR_COULDNT_SEND_RESULT;
     }
-    if ($s & WU_ERROR_TOO_MANY_ERROR_RESULTS) {
+    if ($s&WU_ERROR_TOO_MANY_ERROR_RESULTS) {
         $x = $x." ".tra("Too many errors (may have bug)");
         $s -= WU_ERROR_TOO_MANY_ERROR_RESULTS;
     }
-    if ($s & WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
+    if ($s&WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
         $x = $x." ".tra("Too many results (may be nondeterministic)");
         $s -= WU_ERROR_TOO_MANY_SUCCESS_RESULTS;
     }
-    if ($s & WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
+    if ($s&WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
         $x = $x." ".tra("Too many total results");
         $s -= WU_ERROR_TOO_MANY_TOTAL_RESULTS;
     }
-    if ($s & WU_ERROR_CANCELLED) {
+    if ($s&WU_ERROR_CANCELLED) {
         $x = $x." ".tra("WU cancelled");
         $s -= WU_ERROR_CANCELLED;
     }
-    if ($s & WU_ERROR_NO_CANONICAL_RESULT) {
+    if ($s&WU_ERROR_NO_CANONICAL_RESULT) {
         $x = $x." ".tra("Canonical result is missing");
         $s -= WU_ERROR_NO_CANONICAL_RESULT;
     }
@@ -340,9 +340,9 @@ 
         $x = $x." ".tra("Unrecognized Error: %1", $s);
     }
     if (strlen($x)) {
-        $x="<font color=\"#ff3333\">".$x."</font>";
+        $x = "<font color=\"#ff3333\">".$x."</font>";
     } else {
-        $x="";
+        $x = "";
     }
     return $x;
 }
@@ -426,10 +426,10 @@ 
     if ($result->received_time) {
         $r = time_str($result->received_time);
     } else if ($result->report_deadline) {
-        if ($result->report_deadline>time()) {
-            $r = "<font color='#33cc33'>" . time_str($result->report_deadline) . "</font>";
+        if ($result->report_deadline > time()) {
+            $r = "<font color='#33cc33'>".time_str($result->report_deadline)."</font>";
         } else {
-            $r = "<font color='#ff3333'>" . time_str($result->report_deadline) . "</font>";
+            $r = "<font color='#ff3333'>".time_str($result->report_deadline)."</font>";
         }
     } else {
         $r = "---";
@@ -490,7 +490,7 @@ 
 // @param Integer $dec A signed integer
 //
 function int2hex($dec) {
-    return "0x".strtoupper(substr(sprintf("%08x",$dec), -8));
+    return "0x".strtoupper(substr(sprintf("%08x", $dec), -8));
 }
 
 // Decode a windows error number into semi-human-readable,
@@ -500,9 +500,9 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function windows_error_code_str($x){
-    $h=int2hex($x);
-    switch($h){
+function windows_error_code_str($x) {
+    $h = int2hex($x);
+    switch ($h) {
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -523,10 +523,10 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function error_code_str($x){
+function error_code_str($x) {
     // severe Windows error numbers are always large negative integers
-    if ($x<-400) return windows_error_code_str($x);
-    switch($x){
+    if ($x < -400) return windows_error_code_str($x);
+    switch ($x) {
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
     case 193: return "EXIT_SIGNAL";
@@ -687,7 +687,7 @@ 
     return $x." (".int2hex($x).") ".error_code_str($x);
 }
 
-function show_result($result, $show_outfile_links=false) {
+function show_result($result, $show_outfile_links = false) {
     start_table();
     row2(tra("Name"), $result->name);
     row2(tra("Workunit"), "<a href=\"workunit.php?wuid=$result->workunitid\">$result->workunitid</a>");
@@ -736,7 +736,7 @@ 
     echo "<h3>".tra("Stderr output")."</h3> <pre>"
         .htmlspecialchars(
             $result->stderr_out,
-            ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
+            ENT_QUOTES|(defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0),
             'utf-8'
         )
         ."</pre>"
@@ -751,7 +751,7 @@ 
 
     $apps = BoincApp::enum('deprecated=0 ORDER BY user_friendly_name');
 
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         $state_count[$i] = 0;
     }
     foreach ($apps as $app) {
@@ -793,7 +793,7 @@ 
         $x .= "<a href=$url>".tra("Next")." ".$info->results_per_page."</a>";
     }
     $x .= "<br>".tra("State").": ";
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         if ($i) $x .= " &middot; ";
         if ($info->state == $i) {
             $x .= $state_name[$i];
@@ -838,6 +838,6 @@ 
     return $x;
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Braces +4 added lines, -4 removed lines

@@ -500,9 +500,9 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function windows_error_code_str($x){
+function windows_error_code_str($x) {
     $h=int2hex($x);
-    switch($h){
+    switch($h) {
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -523,10 +523,10 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function error_code_str($x){
+function error_code_str($x) {
     // severe Windows error numbers are always large negative integers
     if ($x<-400) return windows_error_code_str($x);
-    switch($x){
+    switch($x) {
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
     case 193: return "EXIT_SIGNAL";