BOINC / boinc

html/inc/user_util.inc

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

@@ -177,14 +177,14 @@ 
     }
 
     // Check if consent to terms of use has been given.
-    $myconsent = FALSE;
+    $myconsent = false;
     list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
     if ($checkct and check_termsofuse()) {
         $agree = post_str("agree_to_terms_of_use", true);
         if (!$agree) {
             error_page(tra("You have not agreeed to our terms of use. Please agree to the terms of use by navigating back to the previous page, in order to create your account"));
         }
-        $myconsent = TRUE;
+        $myconsent = true;
     }
 
     // see whether the new account should be pre-enrolled in a team,
@@ -195,7 +195,7 @@ 
         $team = BoincTeam::lookup_id($teamid);
         $clone_user = BoincUser::lookup_id($team->userid);
         if (!$clone_user) {
-            error_page("User $userid not found");
+            error_page("user $userid not found");
         }
         $project_prefs = $clone_user->project_prefs;
     } else {

html/inc/consent.inc

Spacing +6 added lines, -6 removed lines

@@ -21,18 +21,18 @@ 
 include_once("../inc/boinc_db.inc");
 include_once("../inc/util.inc");
 
-define('CONSENT_TYPE_ENROLL','ENROLL');
+define('CONSENT_TYPE_ENROLL', 'ENROLL');
 
 function consent_to_a_policy($user, $consent_type_id, $consent_flag, $consent_not_required, $source, $ctime = 0) {
     $mys = BoincDb::escape_string($source);
-    if ($ctime==0) {
+    if ($ctime == 0) {
         $mytime = $user->create_time;
     }
     else {
         $mytime = $ctime;
     }
     return BoincConsent::insert(
-        "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) " .
+        "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) ".
         "values($user->id, $consent_type_id, $mytime, $consent_flag, $consent_not_required, '$mys')"
     );
 
@@ -56,9 +56,9 @@ 
 // if checkenabled=TRUE, if the consent_type is enabled/available for
 // use. The integer is the consent_type_id- the id from consent_type
 // table. If the boolean is FALSE, the integer returned is -1.
-function check_consent_type($name, $checkenabled=TRUE) {
+function check_consent_type($name, $checkenabled = TRUE) {
     $ct = BoincConsentType::lookup("shortname = '{$name}'");
-    if ($ct and ( !$checkenabled or ($ct->enabled)) ) {
+    if ($ct and (!$checkenabled or ($ct->enabled))) {
         return array(TRUE, $ct->id);
     }
     return array(FALSE, -1);
@@ -70,7 +70,7 @@ 
 function intercept_login($user, $perm, $in_next_url = "") {
     list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
     $config = get_config();
-    if ( parse_bool($config, "enable_login_mustagree_termsofuse") and $checkct and check_termsofuse() and (!check_user_consent($user, CONSENT_TYPE_ENROLL))) {
+    if (parse_bool($config, "enable_login_mustagree_termsofuse") and $checkct and check_termsofuse() and (!check_user_consent($user, CONSENT_TYPE_ENROLL))) {
         // sent user to terms-of-use Web form after login
         send_cookie('tempuserid', $user->id, false);
         send_cookie('tempperm', $perm, false);

Braces +2 added lines, -4 removed lines

@@ -27,8 +27,7 @@ 
     $mys = BoincDb::escape_string($source);
     if ($ctime==0) {
         $mytime = $user->create_time;
-    }
-    else {
+    } else {
         $mytime = $ctime;
     }
     return BoincConsent::insert(
@@ -76,8 +75,7 @@ 
         send_cookie('tempperm', $perm, false);
         $save_url = $in_next_url;
         return "user_agreetermsofuse.php?next_url=$save_url";
-    }
-    else {
+    } else {
         send_cookie('auth', $user->authenticator, $perm);
         return $in_next_url;
     }

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

@@ -44,10 +44,10 @@ 
     if ($checkct) {
         $consent_result = BoincLatestConsent::lookup("userid={$user->id} AND consent_type_id=$ctid AND consent_flag=1");
         if ($consent_result) {
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
 
 // Checks to see if a particular consent_type name is in
@@ -56,12 +56,12 @@ 
 // if checkenabled=TRUE, if the consent_type is enabled/available for
 // use. The integer is the consent_type_id- the id from consent_type
 // table. If the boolean is FALSE, the integer returned is -1.
-function check_consent_type($name, $checkenabled=TRUE) {
+function check_consent_type($name, $checkenabled=true) {
     $ct = BoincConsentType::lookup("shortname = '{$name}'");
     if ($ct and ( !$checkenabled or ($ct->enabled)) ) {
-        return array(TRUE, $ct->id);
+        return array(true, $ct->id);
     }
-    return array(FALSE, -1);
+    return array(false, -1);
 }
 
 // When a user uses the Web site to login, this funtion checks the

html/ops/team_import.php

Braces +4 added lines, -8 removed lines

@@ -64,8 +64,7 @@ 
             $t->user_postal_code = decode($t->user_postal_code);
             $t->user_url = decode($t->user_url);
             return $t;
-        }
-        else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
+        } else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
         else if (strstr($s, '<url>')) $t->url = parse_element($s, '<url>');
         else if (strstr($s, '<type>')) $t->type = parse_element($s, '<type>');
         else if (strstr($s, '<name_html>')) $t->name_html = parse_element($s, '<name_html>');
@@ -74,14 +73,12 @@ 
                 if (strstr($s, '</description>')) break;
                 $t->description .= $s;
             }
-        }
-        else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
+        } else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
         else if (strstr($s, '<id>')) $t->id = parse_element($s, '<id>');
         else if (strstr($s, '<user_email_munged>')) {
             $user_email_munged = parse_element($s, '<user_email_munged>');
             $t->user_email = str_rot13($user_email_munged);
-        }
-        else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
+        } else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
         else if (strstr($s, '<user_country>')) $t->user_country = parse_element($s, '<user_country>');
         else if (strstr($s, '<user_postal_code>')) $t->user_postal_code = parse_element($s, '<user_postal_code>');
         else if (strstr($s, '<user_url>')) $t->user_url = parse_element($s, '<user_url>');
@@ -140,8 +137,7 @@ 
         list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
         if ($checkct) {
             echo "   cannot make user when an consent to terms of use is required\n";
-        }
-        else {
+        } else {
             echo "   making user $t->user_email\n";
             $user = make_user($t->user_email, $t->user_name, random_string());
             if (!$user) {

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

@@ -135,7 +135,7 @@ 
         echo "   making team $t->name\n";
         return;
     }
-    $make_user = FALSE;
+    $make_user = false;
     if (!$user) {
         list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL);
         if ($checkct) {
@@ -148,7 +148,7 @@ 
                 echo "   Can't make user $t->user_email\n";
                 return;
             }
-            $make_user = TRUE;
+            $make_user = true;
         }
     }
     echo "   making team $t->name\n";
@@ -228,7 +228,7 @@ 
         return;
     }
 
-    echo "Processing $t->name $t->user_email\n";
+    echo "processing $t->name $t->user_email\n";
     $user = BoincUser::lookup_email_addr($t->user_email);
     $team = BoincTeam::lookup_name($t->name);
     if ($team) {