BOINC / boinc

html/user/user_agreetermsofuse_action.php

Braces +2 added lines, -4 removed lines

@@ -50,14 +50,12 @@
 }
 if (isset($_COOKIE['tempuserid'])) {
     $userid = $_COOKIE['tempuserid'];
-}
-else {
+} else {
     error_page(tra("Website error when attempting to agree to terms of use. Please contact the site administrators."));
 }
 if (isset($_COOKIE['tempperm'])) {
     $perm = $_COOKIE['tempperm'];
-}
-else {
+} else {
     error_page(tra("Website error when attempting to agree to terms of use. Please contact the site administrators."));
 }
 

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
         $mytoken = create_token($user->id, TOKEN_TYPE_LOGIN_INTERCEPT, TOKEN_DURATION_TWO_HOURS);
         send_cookie('logintoken', $mytoken, false);