BOINC / boinc

html/inc/uotd.inc

Spacing +15 added lines, -15 removed lines

@@ -98,11 +98,11 @@ 
         $u->email_addr = UOTD_ADMIN_EMAIL;
         $u->name = "UOTD admin";
         send_email($u,
-            PROJECT . ": User of the Day pool is running low!",
+            PROJECT.": User of the Day pool is running low!",
             "The pool of approved candidates for User of the Day has".
-            " reached your assigned threshold: there are now only " . $result->num_rows . " approved users.\n\n".
+            " reached your assigned threshold: there are now only ".$result->num_rows." approved users.\n\n".
             "To approve more candidates for User of the Day,".
-            " go to the " . PROJECT . " administration page and click \"Screen user profiles\""
+            " go to the ".PROJECT." administration page and click \"Screen user profiles\""
         );
     }
 
@@ -147,10 +147,10 @@ 
     $profile->update("uotd_time = ".time());
 
     send_email($user,
-        "You're the " . PROJECT . " user of the day!",
+        "You're the ".PROJECT." user of the day!",
         "Congratulations!\n\nYou've been chosen as the "
-        . PROJECT . " user of the day!
-        Your profile will be featured on the " . PROJECT . " website for the next 24 hours."
+        . PROJECT." user of the day!
+        Your profile will be featured on the " . PROJECT." website for the next 24 hours."
     );
     echo "Chose user $user->id as UOTD\n";
 
@@ -161,7 +161,7 @@ 
 // To override this with your own policy, create a similar function in
 // your own project.inc called uotd_candidates_query()
 //
