BOINC / boinc

html/inc/geoip.inc

Spacing +95 added lines, -95 removed lines

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

drupal/sites/all/themes/zen/template.php

Spacing +34 added lines, -34 removed lines

@@ -22,7 +22,7 @@ 
  */
 function zen_theme(&$existing, $type, $theme, $path) {
   // When #341140 is fixed, replace _zen_path() with drupal_get_path().
-  include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
+  include_once './'._zen_path().'/zen-internals/template.theme-registry.inc';
   return _zen_theme($existing, $type, $theme, $path);
 }
 
@@ -57,7 +57,7 @@ 
       elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
       }
-      return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
+      return '<div class="breadcrumb">'.implode($breadcrumb_separator, $breadcrumb)."$trailing_separator$title</div>";
     }
   }
   // Otherwise, return an empty string.
@@ -106,14 +106,14 @@ 
           'level' => 'h2',
         );
       }
-      $output .= '<' . $heading['level'];
+      $output .= '<'.$heading['level'];
       if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
       }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+      $output .= '>'.check_plain($heading['text']).'</'.$heading['level'].'>';
     }
 
-    $output .= '<ul'. drupal_attributes($attributes) .'>';
+    $output .= '<ul'.drupal_attributes($attributes).'>';
 
     $num_links = count($links);
     $i = 1;
@@ -132,7 +132,7 @@ 
           && (empty($link['language']) || $link['language']->language == $language->language)) {
         $class .= ' active';
       }
-      $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
+      $output .= '<li'.drupal_attributes(array('class' => $class)).'>';
 
       if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
@@ -147,7 +147,7 @@ 
         if (isset($link['attributes'])) {
           $span_attributes = drupal_attributes($link['attributes']);
         }
-        $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>';
+        $output .= '<span'.$span_attributes.'>'.$link['title'].'</span>';
       }
 
       $i++;
@@ -170,7 +170,7 @@ 
 
   // If an item is a LOCAL TASK, render it as a tab
   if ($link['type'] & MENU_IS_LOCAL_TASK) {
-    $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
+    $link['title'] = '<span class="tab">'.check_plain($link['title']).'</span>';
     $link['localized_options']['html'] = TRUE;
   }
 
@@ -195,10 +195,10 @@ 
   }
 
   if ($primary) {
-    $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
+    $output .= '<ul class="tabs primary clearfix">'.$primary.'</ul>';
   }
   if ($secondary) {
-    $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
+    $output .= '<ul class="tabs secondary clearfix">'.$secondary.'</ul>';
   }
 
   return $output;
@@ -253,7 +253,7 @@ 
     $elements['#region'] = $region;
 
     // Set the theme hook suggestions.
-    $hook = array('region_' . $region);
+    $hook = array('region_'.$region);
     if (strpos($region, 'sidebar_') === 0) {
       $hook[] = 'region_sidebar';
     }
@@ -295,7 +295,7 @@ 
     // Views (and possibly other modules) have templates with a $classes
     // variable that isn't a string, so we leave those variables alone.
     if (is_string($vars[$key])) {
-      $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
+      $vars['classes_array'] = explode(' ', $hook.' '.$vars[$key]);
       unset($vars[$key]);
     }
   }
@@ -319,37 +319,37 @@ 
 function zen_preprocess_page(&$vars, $hook) {
   // If the user is silly and enables Zen as the theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 
   // Classes for body element. Allows advanced theming based on context
   // (home page, node of certain type, etc.)
   // Remove the mostly useless page-ARG0 class.
-  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
+  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'.drupal_strtolower(arg(0))), $vars['classes_array'])) {
     unset($vars['classes_array'][$index]);
   }
   if (!$vars['is_front']) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
-    $vars['classes_array'][] = drupal_html_class('page-' . $path);
+    $vars['classes_array'][] = drupal_html_class('page-'.$path);
     // Add unique class for each website section.
-    list($section, ) = explode('/', $path, 2);
+    list($section,) = explode('/', $path, 2);
     if (arg(0) == 'node') {
       if (arg(1) == 'add') {
         $section = 'node-add';
       }
       elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
-        $section = 'node-' . arg(2);
+        $section = 'node-'.arg(2);
       }
     }
-    $vars['classes_array'][] = drupal_html_class('section-' . $section);
+    $vars['classes_array'][] = drupal_html_class('section-'.$section);
   }
   if (theme_get_setting('zen_wireframes')) {
     $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
@@ -376,7 +376,7 @@ 
     }
     else {
       $vars['classes_array'][] = 'one-sidebar';
-      $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+      $vars['classes_array'][] = 'sidebar-'.$vars['layout'];
     }
   }
   // Store the menu item since it has some useful information.
@@ -406,13 +406,13 @@ 
 function zen_preprocess_maintenance_page(&$vars, $hook) {
   // If Zen is the maintenance theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 }
@@ -459,11 +459,11 @@ 
   $vars['user_picture'] = $vars['picture'];
 
   // Create the Drupal 7 $display_submitted variable.
-  $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
+  $vars['display_submitted'] = theme_get_setting('toggle_node_info_'.$vars['node']->type);
 
   // Special classes for nodes.
   // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
-  $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
+  $vars['classes_array'][] = drupal_html_class('node-type-'.$vars['type']);
   if ($vars['promote']) {
     $vars['classes_array'][] = 'node-promoted';
   }
@@ -486,7 +486,7 @@ 
   if (isset($vars['preview'])) {
     $vars['classes_array'][] = 'node-preview';
   }
-  $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
+  $vars['classes_array'][] = 'build-mode-'.$vars['build_mode'];
 }
 
 /**
@@ -498,7 +498,7 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function zen_preprocess_comment(&$vars, $hook) {
-  include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
+  include_once './'._zen_path().'/zen-internals/template.comment.inc';
   _zen_preprocess_comment($vars, $hook);
 }
 
@@ -516,7 +516,7 @@ 
   $vars['region'] = $vars['elements']['#region'];
 
   // Setup the default classes.
-  $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
+  $vars['classes_array'] = array('region', 'region-'.str_replace('_', '-', $vars['region']));
 
   // Sidebar regions get a couple extra classes.
   if (strpos($vars['region'], 'sidebar_') === 0) {
@@ -542,7 +542,7 @@ 
   $vars['title'] = $block->subject;
 
   // Special classes for blocks.
-  $vars['classes_array'][] = 'block-' . $block->module;
+  $vars['classes_array'][] = 'block-'.$block->module;
   // Classes describing the position of the block within the region.
   if ($vars['block_id'] == 1) {
     $vars['classes_array'][] = 'first';
@@ -550,17 +550,17 @@ 
   if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
     $vars['classes_array'][] = 'last';
   }
-  $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
+  $vars['classes_array'][] = 'region-'.$vars['block_zebra'];
   $vars['classes_array'][] = $vars['zebra'];
-  $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
-  $vars['classes_array'][] = 'count-' . $vars['id'];
+  $vars['classes_array'][] = 'region-count-'.$vars['block_id'];
+  $vars['classes_array'][] = 'count-'.$vars['id'];
 
   // Create the block ID.
-  $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
+  $vars['block_html_id'] = 'block-'.$block->module.'-'.$block->delta;
 
   $vars['edit_links_array'] = array();
   if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
-    include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc';
+    include_once './'._zen_path().'/zen-internals/template.block-editing.inc';
     zen_preprocess_block_editing($vars, $hook);
     $vars['classes_array'][] = 'with-block-editing';
   }
@@ -590,7 +590,7 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_process_block(&$vars, $hook) {
-  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
+  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">'.implode(' ', $vars['edit_links_array']).'</div>' : '';
 }
 
 if (!function_exists('drupal_html_class')) {

html/inc/keywords.inc

Spacing +61 added lines, -61 removed lines

@@ -24,72 +24,72 @@
 define('KW_CATEGORY_SCIENCE', 0);
 define('KW_CATEGORY_LOC', 1);
 
-define('KW_ASTRONOMY',      1);
-define('KW_SETI',           2);
-define('KW_PULSARS',        3);
-define('KW_GW',             4);
-define('KW_COSMOLOGY',      5);
-define('KW_PHYSICS',        6);
+define('KW_ASTRONOMY', 1);
+define('KW_SETI', 2);
+define('KW_PULSARS', 3);
+define('KW_GW', 4);
+define('KW_COSMOLOGY', 5);
+define('KW_PHYSICS', 6);
 define('KW_PARTICLE_PHYSICS', 7);
-define('KW_NANOSCIENCE',    8);
-define('KW_BIOMED',         9);
+define('KW_NANOSCIENCE', 8);
+define('KW_BIOMED', 9);
 define('KW_DRUG_DISCOVERY', 10);
-define('KW_PROTEINS',       11);
-define('KW_GENETICS',       12);
-define('KW_DISEASE',        13);
-define('KW_CANCER',         14);
-define('KW_MATH_CS',        15);
-define('KW_AI',             16);
-define('KW_OCEANIA',        17);
-define('KW_AUSTRALIA',      18);
+define('KW_PROTEINS', 11);
+define('KW_GENETICS', 12);
+define('KW_DISEASE', 13);
+define('KW_CANCER', 14);
+define('KW_MATH_CS', 15);
+define('KW_AI', 16);
+define('KW_OCEANIA', 17);
+define('KW_AUSTRALIA', 18);
 
-define('KW_EUROPE',         20);
-define('KW_GERMANY',        21);
-define('KW_ASIA',           22);
-define('KW_AMERICAS',       23);
-define('KW_US',             24);
-define('KW_UCB',            25);
-define('KW_AEI',            26);
-define('KW_CERN',           27);
-define('KW_UW',             28);
-define('KW_EARTH_SCI',      29);
-define('KW_SPAIN',          30);
-define('KW_SAN_JORGE',      31);
-define('KW_NUMBER_THEORY',  32);
-define('KW_CRYPTO',         33);
-define('KW_ENV_RESEARCH',   34);
-define('KW_CLIMATE',        35);
-define('KW_CZECH',          36);
+define('KW_EUROPE', 20);
+define('KW_GERMANY', 21);
+define('KW_ASIA', 22);
+define('KW_AMERICAS', 23);
+define('KW_US', 24);
+define('KW_UCB', 25);
+define('KW_AEI', 26);
+define('KW_CERN', 27);
+define('KW_UW', 28);
+define('KW_EARTH_SCI', 29);
+define('KW_SPAIN', 30);
+define('KW_SAN_JORGE', 31);
+define('KW_NUMBER_THEORY', 32);
+define('KW_CRYPTO', 33);
+define('KW_ENV_RESEARCH', 34);
+define('KW_CLIMATE', 35);
+define('KW_CZECH', 36);
 define('KW_CHARLES_PRAGUE', 37);
-define('KW_RECHENKRAFT',    38);
-define('KW_RHEINMAIN',      39);
-define('KW_HUNGARY',        40);
-define('KW_IRELAND',        41);
-define('KW_UC_DUBLIN',      42);
-define('KW_POLAND',         43);
-define('KW_RUSSIA',         44);
+define('KW_RECHENKRAFT', 38);
+define('KW_RHEINMAIN', 39);
+define('KW_HUNGARY', 40);
+define('KW_IRELAND', 41);
+define('KW_UC_DUBLIN', 42);
+define('KW_POLAND', 43);
+define('KW_RUSSIA', 44);
 define('KW_SW_STATE_RUSSIA', 45);
-define('KW_RAS',            46);
-define('KW_PRBB',           47);
-define('KW_UK',             48);
-define('KW_OXFORD',         49);
-define('KW_CHINA',          50);
-define('KW_U_DAYTON',       51);
-define('KW_WRIGHT_STATE',   52);
-define('KW_USC',            53);
-define('KW_FULLERTON',      54);
-define('KW_ARIZONA_STATE',  55);
-define('KW_U_ILLINOIS',     56);
-define('KW_U_WARSAW',       57);
-define('KW_RPI',            58);
-define('KW_INTERNATIONAL',  59);
-define('KW_UND',            60);
-define('KW_HOLLAND',        61);
-define('KW_CHEMISTRY',      62);
-define('KW_GAMES',          63);
-define('KW_VIRUS',          64);
-define('KW_FRANCE',         65);
-define('KW_CANADA',         66);
+define('KW_RAS', 46);
+define('KW_PRBB', 47);
+define('KW_UK', 48);
+define('KW_OXFORD', 49);
+define('KW_CHINA', 50);
+define('KW_U_DAYTON', 51);
+define('KW_WRIGHT_STATE', 52);
+define('KW_USC', 53);
+define('KW_FULLERTON', 54);
+define('KW_ARIZONA_STATE', 55);
+define('KW_U_ILLINOIS', 56);
+define('KW_U_WARSAW', 57);
+define('KW_RPI', 58);
+define('KW_INTERNATIONAL', 59);
+define('KW_UND', 60);
+define('KW_HOLLAND', 61);
+define('KW_CHEMISTRY', 62);
+define('KW_GAMES', 63);
+define('KW_VIRUS', 64);
+define('KW_FRANCE', 65);
+define('KW_CANADA', 66);
 
 $job_keywords = array();
 

html/user/team_members.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 }
 
 $offset = get_int("offset", true);
-if (!$offset) $offset=0;
+if (!$offset) $offset = 0;
 
 if ($offset > 1000) {
     error_page(tra("Limit exceeded:  Can only display the first 1000 members."));

html/inc/forum_rss.inc

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/translation.inc

Spacing +33 added lines, -33 removed lines

@@ -64,11 +64,11 @@ 
     $dh = opendir($langdir.$transdir);
     if (!$dh) die("can't open translation dir");
     while (($file = readdir($dh)) !== false) {
-        if ($file==".." || $file==".") {
+        if ($file == ".." || $file == ".") {
             continue;
         }
         // only do files ending in .po
-        if (substr($file,-3) != ".po"){
+        if (substr($file, -3) != ".po") {
             //debug("File $file with unknown extension found in $info_dir");
             continue;
         }
@@ -76,7 +76,7 @@ 
             "-------------Compiling $transdir$file------------", 0
         );
         $language = parse_po_file($langdir.$transdir.$file);
-        if (!$language){
+        if (!$language) {
             language_log(
                 "WARNING: Could not parse language ".$file
             );
@@ -95,10 +95,10 @@ 
             );
             exit;
         }
-        foreach ($language as $key => $value){
+        foreach ($language as $key => $value) {
             if ($value !== "") {
                 // Skip if the msgstr is empty
-                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
+                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file, 0, -3))."\"][\"".$key."\"] = \"".$value."\";\n");
             }
         }
         // don't write \?\> - may append
@@ -115,27 +115,27 @@ 
 function parse_po_file($file) {
     $translation_file = file($file);
     $first_entry = true;
-    $current_token_text="";
-    $current_token ="";
+    $current_token_text = "";
+    $current_token = "";
     $parsing_token = false;
     $parsing_text = false;
     $size = sizeof($translation_file);
     $output = array();
-    for ($i=0; $i<$size; $i++){
+    for ($i = 0; $i < $size; $i++) {
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
-        if (substr($entry, 0, 1)=="#") {
+        if (substr($entry, 0, 1) == "#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
-            if (!$first_entry){
+            if (!$first_entry) {
                 //If this is not the first, save the previous entry
-                $output[$current_token]=$current_token_text;
+                $output[$current_token] = $current_token_text;
             }
             $current_token = get_po_line($entry, $file);
-            $current_token_text="";
+            $current_token_text = "";
             $parsing_token = true;
             $parsing_text = false;
-            $first_entry=false;
+            $first_entry = false;
         } elseif (strpos($entry, "msgstr") !== false) {
             $current_token_text = get_po_line($entry, $file);
             $parsing_token = false;
@@ -149,7 +149,7 @@ 
 
     // Get the last token
     //
-    if ($current_token && $current_token_text){
+    if ($current_token && $current_token_text) {
         $output[$current_token] = $current_token_text;
     }
     return $output;
@@ -159,9 +159,9 @@ 
 // Returns the contents of a line (ie removes "" from start and end)
 //
 function get_po_line($line, $file) {
-    $start = strpos($line, '"')+1;
+    $start = strpos($line, '"') + 1;
     $stop = strrpos($line, '"');
-    $x = substr($line, $start, $stop-$start);
+    $x = substr($line, $start, $stop - $start);
     $n = preg_match("/[^\\\\]\"/", $x);
     if ($n) {
         echo "ERROR - MISMATCHED QUOTES IN $file: $line\n";
@@ -180,11 +180,11 @@ 
 
     // Find the string in the user's language
     //
-    foreach ($languages_in_use as $language){
+    foreach ($languages_in_use as $language) {
         if (isset($language_lookup_array[$language][$text])) {
             $text = $language_lookup_array[$language][$text];
             break;
-        } else if ($language=="en"){
+        } else if ($language == "en") {
             // This language is defined in the code and is always available
             break;
         }
@@ -193,7 +193,7 @@ 
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i=1; $i<func_num_args(); $i++){
+    for ($i = 1; $i < func_num_args(); $i++) {
         $replacements["%".$i] = func_get_arg($i);
     }
 
@@ -210,14 +210,14 @@ 
     return $text;
 }
 
-function language_log($message, $loglevel=0) {
+function language_log($message, $loglevel = 0) {
     global $lang_log_level;
     $msg = "";
-    if ($loglevel==0) $msg = "[ Debug    ]";
-    if ($loglevel==1) $msg = "[ Warning  ]";
-    if ($loglevel==2) $msg = "[ CRITICAL ]";
+    if ($loglevel == 0) $msg = "[ Debug    ]";
+    if ($loglevel == 1) $msg = "[ Warning  ]";
+    if ($loglevel == 2) $msg = "[ CRITICAL ]";
 
-    if ($loglevel >= $lang_log_level){
+    if ($loglevel >= $lang_log_level) {
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
     }
 }
@@ -226,7 +226,7 @@ 
 // (by looking at cookies and browser settings)
 // cookies have highest priority.
 
-if (isset($_COOKIE['lang'])){
+if (isset($_COOKIE['lang'])) {
     $language_string = $_COOKIE['lang'].",";
 } else {
     $language_string = '';
@@ -257,10 +257,10 @@ 
 // Loop over languages that the client requests
 //
 $size = sizeof($client_languages);
-for ($i=0; $i<$size; $i++) {
-    if ((strlen($client_languages[$i])>2)
+for ($i = 0; $i < $size; $i++) {
+    if ((strlen($client_languages[$i]) > 2)
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
-    ){
+    ) {
         // If this is defined as primary-secondary, represent it as xx_YY
         //
         $language = substr(
@@ -279,7 +279,7 @@ 
 
     // if main language is english, look no further
     //
-    if ((count($languages_in_use)==0) && ($language == 'en' || $language2 == 'en')) {
+    if ((count($languages_in_use) == 0) && ($language == 'en' || $language2 == 'en')) {
         break;
     }
 
@@ -287,7 +287,7 @@ 
     //
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
     if (file_exists($file_name)) {
-        if (!in_array($language, $languages_in_use)){
+        if (!in_array($language, $languages_in_use)) {
             require_once($file_name);
             $languages_in_use[] = $language;
         }
@@ -295,7 +295,7 @@ 
     if ($language2) {
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
         if (file_exists($file_name)) {
-            if (!in_array($language2, $languages_in_use)){
+            if (!in_array($language2, $languages_in_use)) {
                 require_once($file_name);
                 $languages_in_use[] = $language2;
             }
@@ -303,7 +303,7 @@ 
     }
 }
 
-$GLOBALS['languages_in_use'] = $languages_in_use;   // for Drupal
+$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/countries.inc

Spacing +8 added lines, -8 removed lines

@@ -257,7 +257,7 @@ 
     "Zimbabwe"
 );
 
-$country_to_iso3166_2 = array (
+$country_to_iso3166_2 = array(
     "Afghanistan" => "af",
     "Albania" => "al",
     "Algeria" => "dz",
@@ -493,25 +493,25 @@ 
 
 // return a list of country options for a <select>
 //
-function country_select_options($selected_country="None") {
+function country_select_options($selected_country = "None") {
     global $countries;
 
     require_once("../inc/geoip.inc");
 
     // See if we can find the user's country and select it as default:
     //
-    $gi = geoip_open("../inc/GeoIP.dat",GEOIP_STANDARD);
-    $geoip_country = geoip_country_name_by_addr($gi,$_SERVER["REMOTE_ADDR"]);
+    $gi = geoip_open("../inc/GeoIP.dat", GEOIP_STANDARD);
+    $geoip_country = geoip_country_name_by_addr($gi, $_SERVER["REMOTE_ADDR"]);
     geoip_close($gi);
 
-    if ($selected_country=="") $selected_country="None";
-    if ($selected_country=="None" and $geoip_country!=""){
-        $selected_country=$geoip_country;
+    if ($selected_country == "") $selected_country = "None";
+    if ($selected_country == "None" and $geoip_country != "") {
+        $selected_country = $geoip_country;
     }
 
     $x = "";
     foreach ($countries as $country) {
-        $selected = ($selected_country == $country ? "selected":"");
+        $selected = ($selected_country == $country ? "selected" : "");
         $x .= "<option value=\"$country\" $selected>$country</option>\n";
     }
     return $x;

html/inc/prefs.inc

Spacing +16 added lines, -16 removed lines

@@ -108,7 +108,7 @@ 
         new NUM_SPEC(tra("% of the CPUs"), 1, 100, 0)
     ),
     new PREF_NUM(
-        tra("Use at most") ."<br><font size=-2>Requires BOINC 7.20.3+</font>",
+        tra("Use at most")."<br><font size=-2>Requires BOINC 7.20.3+</font>",
         // xgettext:no-php-format
         tra("Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat."),
         "niu_cpu_usage_limit",
@@ -295,9 +295,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;
@@ -323,7 +323,7 @@ 
     global $text;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         if (array_key_exists("name", $attrs)) {
             $venue_name = $attrs["name"];
@@ -373,7 +373,7 @@ 
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -547,7 +547,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")
@@ -557,7 +557,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();
@@ -594,9 +594,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");
@@ -636,7 +636,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 $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;
@@ -673,9 +673,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;
 }
@@ -694,12 +694,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';
@@ -757,7 +757,7 @@ 
 //
 // convert prefs from structure to XML
 //
-function global_prefs_make_xml($prefs, $primary=true) {
+function global_prefs_make_xml($prefs, $primary = true) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;

html/inc/forum_banishment_vote.inc

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
 db_init();
 
 function current_tally($voteid) {
-    $query="select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
+    $query = "select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     echo "<b>Current Tally</b>    Ayes: ".$foobar->ayes." Nays: ".$foobar->nays."<p>";
@@ -35,8 +35,8 @@ 
 
 function vote_is_in_progress($userid) {
     // check whether a vote is already ongoing
-    $now=time();
-    $query="select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
+    $now = time();
+    $query = "select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to read banishment_vote table 1.<p>";
@@ -51,56 +51,56 @@ 
     return $foobar->count;
 }
 
-function start_vote($config,$logged_in_user,$user,$category,$reason) {
-    $now=time();
-    $fin=$now+21600;
+function start_vote($config, $logged_in_user, $user, $category, $reason) {
+    $now = time();
+    $fin = $now + 21600;
 
 
-    if ( vote_is_in_progress($user->id) !=0 ) {
+    if (vote_is_in_progress($user->id) != 0) {
         echo "A banishment vote is already underway for this user.<p>";
         return 0;
     }
-    $query="insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
+    $query = "insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_vote table.<p>";
         return 0;
     }
 
-    $voteid=_mysql_insert_id();
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (". $voteid .",". $logged_in_user->id .",". $now .",1)";
+    $voteid = _mysql_insert_id();
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
         return 0;
     }
 
-    $query="update forum_preferences set banished_until=".$fin." where userid=".$user->id;
+    $query = "update forum_preferences set banished_until=".$fin." where userid=".$user->id;
     $result = _mysql_query($query);
 
     echo "Banishment vote started.<p><p>";
     current_tally($voteid);
-    return send_banish_vote_email($user, 86400*14, $reason, $now+21600);
+    return send_banish_vote_email($user, 86400*14, $reason, $now + 21600);
 }
 
-function vote_yes($config,$logged_in_user,$user) {
-    $now=time();
+function vote_yes($config, $logged_in_user, $user) {
+    $now = time();
     // Check that a vote is underway.
-    if (vote_is_in_progress($user->id)<1) {
+    if (vote_is_in_progress($user->id) < 1) {
         echo "No banishment vote is underway for this user.<p><p>";
         return 0;
     }
     // Find the voteid
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
     }
-    $voteid=$foobar->voteid;
+    $voteid = $foobar->voteid;
     // Check whether mod has voted already.
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
@@ -113,7 +113,7 @@ 
         return 0;
     }
     // insert the vote
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",1)";
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
@@ -124,24 +124,24 @@ 
     return 1;
 }
 
-function vote_no($config,$logged_in_user,$user) {
+function vote_no($config, $logged_in_user, $user) {
     // Check that a vote is underway.
-    $now=time();
-    if (vote_is_in_progress($user->id)<1) {
+    $now = time();
+    if (vote_is_in_progress($user->id) < 1) {
         echo "No banishment vote is underway for this user.<p>";
         return 0;
     }
     // Find the voteid
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
     }
-    $voteid=$foobar->voteid;
+    $voteid = $foobar->voteid;
     // Check whether mod has voted already.
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid ." and modid=".$logged_in_user->id;
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
@@ -154,7 +154,7 @@ 
         return 0;
     }
     // insert the vote
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",0)";
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",0)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";