Inspection of "Merge pull request #1803 from drshawnkwang/drupal_..." - BOINC/boinc - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (72d684)

by Christian

created 2017-03-09 10:39 UTC

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -62,9 +62,13 @@
 block discarded – undo
 // ?? the actual function doesn't seem to work here
 function file_put_contents_aux($fname, $str) {
     $f = fopen($fname, "w");
-    if (!$f) die("fopen");
+    if (!$f) {
+        die("fopen");
+    }
     $x = fwrite($f, $str);
-    if (!$x) die("fwrite");
+    if (!$x) {
+        die("fwrite");
+    }
     fclose($f);
 }
 

Please login to merge, or discard this patch.

doc/help_vol.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -139,10 +139,10 @@
 block discarded – undo
         boinc_error_page("No such volunteer $volid");
     }
     $x = $_GET['rating'];
-    if ($x==null) {
+    if ($x == null) {
         boinc_error_page("no rating given");
     }
-    $rating = (int) $x;
+    $rating = (int)$x;
     if ($rating < 0 || $rating > 5) {
         boinc_error_page("bad rating");
     }

Please login to merge, or discard this patch.

Braces +12 added lines, -4 removed lines patch added patch discarded remove patch

@@ -127,7 +127,9 @@  discard block
 block discarded – undo
     $reply = "\r\nreply-to: $email_addr";
     $body .= "\n\n";
     $body .= $msg;
-    if (!$subject) $subject = "BOINC Help request";
+    if (!$subject) {
+        $subject = "BOINC Help request";
+    }
     mail($vol->email_addr, $subject, $body, "From: BOINC".$reply);
     page_head("Message sent");
     echo "Your message has been sent to $vol->name";
@@ -157,14 +159,20 @@  discard block
 block discarded – undo
         $oldr = rating_lookup($r);
         if ($oldr) {
             $retval = rating_update($r);
-            if ($retval) vol_update_rating($vol, $oldr, $r);
+            if ($retval) {
+                vol_update_rating($vol, $oldr, $r);
+            }
         } else {
             $retval = rating_insert($r);
-            if ($retval) vol_new_rating($vol, $rating);
+            if ($retval) {
+                vol_new_rating($vol, $rating);
+            }
         }
     } else {
         $retval = rating_insert($r);
-        if ($retval) vol_new_rating($vol, $rating);
+        if ($retval) {
+            vol_new_rating($vol, $rating);
+        }
     }
     if (!$retval) {
         echo mysql_error();

Please login to merge, or discard this patch.

doc/manager_links.php 3 patches

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

@@ -24,114 +24,114 @@
 block discarded – undo
 if (isset($_GET['controlid'])) $controlid = $_GET['controlid'];
 
 if ($target == "notice") {
-	if ($controlid == 'download') {
-		header('Location: https://boinc.berkeley.edu/wiki/Release_Notes');
-	} else if ($controlid == 'statefile') {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	} else if ($controlid == 'proxy_env') {
-		header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Environment_variables');
-	} else if ($controlid == 'app_info') {
-		header('Location: https://boinc.berkeley.edu/wiki/Anonymous_platform');
-	} else if ($controlid == 'remote_hosts') {
-		header('Location: https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely');
-	} else if ($controlid == 'log_flags') {
-		header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Logging_flags');
-	} else if ($controlid == 'config') {
-		header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Configuration_file');
-	} else {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	}
+    if ($controlid == 'download') {
+        header('Location: https://boinc.berkeley.edu/wiki/Release_Notes');
+    } else if ($controlid == 'statefile') {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    } else if ($controlid == 'proxy_env') {
+        header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Environment_variables');
+    } else if ($controlid == 'app_info') {
+        header('Location: https://boinc.berkeley.edu/wiki/Anonymous_platform');
+    } else if ($controlid == 'remote_hosts') {
+        header('Location: https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely');
+    } else if ($controlid == 'log_flags') {
+        header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Logging_flags');
+    } else if ($controlid == 'config') {
+        header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Configuration_file');
+    } else {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    }
 } else if  ($target == "advanced_preferences") {
     header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
 } else if  ($target == "simple_preferences") {
     header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
 } else if (($target == "advanced") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
-	if ($controlid == "6024") {
-		header('Location: https://boinc.berkeley.edu');
-	} else if ($controlid == "6025") {
-		header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
-	} else if ($controlid == "6035") {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	} else {
-		header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
-	}
+    if ($controlid == "6024") {
+        header('Location: https://boinc.berkeley.edu');
+    } else if ($controlid == "6025") {
+        header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
+    } else if ($controlid == "6035") {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    } else {
+        header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
+    }
 } else if (($target == "simple") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
-	if ($controlid == "6024") {
-		header('Location: https://boinc.berkeley.edu');
-	} else if ($controlid == "6025") {
-		header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
-	} else if ($controlid == "6035") {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	} else {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	}
+    if ($controlid == "6024") {
+        header('Location: https://boinc.berkeley.edu');
+    } else if ($controlid == "6025") {
+        header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
+    } else if ($controlid == "6035") {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    } else {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    }
 } else if (($target == "advanced") && version_compare($version, "6.12.0", ">=") && version_compare($version, "7.0.0", "<")) {
-	if ($controlid == "6024") {
-		header('Location: https://boinc.berkeley.edu');
-	} else if ($controlid == "6025") {
-		header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
-	} else if ($controlid == "6035") {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	} else {
-		header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
-	}
+    if ($controlid == "6024") {
+        header('Location: https://boinc.berkeley.edu');
+    } else if ($controlid == "6025") {
+        header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
+    } else if ($controlid == "6035") {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    } else {
+        header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
+    }
 } else if (($target == "simple") && version_compare($version, "6.12.0", ">=") && version_compare($version, "7.0.0", "<")) {
-	if ($controlid == "6024") {
-		header('Location: https://boinc.berkeley.edu');
-	} else if ($controlid == "6025") {
-		header('Location: https://boinc.berkeley.edu/wiki/Simple_view_6_12');
-	} else if ($controlid == "6035") {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	} else {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	}
+    if ($controlid == "6024") {
+        header('Location: https://boinc.berkeley.edu');
+    } else if ($controlid == "6025") {
+        header('Location: https://boinc.berkeley.edu/wiki/Simple_view_6_12');
+    } else if ($controlid == "6035") {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    } else {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    }
 } else if (($target == "simple") && version_compare($version, "7.2.0", ">=") && version_compare($version, "7.4.0", "<")) {
-	if ($controlid == "6024") {
-		header('Location: https://boinc.berkeley.edu');
-	} else if ($controlid == "6025") {
-		header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
-	} else if ($controlid == "6035") {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	} else {
-		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-	}
+    if ($controlid == "6024") {
+        header('Location: https://boinc.berkeley.edu');
+    } else if ($controlid == "6025") {
+        header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
+    } else if ($controlid == "6035") {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    } else {
+        header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+    }
 } else {
-  if ($target == "advanced") {
-		if ($controlid == "6024") {
-			header('Location: https://boinc.berkeley.edu');
-		} else if ($controlid == "6025") {
-			header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
-		} else if ($controlid == "6035") {
-			header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-		} else {
-			header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
-		}
-  } else if ($target == "simple") {
-		if ($controlid == "6024") {
-			// "Show info about BOINC" item on Mac simple-view menu
-			//
-			header('Location: https://boinc.berkeley.edu');
-		} else if ($controlid == "6025") {
-			// "Show info about BOINC manager" item on Mac simple-view menu
-			//
-			header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
-		} else if ($controlid == "6035") {
-			// "Show info about BOINC and BOINC Manager"
-			// item on Mac simple-view menu ?? do we need this item?
-			//
-			header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-		} else if ($controlid >= "6400" && $controlid <= "6499") {
-			// Any control that has focus in the simple view
-			//
-			header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
-		} else {
-			// the question-mark button
-			//
-			header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-		}
-	} else {
+    if ($target == "advanced") {
+        if ($controlid == "6024") {
+            header('Location: https://boinc.berkeley.edu');
+        } else if ($controlid == "6025") {
+            header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
+        } else if ($controlid == "6035") {
+            header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+        } else {
+            header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
+        }
+    } else if ($target == "simple") {
+        if ($controlid == "6024") {
+            // "Show info about BOINC" item on Mac simple-view menu
+            //
+            header('Location: https://boinc.berkeley.edu');
+        } else if ($controlid == "6025") {
+            // "Show info about BOINC manager" item on Mac simple-view menu
+            //
+            header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
+        } else if ($controlid == "6035") {
+            // "Show info about BOINC and BOINC Manager"
+            // item on Mac simple-view menu ?? do we need this item?
+            //
+            header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+        } else if ($controlid >= "6400" && $controlid <= "6499") {
+            // Any control that has focus in the simple view
+            //
+            header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
+        } else {
+            // the question-mark button
+            //
+            header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
+        }
+    } else {
     header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
-  }
+    }
 }
 
 ?>

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -41,9 +41,9 @@
 block discarded – undo
 	} else {
 		header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
 	}