-function default_uotd_candidates_query(){
+function default_uotd_candidates_query() {
     $query = "SELECT * FROM profile,user WHERE profile.userid=user.id ";
     $query .= " AND verification=1 ";
     $query .= " AND expavg_credit>1 ";
@@ -173,8 +173,8 @@ 
 // get a list of profiles that have been 'approved' for UOTD,
 // using a project-specific query if supplied in project.inc
 //
-function count_uotd_candidates(){
-    $n = -1;                    // negative value returned on error
+function count_uotd_candidates() {
+    $n = -1; // negative value returned on error
     if (function_exists('uotd_candidates_query')) {
         $query = uotd_candidates_query();
     } else {
@@ -183,7 +183,7 @@ 
     
     $db = BoincDb::get();
     $result = $db->do_query($query);
-    if($result) {
+    if ($result) {
         $n = $result->num_rows;
     }
     $result->free();
@@ -195,15 +195,15 @@ 
 //
 function generate_uotd_gadget($profile, $user) {
     $x = "<font size='2'>\n";
-    $gadget =  PROFILE_PATH."uotd_gadget.html";
-    if( $h = fopen($gadget, "w") ){
-        $age = time()-$profile->uotd_time;
+    $gadget = PROFILE_PATH."uotd_gadget.html";
+    if ($h = fopen($gadget, "w")) {
+        $age = time() - $profile->uotd_time;
         echo "age: $age";
-        if($age <= 86400+3600) { // allow for slop
+        if ($age <= 86400 + 3600) { // allow for slop
             $x .= uotd_thumbnail($profile, $user);
             $x .= user_links($user, BADGE_HEIGHT_MEDIUM);
             $resp = sanitize_tags(output_transform($profile->response1));
-            $x .= "&nbsp;&nbsp;". sub_sentence($resp, ' ', 250, true);
+            $x .= "&nbsp;&nbsp;".sub_sentence($resp, ' ', 250, true);
         }
         else {
             $x .= "<font color='fuscia'>

Braces +6 added lines, -6 removed lines

@@ -161,7 +161,7 @@ 
 // To override this with your own policy, create a similar function in
 // your own project.inc called uotd_candidates_query()
 //
-function default_uotd_candidates_query(){
+function default_uotd_candidates_query() {
     $query = "SELECT * FROM profile,user WHERE profile.userid=user.id ";
     $query .= " AND verification=1 ";
     $query .= " AND expavg_credit>1 ";
@@ -173,7 +173,7 @@ 
 // get a list of profiles that have been 'approved' for UOTD,
 // using a project-specific query if supplied in project.inc
 //
-function count_uotd_candidates(){
+function count_uotd_candidates() {
     $n = -1;                    // negative value returned on error
     if (function_exists('uotd_candidates_query')) {
         $query = uotd_candidates_query();
@@ -196,16 +196,16 @@ 
 function generate_uotd_gadget($profile, $user) {
     $x = "<font size='2'>\n";
     $gadget =  PROFILE_PATH."uotd_gadget.html";
-    if( $h = fopen($gadget, "w") ){
+    if( $h = fopen($gadget, "w") ) {
         $age = time()-$profile->uotd_time;
         echo "age: $age";
-        if($age <= 86400+3600) { // allow for slop
+        if($age <= 86400+3600) {
+// allow for slop
             $x .= uotd_thumbnail($profile, $user);
             $x .= user_links($user, BADGE_HEIGHT_MEDIUM);
             $resp = sanitize_tags(output_transform($profile->response1));
             $x .= "&nbsp;&nbsp;". sub_sentence($resp, ' ', 250, true);
-        }
-        else {
+        } else {
             $x .= "<font color='fuscia'>
                 There is no User of the Day today.
                 Only volunteers who have created a Profile

html/inc/time.inc

Spacing +11 added lines, -11 removed lines

@@ -22,21 +22,21 @@ 
 function time_diff_str($t1, $t2) {
     if (!$t1 || !$t2) return "---";
     $diff = $t2 - $t1;
-    if ($diff<0){
-        $pre="In ";
-        $post="";
-        $diff=-$diff;
+    if ($diff < 0) {
+        $pre = "In ";
+        $post = "";
+        $diff = -$diff;
     } else {
         if ($diff > 86400*30) {
             return date_str($t1);
         }
-        $pre="";
-        $post=" ago";
+        $pre = "";
+        $post = " ago";
     }
     $x = "";
 
     if ($diff >= 3600*24) {
-        $n = (int) ($diff/(3600*24));
+        $n = (int)($diff/(3600*24));
         if ($n == 1) {
             $x .= "1 day ";
         } else {
@@ -45,7 +45,7 @@ 
         return $pre.$x.$post;
         //$diff -= $n*3600*24;
     } elseif ($diff >= 3600) {
-        $n = (int) ($diff/3600);
+        $n = (int)($diff/3600);
         if ($n == 1) {
             $x .= "1 hour ";
         } else {
@@ -54,16 +54,16 @@ 
         return $pre.$x.$post;
         //$diff -= $n*3600;
     } elseif ($diff >= 60) {
-        $n = (int) ($diff/60);
+        $n = (int)($diff/60);
         if ($n == 1) {
             $x .= "1 minute ";
         } else {
             $x .= $n." minutes ";
         }
         return $pre.$x.$post;
-    } elseif($diff > 1 || $diff==0) {
+    } elseif ($diff > 1 || $diff == 0) {
         return $pre."$diff seconds".$post;
-    } elseif($diff == 1){
+    } elseif ($diff == 1) {
         return $pre."$diff seconds".$post;
     }
 }

Braces +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 function time_diff_str($t1, $t2) {
     if (!$t1 || !$t2) return "---";
     $diff = $t2 - $t1;
-    if ($diff<0){
+    if ($diff<0) {
         $pre="In ";
         $post="";
         $diff=-$diff;
@@ -63,7 +63,7 @@ 
         return $pre.$x.$post;
     } elseif($diff > 1 || $diff==0) {
         return $pre."$diff seconds".$post;
-    } elseif($diff == 1){
+    } elseif($diff == 1) {
         return $pre."$diff seconds".$post;
     }
 }

html/inc/bossa.inc

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 function bossa_batch_create($appid, $name, $calibration) {
     $now = time();
-    $c = $calibration?"1":"0";
+    $c = $calibration ? "1" : "0";
     return BossaBatch::insert("(create_time, app_id, name, calibration) values ($now, $appid, '$name', $c)");
 }
 

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;

Braces +1 added lines, -1 removed lines

@@ -505,7 +505,7 @@
     geoip_close($gi);
 
     if ($selected_country=="") $selected_country="None";
-    if ($selected_country=="None" and $geoip_country!=""){
+    if ($selected_country=="None" and $geoip_country!="") {
         $selected_country=$geoip_country;
     }
 

html/inc/cert.inc

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@
     credit_to_ops($credit, $ops, $unit);
       
     if ($bolden) {
-        $lbold="[[";
-        $rbold="]]";
+        $lbold = "[[";
+        $rbold = "]]";
     } else {
-        $lbold="";        $rbold="";
+        $lbold = ""; $rbold = "";
     } 
     return " $lbold$cobbs Cobblestones$rbold of computation ($ops $unit floating-point operations)";
 }

html/inc/text_transform.inc

Spacing +26 added lines, -26 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)    
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)    
 
     // Constructor - set the defaults.
 
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
     
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc-dev-doc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -272,7 +272,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -280,19 +280,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -300,7 +300,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -325,5 +325,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +5 added lines, -4 removed lines

@@ -272,7 +272,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -283,7 +283,7 @@ 
     $i=0;
     $linkpos=true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
         $linkpos=strpos($text, "<a ", $i);
@@ -300,7 +300,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -318,7 +318,8 @@ 
     foreach ($search as $key => $value) {
         $replace[$key] = "<span class=\"mark\">".$value."</span>";
     }
-    if (substr(phpversion(), 0, 1) > 4) {   // PHP 4.x doesn't support str_ireplace
+    if (substr(phpversion(), 0, 1) > 4) {
+// PHP 4.x doesn't support str_ireplace
         return str_ireplace($search, $replace, $text);
     } else {
         return str_replace($search, $replace, $text);

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

@@ -62,7 +62,7 @@
 // Do the actual transformation of the text.
 // TODO: Make this part of the above class.
 
-function output_transform($text, $options = NULL) {
+function output_transform($text, $options = null) {
     // Options is a output_options object, defined above
     if (!$options) {
         $options = new output_options; // Defaults in the class definition

html/inc/recaptcha_loader.php

Indentation +2 added lines, -2 removed lines

@@ -11,10 +11,10 @@
 
 spl_autoload_register(function ($class) {
     if (substr($class, 0, 10) !== 'ReCaptcha\\') {
-      /* If the class does not lie under the "ReCaptcha" namespace,
+        /* If the class does not lie under the "ReCaptcha" namespace,
        * then we can exit immediately.
        */
-      return;
+        return;
     }
 
     /* All of the classes have names like "ReCaptcha\Foo", so we need

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  * classes.
  */
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     if (substr($class, 0, 10) !== 'ReCaptcha\\') {
       /* If the class does not lie under the "ReCaptcha" namespace,
        * then we can exit immediately.

html/inc/bbcode_convert.inc

Spacing +23 added lines, -23 removed lines

@@ -19,7 +19,7 @@ 
 
 require_once('../inc/sanitize_html.inc');
 
-function image_as_bb($text){
+function image_as_bb($text) {
     // This function depends on sanitized HTML
 
     $pattern = '@<img(.*) src=\"([^>^"]+)\"([^>]*)>@si';
@@ -33,7 +33,7 @@ 
     return $text;
 }
 
-function link_as_bb($text){
+function link_as_bb($text) {
         /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<a href=\"([^>]+)\">@si'; // Gives us the URL in $1...
@@ -49,35 +49,35 @@ 
     return $text;
 }
 
-function formatting_as_bb($text){
+function formatting_as_bb($text) {
         /* This function depends on sanitized HTML */
-    $in[]="<b>";$out[]="[b]";
-    $in[]="</b>";$out[]="[/b]";
+    $in[] = "<b>"; $out[] = "[b]";
+    $in[] = "</b>"; $out[] = "[/b]";
 
-    $in[]="<i>";$out[]="[i]";
-    $in[]="</i>";$out[]="[/i]";
+    $in[] = "<i>"; $out[] = "[i]";
+    $in[] = "</i>"; $out[] = "[/i]";
 
-    $in[]="<u>";$out[]="[u]";
-    $in[]="</u>";$out[]="[/u]";
+    $in[] = "<u>"; $out[] = "[u]";
+    $in[] = "</u>"; $out[] = "[/u]";
 
-    $in[]="<b>";$out[]="[b]";
-    $in[]="</b>";$out[]="[/b]";
+    $in[] = "<b>"; $out[] = "[b]";
+    $in[] = "</b>"; $out[] = "[/b]";
 
-    $in[]="<ul>";$out[]="[list]";
-    $in[]="</ul>";$out[]="[/list]";
+    $in[] = "<ul>"; $out[] = "[list]";
+    $in[] = "</ul>"; $out[] = "[/list]";
 
-    $in[]="<ol>";$out[]="[list=1]";
-    $in[]="</ol>";$out[]="[/list]";
+    $in[] = "<ol>"; $out[] = "[list=1]";
+    $in[] = "</ol>"; $out[] = "[/list]";
 
-    $in[]="<pre>";$out[]="[pre]";
-    $in[]="</pre>";$out[]="[/pre]";
+    $in[] = "<pre>"; $out[] = "[pre]";
+    $in[] = "</pre>"; $out[] = "[/pre]";
 
-    $in[]="</br>";$out[]="\n";
-    $in[]="<br/>";$out[]="\n";
-    $in[]="<br>";$out[]="\n";
-    $in[]="&gt;";$out[]=">";
-    $in[]="&lt;";$out[]="<";
-    $in[]="&amp;";$out[]="&";
+    $in[] = "</br>"; $out[] = "\n";
+    $in[] = "<br/>"; $out[] = "\n";
+    $in[] = "<br>"; $out[] = "\n";
+    $in[] = "&gt;"; $out[] = ">";
+    $in[] = "&lt;"; $out[] = "<";
+    $in[] = "&amp;"; $out[] = "&";
 
     return str_replace($in, $out, $text);
 }

Braces +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 
 require_once('../inc/sanitize_html.inc');
 
-function image_as_bb($text){
+function image_as_bb($text) {
     // This function depends on sanitized HTML
 
     $pattern = '@<img(.*) src=\"([^>^"]+)\"([^>]*)>@si';
@@ -33,7 +33,7 @@ 
     return $text;
 }
 
-function link_as_bb($text){
+function link_as_bb($text) {
         /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<a href=\"([^>]+)\">@si'; // Gives us the URL in $1...
@@ -49,7 +49,7 @@ 
     return $text;
 }
 
-function formatting_as_bb($text){
+function formatting_as_bb($text) {
         /* This function depends on sanitized HTML */
     $in[]="<b>";$out[]="[b]";
     $in[]="</b>";$out[]="[/b]";

html/inc/bolt_ex.inc

Spacing +14 added lines, -14 removed lines

@@ -21,11 +21,11 @@ 
 // The following is a global var accessed by exercise functions.
 //
 $bolt_ex = null;
-$bolt_ex->mode = 0;     // input: SHOW/SCORE/ANSWER
-$bolt_ex->index = 0;    // input: sequence of this exercise in file
-$bolt_ex->score = 0;    // input/output: cumulative score (if mode = SCORE)
-$bolt_ex->weight = 0;   // input/output: cumulative weight
-$bolt_ex->query_string = "";    // user's response (if SCORE or ANSWER)
+$bolt_ex->mode = 0; // input: SHOW/SCORE/ANSWER
+$bolt_ex->index = 0; // input: sequence of this exercise in file
+$bolt_ex->score = 0; // input/output: cumulative score (if mode = SCORE)
+$bolt_ex->weight = 0; // input/output: cumulative weight
+$bolt_ex->query_string = ""; // user's response (if SCORE or ANSWER)
 
 function weight($w) {
     return array('weight', $w);
@@ -170,9 +170,9 @@ 
             $response = isset($$key);
             $r = $choice[1];
             $correct = ($r && $response) || (!$r && !$response);
-            $color = $correct?"#88ff88":"#ff8888";
-            table_row($c, $r?"yes":"no",
-                array($response?"yes":"no", "bgcolor=$color")
+            $color = $correct ? "#88ff88" : "#ff8888";
+            table_row($c, $r ? "yes" : "no",
+                array($response ? "yes" : "no", "bgcolor=$color")
             );
             $i++;
         }
@@ -215,11 +215,11 @@ 
         if ($y > $rect[3]) $right = false;
         $cx = $rect[0];
         $cy = $rect[2];
-        $sizex = $rect[1]-$rect[0];
-        $sizey = $rect[3]-$rect[2];
-        $ax = $x-4;
-        $ay = $y-4;
-        $color = $right?"green":"red";
+        $sizex = $rect[1] - $rect[0];
+        $sizey = $rect[3] - $rect[2];
+        $ax = $x - 4;
+        $ay = $y - 4;
+        $color = $right ? "green" : "red";
         if ($right) {
             echo "The point you selected (shown in green) is correct.";
         } else {
@@ -256,7 +256,7 @@ 
 }
 
 class BoltFitbAnswer {
-    public $type;   // 0=constant, 1=regexp, 2=func
+    public $type; // 0=constant, 1=regexp, 2=func
     public $ans;
     function __construct($type, $ans) {
         $this->type = $type;