-} else if  ($target == "advanced_preferences") {
+} else if ($target == "advanced_preferences") {
     header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
-} else if  ($target == "simple_preferences") {
+} else if ($target == "simple_preferences") {
     header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
 } else if (($target == "advanced") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
 	if ($controlid == "6024") {

Please login to merge, or discard this patch.

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

@@ -19,9 +19,15 @@
 block discarded – undo
 $version = null;
 $controlid = null;
 
-if (isset($_GET['target'])) $target = $_GET['target'];
-if (isset($_GET['version'])) $version = $_GET['version'];
-if (isset($_GET['controlid'])) $controlid = $_GET['controlid'];
+if (isset($_GET['target'])) {
+    $target = $_GET['target'];
+}
+if (isset($_GET['version'])) {
+    $version = $_GET['version'];
+}
+if (isset($_GET['controlid'])) {
+    $controlid = $_GET['controlid'];
+}
 
 if ($target == "notice") {
 	if ($controlid == 'download') {

Please login to merge, or discard this patch.

doc/projects.inc 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -760,7 +760,7 @@
		block discarded – undo
760	760	foreach ($areas as $area) {
761	761	foreach ($area as $p) {
762	762	if ($p[1] == $url) return $p;
763		- if (sizeof($p)>6 && $p[6] == $url) return $p;
	763	+ if (sizeof($p) > 6 && $p[6] == $url) return $p;
764	764	}
765	765	}
766	766	return null;

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -759,8 +759,12 @@
 block discarded – undo
 function lookup_project($url) {
     foreach ($areas as $area) {
         foreach ($area as $p) {
-            if ($p[1] == $url) return $p;
-            if (sizeof($p)>6 && $p[6] == $url) return $p;
+            if ($p[1] == $url) {
+                return $p;
+            }
+            if (sizeof($p)>6 && $p[6] == $url) {
+                return $p;
+            }
         }
     }
     return null;

Please login to merge, or discard this patch.

doc/download.php 2 patches

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -208,23 +208,23 @@
 block discarded – undo
         show_download('win');
     }
 } else if (strstr($client_info, 'Mac')) {
-	if (strstr($client_info, 'PPC Mac OS X')) {
-		show_download('macppc');
-	} else {
-		show_download('mac');
-	}
+    if (strstr($client_info, 'PPC Mac OS X')) {
+        show_download('macppc');
+    } else {
+        show_download('mac');
+    }
 } else if (strstr($client_info, 'Android')) {
     // Check for Android before Linux,
     // since Android contains the Linux kernel and the
     // web browser user agent string lists Linux too.
     //
-	show_download('android');
+    show_download('android');
 } else if (strstr($client_info, 'Linux')) {
-	if (strstr($client_info, 'x86_64')) {
-		show_download('linuxx64');
-	} else {
-		show_download('linux');
-	}
+    if (strstr($client_info, 'x86_64')) {
+        show_download('linuxx64');
+    } else {
+        show_download('linux');
+    }
 } else {
     show_download(null);
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 
 // show a download link as a button or table row
 //
-function download_link($pname, $button=false) {
+function download_link($pname, $button = false) {
     global $platforms;
     global $url_base;
     global $client_info;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
         if ($vbox_file) {
             echo "</td></tr></table>\n";
         }
-        if ($pname == 'linux'||$pname == 'linuxx64') {
+        if ($pname == 'linux' || $pname == 'linuxx64') {
             echo "<p>", linux_info();
         }
     } else {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
 if (get_str2('all_platforms')) {
     show_download(null);
 } else if (strstr($client_info, 'Windows')) {
-    if (strstr($client_info, 'Win64')||strstr($client_info, 'WOW64')) {
+    if (strstr($client_info, 'Win64') || strstr($client_info, 'WOW64')) {
         show_download('winx64');
     } else {
         show_download('win');

Please login to merge, or discard this patch.

doc/versions.inc 4 patches

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -118,11 +118,11 @@  discard block
 block discarded – undo
 );
 
 $m74 = array(
-	"num"=>"7.4.42",
-	"status"=>"Older version (standard GUI)",
-	"file"=>"boinc_7.4.42_macOSX_x86_64.zip",
-	"date"=>"12 Mar 2015",
-	"type"=>"mac_advanced",
+    "num"=>"7.4.42",
+    "status"=>"Older version (standard GUI)",
+    "file"=>"boinc_7.4.42_macOSX_x86_64.zip",
+    "date"=>"12 Mar 2015",
+    "type"=>"mac_advanced",
 );
 
 $m72 = array(
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
 );
 
 $m74c = array(
-	"num"=>"7.4.42",
-	"status"=>"Older version (Unix command-line version)",
-	"file"=>"boinc_7.4.42_x86_64-apple-darwin.zip",
-	"date"=>"12 Mar 2015",
-	"type"=>"bare_core",
+    "num"=>"7.4.42",
+    "status"=>"Older version (Unix command-line version)",
+    "file"=>"boinc_7.4.42_x86_64-apple-darwin.zip",
+    "date"=>"12 Mar 2015",
+    "type"=>"bare_core",
 );
 
 $m72c = array(
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
     "description"=>"XP/Vista/7/8/8.1/10",
     "dbname" => "windows_intelx86",
     "versions"=>array(
-          $w76,
-          $w74,
-          $w66,
-          $w5816,
+            $w76,
+            $w74,
+            $w66,
+            $w5816,
     )
 );
 
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
     "description"=>"XP/Vista/7/8/8.1/10",
     "dbname" => "windows_x86_64",
     "versions"=>array(
-          $w76x64,
-          $w74x64,
+            $w76x64,
+            $w74x64,
     )
 );
 
@@ -300,10 +300,10 @@  discard block
 block discarded – undo
     "description"=>"Version 10.6.0+",
     "dbname" => "x86_64-apple-darwin",
     "versions"=>array(
-          $m76,
-          $m76c,
-          $m74,
-          $m74c,
+            $m76,
+            $m76c,
+            $m74,
+            $m74c,
     )
 );
 
@@ -312,8 +312,8 @@  discard block
 block discarded – undo
     "description"=>"Version 10.4.0+",
     "dbname" => "x86_64-apple-darwin",
     "versions"=>array(
-          $m72,
-          $m72c,
+            $m72,
+            $m72c,
     )
 );
 
@@ -334,9 +334,9 @@  discard block
 block discarded – undo
     "description"=> linux_info(),
     "dbname" => "i686-pc-linux-gnu",
     "versions"=>array(
-          $l74ubuntudev,
-          $l72ubuntu,
-          $l70ubuntu,
+            $l74ubuntudev,
+            $l72ubuntu,
+            $l70ubuntu,
     )
 );
 
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
     "description"=> linux_info(),
     "dbname" => "x86_64-pc-linux-gnu",
     "versions"=>array(
-          $l74ubuntux64dev,
-          $l72ubuntux64,
-          $l70ubuntux64,
+            $l74ubuntux64dev,
+            $l72ubuntux64,
+            $l70ubuntux64,
     )
 );
 

Please login to merge, or discard this patch.

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -401,14 +401,14 @@
 block discarded – undo
 // note: rand() is inclusive
 //switch(rand(0,3)) {
 switch(0) {
-    case 0: $url_base = "https://boinc.berkeley.edu/dl/"; break;
-    //case 0: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break;
-    //case 1: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;
-    //case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break;
-    //case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break;
-    //case 3: $url_base = "http://einstein-dl.phys.uwm.edu/download/boinc/dl/"; break;
-    //case 4: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break;
-    //case 4: $url_base = "http://albert.gravity.psu.edu/download/boinc/dl/"; break;
+case 0: $url_base = "https://boinc.berkeley.edu/dl/"; break;
+//case 0: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break;
+//case 1: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;
+//case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break;
+//case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break;
+//case 3: $url_base = "http://einstein-dl.phys.uwm.edu/download/boinc/dl/"; break;
+//case 4: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break;
+//case 4: $url_base = "http://albert.gravity.psu.edu/download/boinc/dl/"; break;
 }
 
 ?>

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 function type_text($type) {
     global $xml;
     if ($xml) {
-        switch($type) {
+        switch ($type) {
         case "win_old":
             return "Single-mode Windows installer";
         case "win_new":
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
             return "Android Installer";
         }
     } else {
-        switch($type) {
+        switch ($type) {
         case "win_old":
             return "<a href=client_windows.php>Single-mode Windows installer</a>";
         case "win_new":
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
 
 // note: rand() is inclusive
 //switch(rand(0,3)) {
-switch(0) {
+switch (0) {
     case 0: $url_base = "https://boinc.berkeley.edu/dl/"; break;
     //case 0: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break;
     //case 1: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -389,7 +389,9 @@
 block discarded – undo
 function latest_version($p) {
     $dev = false;
     foreach ($p['versions'] as $i=>$v) {
-        if (!$dev && is_dev($v)) continue;
+        if (!$dev && is_dev($v)) {
+            continue;
+        }
         return $v;
     }
     foreach ($p['versions'] as $i=>$v) {

Please login to merge, or discard this patch.

doc/project_list.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@
 block discarded – undo
     }
 }
 
-foreach($proj_list as $p) {
+foreach ($proj_list as $p) {
     echo "    <project>
         <name>$p->name</name>
         <url>$p->url</url>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -56,7 +56,9 @@
 block discarded – undo
     if ($platforms) {
         echo "    <platforms>\n";
         foreach ($platforms as $platform) {
-            if ($platform == 'Unknown') continue;
+            if ($platform == 'Unknown') {
+                continue;
+            }
             echo "        <name>$platform</name>\n";
         }
         echo "    </platforms>\n";

Please login to merge, or discard this patch.

doc/help.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@
 block discarded – undo
 <li> ".tra("using Skype chat")."
 </ul>
 <p>
-".tra("Volunteers speaking many languages are available. Please select a language (number of helpers is shown):"),"
+".tra("Volunteers speaking many languages are available. Please select a language (number of helpers is shown):"), "
 <p>
 ";
 

Please login to merge, or discard this patch.

doc/addons.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 }
 
 function show_group($name, $list, $short_name) {
-	echo "
+    echo "
 		<h2>$name</h2>
 		<table border=1 cellpadding=6 width=100%>
 		<tr>
@@ -41,19 +41,19 @@  discard block
 block discarded – undo
 			<th>Description</th>
 		</tr>
 	";
-	shuffle($list);
-	foreach ($list as $item) {
-		$file = $item[0];
-		$itemname = $item[1];
-		$desc = $item[3];
+    shuffle($list);
+    foreach ($list as $item) {
+        $file = $item[0];
+        $itemname = $item[1];
+        $desc = $item[3];
         $iname = urlencode($file);
-		echo "
+        echo "
 			<tr><td><a href=http://boinc.berkeley.edu/addon_item.php?platform=$short_name&item=$iname>$itemname</a></td>
 				<td>$desc</td>
 			</tr>
 		";
-	}
-	echo "</table>
+    }
+    echo "</table>
 	";
 }
 

Please login to merge, or discard this patch.

		@@ -139,10 +139,10 @@
		block discarded – undo
139	139	boinc_error_page("No such volunteer $volid");
140	140	}
141	141	$x = $_GET['rating'];
142		- if ($x==null) {
	142	+ if ($x == null) {
143	143	boinc_error_page("no rating given");
144	144	}
145		- $rating = (int) $x;
	145	+ $rating = (int)$x;
146	146	if ($rating < 0 \|\| $rating > 5) {
147	147	boinc_error_page("bad rating");
148	148	}

		@@ -127,7 +127,9 @@ discard block
		block discarded – undo
127	127	$reply = "\r\nreply-to: $email_addr";
128	128	$body .= "\n\n";
129	129	$body .= $msg;
130		- if (!$subject) $subject = "BOINC Help request";
	130	+ if (!$subject) {
	131	+ $subject = "BOINC Help request";
	132	+ }
131	133	mail($vol->email_addr, $subject, $body, "From: BOINC".$reply);
132	134	page_head("Message sent");
133	135	echo "Your message has been sent to $vol->name";
		@@ -157,14 +159,20 @@ discard block
		block discarded – undo
157	159	$oldr = rating_lookup($r);
158	160	if ($oldr) {
159	161	$retval = rating_update($r);
160		- if ($retval) vol_update_rating($vol, $oldr, $r);
	162	+ if ($retval) {
	163	+ vol_update_rating($vol, $oldr, $r);
	164	+ }
161	165	} else {
162	166	$retval = rating_insert($r);
163		- if ($retval) vol_new_rating($vol, $rating);
	167	+ if ($retval) {
	168	+ vol_new_rating($vol, $rating);
	169	+ }
164	170	}
165	171	} else {
166	172	$retval = rating_insert($r);
167		- if ($retval) vol_new_rating($vol, $rating);
	173	+ if ($retval) {
	174	+ vol_new_rating($vol, $rating);
	175	+ }
168	176	}
169	177	if (!$retval) {
170	178	echo mysql_error();

		@@ -208,23 +208,23 @@
		block discarded – undo
208	208	show_download('win');
209	209	}
210	210	} else if (strstr($client_info, 'Mac')) {
211		- if (strstr($client_info, 'PPC Mac OS X')) {
212		- show_download('macppc');
213		- } else {
214		- show_download('mac');
215		- }
	211	+ if (strstr($client_info, 'PPC Mac OS X')) {
	212	+ show_download('macppc');
	213	+ } else {
	214	+ show_download('mac');
	215	+ }
216	216	} else if (strstr($client_info, 'Android')) {
217	217	// Check for Android before Linux,
218	218	// since Android contains the Linux kernel and the
219	219	// web browser user agent string lists Linux too.
220	220	//
221		- show_download('android');
	221	+ show_download('android');
222	222	} else if (strstr($client_info, 'Linux')) {
223		- if (strstr($client_info, 'x86_64')) {
224		- show_download('linuxx64');
225		- } else {
226		- show_download('linux');
227		- }
	223	+ if (strstr($client_info, 'x86_64')) {
	224	+ show_download('linuxx64');
	225	+ } else {
	226	+ show_download('linux');
	227	+ }
228	228	} else {
229	229	show_download(null);
230	230	}

		@@ -118,11 +118,11 @@ discard block
		block discarded – undo
118	118	);
119	119
120	120	$m74 = array(
121		- "num"=>"7.4.42",
122		- "status"=>"Older version (standard GUI)",
123		- "file"=>"boinc_7.4.42_macOSX_x86_64.zip",
124		- "date"=>"12 Mar 2015",
125		- "type"=>"mac_advanced",
	121	+ "num"=>"7.4.42",
	122	+ "status"=>"Older version (standard GUI)",
	123	+ "file"=>"boinc_7.4.42_macOSX_x86_64.zip",
	124	+ "date"=>"12 Mar 2015",
	125	+ "type"=>"mac_advanced",
126	126	);
127	127
128	128	$m72 = array(
		@@ -158,11 +158,11 @@ discard block
		block discarded – undo
158	158	);
159	159
160	160	$m74c = array(
161		- "num"=>"7.4.42",
162		- "status"=>"Older version (Unix command-line version)",
163		- "file"=>"boinc_7.4.42_x86_64-apple-darwin.zip",
164		- "date"=>"12 Mar 2015",
165		- "type"=>"bare_core",
	161	+ "num"=>"7.4.42",
	162	+ "status"=>"Older version (Unix command-line version)",
	163	+ "file"=>"boinc_7.4.42_x86_64-apple-darwin.zip",
	164	+ "date"=>"12 Mar 2015",
	165	+ "type"=>"bare_core",
166	166	);
167	167
168	168	$m72c = array(
		@@ -278,10 +278,10 @@ discard block
		block discarded – undo
278	278	"description"=>"XP/Vista/7/8/8.1/10",
279	279	"dbname" => "windows_intelx86",
280	280	"versions"=>array(
281		- $w76,
282		- $w74,
283		- $w66,
284		- $w5816,
	281	+ $w76,
	282	+ $w74,
	283	+ $w66,
	284	+ $w5816,
285	285	)
286	286	);
287	287
		@@ -290,8 +290,8 @@ discard block
		block discarded – undo
290	290	"description"=>"XP/Vista/7/8/8.1/10",
291	291	"dbname" => "windows_x86_64",
292	292	"versions"=>array(
293		- $w76x64,
294		- $w74x64,
	293	+ $w76x64,
	294	+ $w74x64,
295	295	)
296	296	);
297	297
		@@ -300,10 +300,10 @@ discard block
		block discarded – undo
300	300	"description"=>"Version 10.6.0+",
301	301	"dbname" => "x86_64-apple-darwin",
302	302	"versions"=>array(
303		- $m76,
304		- $m76c,
305		- $m74,
306		- $m74c,
	303	+ $m76,
	304	+ $m76c,
	305	+ $m74,
	306	+ $m74c,
307	307	)
308	308	);
309	309
		@@ -312,8 +312,8 @@ discard block
		block discarded – undo
312	312	"description"=>"Version 10.4.0+",
313	313	"dbname" => "x86_64-apple-darwin",
314	314	"versions"=>array(
315		- $m72,
316		- $m72c,
	315	+ $m72,
	316	+ $m72c,
317	317	)
318	318	);
319	319
		@@ -334,9 +334,9 @@ discard block
		block discarded – undo
334	334	"description"=> linux_info(),
335	335	"dbname" => "i686-pc-linux-gnu",
336	336	"versions"=>array(
337		- $l74ubuntudev,
338		- $l72ubuntu,
339		- $l70ubuntu,
	337	+ $l74ubuntudev,
	338	+ $l72ubuntu,
	339	+ $l70ubuntu,
340	340	)
341	341	);
342	342
		@@ -345,9 +345,9 @@ discard block
		block discarded – undo
345	345	"description"=> linux_info(),
346	346	"dbname" => "x86_64-pc-linux-gnu",
347	347	"versions"=>array(
348		- $l74ubuntux64dev,
349		- $l72ubuntux64,
350		- $l70ubuntux64,
	348	+ $l74ubuntux64dev,
	349	+ $l72ubuntux64,
	350	+ $l70ubuntux64,
351	351	)
352	352	);
353	353

		@@ -401,14 +401,14 @@
		block discarded – undo
401	401	// note: rand() is inclusive
402	402	//switch(rand(0,3)) {
403	403	switch(0) {
404		- case 0: $url_base = "https://boinc.berkeley.edu/dl/"; break;
405		- //case 0: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break;
406		- //case 1: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;
407		- //case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break;
408		- //case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break;
409		- //case 3: $url_base = "http://einstein-dl.phys.uwm.edu/download/boinc/dl/"; break;
410		- //case 4: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break;
411		- //case 4: $url_base = "http://albert.gravity.psu.edu/download/boinc/dl/"; break;
	404	+case 0: $url_base = "https://boinc.berkeley.edu/dl/"; break;
	405	+//case 0: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break;
	406	+//case 1: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;
	407	+//case 2: $url_base = "http://einstein.aei.mpg.de/download/boinc/dl/"; break;
	408	+//case 1: $url_base = "http://morel.mit.edu/download/boinc/dl/"; break;
	409	+//case 3: $url_base = "http://einstein-dl.phys.uwm.edu/download/boinc/dl/"; break;
	410	+//case 4: $url_base = "http://einstein.astro.gla.ac.uk/download/boinc/dl/"; break;
	411	+//case 4: $url_base = "http://albert.gravity.psu.edu/download/boinc/dl/"; break;
412	412	}
413	413
414	414	?>

		@@ -62,9 +62,13 @@
		block discarded – undo
62	62	// ?? the actual function doesn't seem to work here
63	63	function file_put_contents_aux($fname, $str) {
64	64	$f = fopen($fname, "w");
65		- if (!$f) die("fopen");
	65	+ if (!$f) {
	66	+ die("fopen");
	67	+ }
66	68	$x = fwrite($f, $str);
67		- if (!$x) die("fwrite");
	69	+ if (!$x) {
	70	+ die("fwrite");
	71	+ }
68	72	fclose($f);
69	73	}
70	74

		@@ -24,114 +24,114 @@
		block discarded – undo
24	24	if (isset($_GET['controlid'])) $controlid = $_GET['controlid'];
25	25
26	26	if ($target == "notice") {
27		- if ($controlid == 'download') {
28		- header('Location: https://boinc.berkeley.edu/wiki/Release_Notes');
29		- } else if ($controlid == 'statefile') {
30		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
31		- } else if ($controlid == 'proxy_env') {
32		- header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Environment_variables');
33		- } else if ($controlid == 'app_info') {
34		- header('Location: https://boinc.berkeley.edu/wiki/Anonymous_platform');
35		- } else if ($controlid == 'remote_hosts') {
36		- header('Location: https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely');
37		- } else if ($controlid == 'log_flags') {
38		- header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Logging_flags');
39		- } else if ($controlid == 'config') {
40		- header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Configuration_file');
41		- } else {
42		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
43		- }
	27	+ if ($controlid == 'download') {
	28	+ header('Location: https://boinc.berkeley.edu/wiki/Release_Notes');
	29	+ } else if ($controlid == 'statefile') {
	30	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	31	+ } else if ($controlid == 'proxy_env') {
	32	+ header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Environment_variables');
	33	+ } else if ($controlid == 'app_info') {
	34	+ header('Location: https://boinc.berkeley.edu/wiki/Anonymous_platform');
	35	+ } else if ($controlid == 'remote_hosts') {
	36	+ header('Location: https://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely');
	37	+ } else if ($controlid == 'log_flags') {
	38	+ header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Logging_flags');
	39	+ } else if ($controlid == 'config') {
	40	+ header('Location: https://boinc.berkeley.edu/wiki/Client_configuration#Configuration_file');
	41	+ } else {
	42	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	43	+ }
44	44	} else if ($target == "advanced_preferences") {
45	45	header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
46	46	} else if ($target == "simple_preferences") {
47	47	header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
48	48	} else if (($target == "advanced") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
49		- if ($controlid == "6024") {
50		- header('Location: https://boinc.berkeley.edu');
51		- } else if ($controlid == "6025") {
52		- header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
53		- } else if ($controlid == "6035") {
54		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
55		- } else {
56		- header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
57		- }
	49	+ if ($controlid == "6024") {
	50	+ header('Location: https://boinc.berkeley.edu');
	51	+ } else if ($controlid == "6025") {
	52	+ header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
	53	+ } else if ($controlid == "6035") {
	54	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	55	+ } else {
	56	+ header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_10');
	57	+ }
58	58	} else if (($target == "simple") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
59		- if ($controlid == "6024") {
60		- header('Location: https://boinc.berkeley.edu');
61		- } else if ($controlid == "6025") {
62		- header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
63		- } else if ($controlid == "6035") {
64		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
65		- } else {
66		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
67		- }
	59	+ if ($controlid == "6024") {
	60	+ header('Location: https://boinc.berkeley.edu');
	61	+ } else if ($controlid == "6025") {
	62	+ header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
	63	+ } else if ($controlid == "6035") {
	64	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	65	+ } else {
	66	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	67	+ }
68	68	} else if (($target == "advanced") && version_compare($version, "6.12.0", ">=") && version_compare($version, "7.0.0", "<")) {
69		- if ($controlid == "6024") {
70		- header('Location: https://boinc.berkeley.edu');
71		- } else if ($controlid == "6025") {
72		- header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
73		- } else if ($controlid == "6035") {
74		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
75		- } else {
76		- header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
77		- }
	69	+ if ($controlid == "6024") {
	70	+ header('Location: https://boinc.berkeley.edu');
	71	+ } else if ($controlid == "6025") {
	72	+ header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
	73	+ } else if ($controlid == "6035") {
	74	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	75	+ } else {
	76	+ header('Location: https://boinc.berkeley.edu/wiki/Advanced_view_6_12');
	77	+ }
78	78	} else if (($target == "simple") && version_compare($version, "6.12.0", ">=") && version_compare($version, "7.0.0", "<")) {
79		- if ($controlid == "6024") {
80		- header('Location: https://boinc.berkeley.edu');
81		- } else if ($controlid == "6025") {
82		- header('Location: https://boinc.berkeley.edu/wiki/Simple_view_6_12');
83		- } else if ($controlid == "6035") {
84		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
85		- } else {
86		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
87		- }
	79	+ if ($controlid == "6024") {
	80	+ header('Location: https://boinc.berkeley.edu');
	81	+ } else if ($controlid == "6025") {
	82	+ header('Location: https://boinc.berkeley.edu/wiki/Simple_view_6_12');
	83	+ } else if ($controlid == "6035") {
	84	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	85	+ } else {
	86	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	87	+ }
88	88	} else if (($target == "simple") && version_compare($version, "7.2.0", ">=") && version_compare($version, "7.4.0", "<")) {
89		- if ($controlid == "6024") {
90		- header('Location: https://boinc.berkeley.edu');
91		- } else if ($controlid == "6025") {
92		- header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
93		- } else if ($controlid == "6035") {
94		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
95		- } else {
96		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
97		- }
	89	+ if ($controlid == "6024") {
	90	+ header('Location: https://boinc.berkeley.edu');
	91	+ } else if ($controlid == "6025") {
	92	+ header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
	93	+ } else if ($controlid == "6035") {
	94	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	95	+ } else {
	96	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	97	+ }
98	98	} else {
99		- if ($target == "advanced") {
100		- if ($controlid == "6024") {
101		- header('Location: https://boinc.berkeley.edu');
102		- } else if ($controlid == "6025") {
103		- header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
104		- } else if ($controlid == "6035") {
105		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
106		- } else {
107		- header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
108		- }
109		- } else if ($target == "simple") {
110		- if ($controlid == "6024") {
111		- // "Show info about BOINC" item on Mac simple-view menu
112		- //
113		- header('Location: https://boinc.berkeley.edu');
114		- } else if ($controlid == "6025") {
115		- // "Show info about BOINC manager" item on Mac simple-view menu
116		- //
117		- header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
118		- } else if ($controlid == "6035") {
119		- // "Show info about BOINC and BOINC Manager"
120		- // item on Mac simple-view menu ?? do we need this item?
121		- //
122		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
123		- } else if ($controlid >= "6400" && $controlid <= "6499") {
124		- // Any control that has focus in the simple view
125		- //
126		- header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
127		- } else {
128		- // the question-mark button
129		- //
130		- header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
131		- }
132		- } else {
	99	+ if ($target == "advanced") {
	100	+ if ($controlid == "6024") {
	101	+ header('Location: https://boinc.berkeley.edu');
	102	+ } else if ($controlid == "6025") {
	103	+ header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
	104	+ } else if ($controlid == "6035") {
	105	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	106	+ } else {
	107	+ header('Location: https://boinc.berkeley.edu/wiki/Advanced_view');
	108	+ }
	109	+ } else if ($target == "simple") {
	110	+ if ($controlid == "6024") {
	111	+ // "Show info about BOINC" item on Mac simple-view menu
	112	+ //
	113	+ header('Location: https://boinc.berkeley.edu');
	114	+ } else if ($controlid == "6025") {
	115	+ // "Show info about BOINC manager" item on Mac simple-view menu
	116	+ //
	117	+ header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
	118	+ } else if ($controlid == "6035") {
	119	+ // "Show info about BOINC and BOINC Manager"
	120	+ // item on Mac simple-view menu ?? do we need this item?
	121	+ //
	122	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	123	+ } else if ($controlid >= "6400" && $controlid <= "6499") {
	124	+ // Any control that has focus in the simple view
	125	+ //
	126	+ header('Location: https://boinc.berkeley.edu/wiki/Simple_view');
	127	+ } else {
	128	+ // the question-mark button
	129	+ //
	130	+ header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
	131	+ }
	132	+ } else {
133	133	header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
134		- }
	134	+ }
135	135	}
136	136
137	137	?>

		@@ -41,9 +41,9 @@
		block discarded – undo
41	41	} else {
42	42	header('Location: https://boinc.berkeley.edu/wiki/BOINC_Help');
43	43	}
44		-} else if ($target == "advanced_preferences") {
	44	+} else if ($target == "advanced_preferences") {
45	45	header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Advanced_view');
46		-} else if ($target == "simple_preferences") {
	46	+} else if ($target == "simple_preferences") {
47	47	header('Location: https://boinc.berkeley.edu/wiki/Local_preferences#Simple_view');
48	48	} else if (($target == "advanced") && version_compare($version, "5.10.0", ">=") && version_compare($version, "6.12.0", "<")) {
49	49	if ($controlid == "6024") {

		@@ -19,9 +19,15 @@
		block discarded – undo
19	19	$version = null;
20	20	$controlid = null;
21	21
22		-if (isset($_GET['target'])) $target = $_GET['target'];
23		-if (isset($_GET['version'])) $version = $_GET['version'];
24		-if (isset($_GET['controlid'])) $controlid = $_GET['controlid'];
	22	+if (isset($_GET['target'])) {
	23	+ $target = $_GET['target'];
	24	+}
	25	+if (isset($_GET['version'])) {
	26	+ $version = $_GET['version'];
	27	+}
	28	+if (isset($_GET['controlid'])) {
	29	+ $controlid = $_GET['controlid'];
	30	+}
25	31
26	32	if ($target == "notice") {
27	33	if ($controlid == 'download') {

		@@ -759,8 +759,12 @@
		block discarded – undo
759	759	function lookup_project($url) {
760	760	foreach ($areas as $area) {
761	761	foreach ($area as $p) {
762		- if ($p[1] == $url) return $p;
763		- if (sizeof($p)>6 && $p[6] == $url) return $p;
	762	+ if ($p[1] == $url) {
	763	+ return $p;
	764	+ }
	765	+ if (sizeof($p)>6 && $p[6] == $url) {
	766	+ return $p;
	767	+ }
764	768	}
765	769	}
766	770	return null;

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11
12	12	// show a download link as a button or table row
13	13	//
14		-function download_link($pname, $button=false) {
	14	+function download_link($pname, $button = false) {
15	15	global $platforms;
16	16	global $url_base;
17	17	global $client_info;
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	if ($vbox_file) {
79	79	echo "</td></tr></table>\n";
80	80	}
81		- if ($pname == 'linux'\|\|$pname == 'linuxx64') {
	81	+ if ($pname == 'linux' \|\| $pname == 'linuxx64') {
82	82	echo "<p>", linux_info();
83	83	}
84	84	} else {
		@@ -202,7 +202,7 @@ discard block
		block discarded – undo
202	202	if (get_str2('all_platforms')) {
203	203	show_download(null);
204	204	} else if (strstr($client_info, 'Windows')) {
205		- if (strstr($client_info, 'Win64')\|\|strstr($client_info, 'WOW64')) {
	205	+ if (strstr($client_info, 'Win64') \|\| strstr($client_info, 'WOW64')) {
206	206	show_download('winx64');
207	207	} else {
208	208	show_download('win');

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	function type_text($type) {
4	4	global $xml;
5	5	if ($xml) {
6		- switch($type) {
	6	+ switch ($type) {
7	7	case "win_old":
8	8	return "Single-mode Windows installer";
9	9	case "win_new":
		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18	return "Android Installer";
19	19	}
20	20	} else {
21		- switch($type) {
	21	+ switch ($type) {
22	22	case "win_old":
23	23	return "<a href=client_windows.php>Single-mode Windows installer</a>";
24	24	case "win_new":
		@@ -400,7 +400,7 @@ discard block
		block discarded – undo
400	400
401	401	// note: rand() is inclusive
402	402	//switch(rand(0,3)) {
403		-switch(0) {
	403	+switch (0) {
404	404	case 0: $url_base = "https://boinc.berkeley.edu/dl/"; break;
405	405	//case 0: $url_base = "http://boincdl3.ssl.berkeley.edu/mirror/"; break;
406	406	//case 1: $url_base = "http://einstein.ligo.caltech.edu/download/boinc/dl/"; break;

		@@ -389,7 +389,9 @@
		block discarded – undo
389	389	function latest_version($p) {
390	390	$dev = false;
391	391	foreach ($p['versions'] as $i=>$v) {
392		- if (!$dev && is_dev($v)) continue;
	392	+ if (!$dev && is_dev($v)) {
	393	+ continue;
	394	+ }
393	395	return $v;
394	396	}
395	397	foreach ($p['versions'] as $i=>$v) {

		@@ -43,7 +43,7 @@
		block discarded – undo
43	43	}
44	44	}
45	45
46		-foreach($proj_list as $p) {
	46	+foreach ($proj_list as $p) {
47	47	echo " <project>
48	48	<name>$p->name</name>
49	49	<url>$p->url</url>

		@@ -56,7 +56,9 @@
		block discarded – undo
56	56	if ($platforms) {
57	57	echo " <platforms>\n";
58	58	foreach ($platforms as $platform) {
59		- if ($platform == 'Unknown') continue;
	59	+ if ($platform == 'Unknown') {
	60	+ continue;
	61	+ }
60	62	echo " <name>$platform</name>\n";
61	63	}
62	64	echo " </platforms>\n";

		@@ -25,7 +25,7 @@
		block discarded – undo
25	25	<li> ".tra("using Skype chat")."
26	26	</ul>
27	27	<p>
28		-".tra("Volunteers speaking many languages are available. Please select a language (number of helpers is shown):"),"
	28	+".tra("Volunteers speaking many languages are available. Please select a language (number of helpers is shown):"), "
29	29	<p>
30	30	";
31	31

		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	}
34	34
35	35	function show_group($name, $list, $short_name) {
36		- echo "
	36	+ echo "
37	37	<h2>$name</h2>
38	38	<table border=1 cellpadding=6 width=100%>
39	39	<tr>
		@@ -41,19 +41,19 @@ discard block
		block discarded – undo
41	41	<th>Description</th>
42	42	</tr>
43	43	";
44		- shuffle($list);
45		- foreach ($list as $item) {
46		- $file = $item[0];
47		- $itemname = $item[1];
48		- $desc = $item[3];
	44	+ shuffle($list);
	45	+ foreach ($list as $item) {
	46	+ $file = $item[0];
	47	+ $itemname = $item[1];
	48	+ $desc = $item[3];
49	49	$iname = urlencode($file);
50		- echo "
	50	+ echo "
51	51	<tr><td><a href=http://boinc.berkeley.edu/addon_item.php?platform=$short_name&item=$iname>$itemname</a></td>
52	52	<td>$desc</td>
53	53	</tr>
54	54	";
55		- }
56		- echo "</table>
	55	+ }
	56	+ echo "</table>
57	57	";
58	58	}
59	59

BOINC / boinc

Branch — master (72d684)

Category

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +12 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch