BOINC / boinc

html/ops/test_token.php

Indentation +2 added lines, -2 removed lines

@@ -28,13 +28,13 @@
 echo "---------------\n";
 $boincToken = BoincToken::lookup_valid_token(0, $token, 'T');
 if ( $boincToken != null ) {
-   echo "Found valid token\n";
+    echo "Found valid token\n";
 }
 
 echo "---------------\n";
 $boincToken = BoincToken::lookup_valid_token(0, 'notrealtoken', 'T');
 if ( $boincToken == null ) {
-   echo "Successfully didn't find invalid token\n";
+    echo "Successfully didn't find invalid token\n";
 }
 
 echo "---------------\n";

html/user/delete_account_confirm.php

Indentation +3 added lines, -3 removed lines

@@ -32,9 +32,9 @@
     page_head(tra("Delete Account"));
     
     echo "<p>".tra("Thank you for verifying ownership of your account.")."</p>"
-         ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
-         ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
-         ."<br/>";
+            ."<p>".tra("You can now delete your account by entering in your password below and clicking the \"Delete Account\" button.")."</p>"
+            ."<p>".tra("As a reminder, your account <b>cannot be recovered</b> once you delete it.")."</p>"
+            ."<br/>";
     
     form_start(secure_url_base()."delete_account_confirm.php", "post");
     form_input_hidden("token",$token);

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
 require_once("../inc/user_util.inc");
 
 $config = get_config();
-if ( !parse_bool($config, "enable_delete_account") ) {
+if (!parse_bool($config, "enable_delete_account")) {
     error_page(
         tra("This feature is disabled.  Please contact the project administrator.")
     );
@@ -35,7 +35,7 @@ 
     $userid = get_int("id");
     $token = get_str("token");
     $retval = check_delete_account_token($userid, $token);
-    if ( !$retval ) {
+    if (!$retval) {
         error_page(
             tra("The token you used has expired or is otherwise not valid.  Please request a new one <a href=\"delete_account_request.php\">here</a>")
         );
@@ -49,9 +49,9 @@ 
          ."<br/>";
     
     form_start(secure_url_base()."delete_account_confirm.php", "post");
-    form_input_hidden("token",$token);
-    form_input_hidden("id",$userid);
-    form_input_text(tra("Password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
+    form_input_hidden("token", $token);
+    form_input_hidden("id", $userid);
+    form_input_text(tra("Password"), "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd"));
     form_submit(tra("Delete Account"));
     form_end();
     
@@ -63,7 +63,7 @@ 
     $userid = post_int("id");
     $token = post_str("token");
     $retval = check_delete_account_token($userid, $token);
-    if ( !$retval ) {
+    if (!$retval) {
         error_page(
             tra("The token you used has expired or is otherwise not valid.  Please request a new one <a href=\"delete_account_request.php\">here</a>")
         );
@@ -74,7 +74,7 @@ 
     $passwd = post_str("passwd");
     check_passwd_ui($user, $passwd);
     
-    if ( !delete_account($user) ) {
+    if (!delete_account($user)) {
         error_page(
             tra("Failed to delete your account.  Please contact the project administrator.")
         );    

html/inc/user.inc

Spacing +17 added lines, -17 removed lines

@@ -33,13 +33,13 @@ 
 // they've participated in
 //
 function get_other_projects($user) {
-    $cpid = md5($user->cross_project_id . $user->email_addr);
+    $cpid = md5($user->cross_project_id.$user->email_addr);
     $url = "http://boinc.netsoft-online.com/get_user.php?cpid=".$cpid;
 
     // Check the cache for that URL
     //
     $cacheddata = get_cached_data(REMOTE_PROJECTS_TTL, $url);
-    if ($cacheddata){
+    if ($cacheddata) {
         $remote = unserialize($cacheddata);
     } else {
         // Fetch the XML, use curl if fopen() is disallowed
@@ -110,7 +110,7 @@ 
 
 function cmp($a, $b) {
     if ($a->expavg_credit == $b->expavg_credit) return 0;
-    return ($a->expavg_credit < $b->expavg_credit)? 1 : -1;
+    return ($a->expavg_credit < $b->expavg_credit) ? 1 : -1;
 }
 
 function show_other_projects($user, $personal) {
@@ -133,7 +133,7 @@ 
         ),
         array("", ALIGN_RIGHT, ALIGN_RIGHT, ALIGN_RIGHT)
     );
-    foreach($user->projects as $project) {
+    foreach ($user->projects as $project) {
         show_project($project);
     }
     end_table();
@@ -174,7 +174,7 @@ 
     }
 
     if (!NO_STATS) {
-        $cpid = md5($user->cross_project_id . $user->email_addr);
+        $cpid = md5($user->cross_project_id.$user->email_addr);
         $x = "";
         shuffle($cpid_stats_sites);
         foreach ($cpid_stats_sites as $site) {
@@ -262,7 +262,7 @@ 
     } else {
         $delete_account_str = "";
         $config = get_config();
-        if ( parse_bool($config, "enable_delete_account") ) {
+        if (parse_bool($config, "enable_delete_account")) {
             $delete_account_str = " &middot; <a href=\"delete_account_request.php\">".tra("delete account")."</a>";
         }
         
@@ -327,7 +327,7 @@ 
 // show user name, with links to profile if present.
 // if $badge_height is > 0, show badges
 //
-function user_links($user, $badge_height=0) {
+function user_links($user, $badge_height = 0) {
     BoincForumPrefs::lookup($user);
     if (is_banished($user)) {
         return "(banished: ID $user->id)";
@@ -338,7 +338,7 @@ 
         $x .= ' <a href="'.url_base().'view_profile.php?userid='.$user->id.'"><img title="View the profile of '.$user->name.'" src="'.$img_url.'" alt="Profile"></a>';
     }
     $x .= " <a href=\"".url_base()."show_user.php?userid=".$user->id."\">".$user->name."</a>";
-    if (function_exists("project_user_links")){
+    if (function_exists("project_user_links")) {
         $x .= project_user_links($user);
     }
     if ($badge_height) {
@@ -391,7 +391,7 @@ 
 
             // if there's a foundership request, notify the founder
             //
-            if ($user->id==$team->userid && $team->ping_user >0) {
+            if ($user->id == $team->userid && $team->ping_user > 0) {
                 $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</p>";
             }
             row2(tra("Member of team"), $x);
@@ -416,7 +416,7 @@ 
     $x = "<a href=\"user_search.php\">".tra("Find friends")."</a><br/>\n";
     $n = count($friends);
     if ($n) {
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             if (!$fuser) continue;
             $x .= friend_links($fuser);
@@ -459,7 +459,7 @@ 
 // Returns a cacheable community links data object
 // @param user The user to produce a community links object for
 
-function get_community_links_object($user){
+function get_community_links_object($user) {
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
@@ -467,7 +467,7 @@ 
     $cache_object->friends = array();
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
-    foreach($friends as $friend) {
+    foreach ($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
         if (!$fuser) continue;
         $cache_object->friends[] = $fuser;
@@ -475,7 +475,7 @@ 
     return $cache_object;
 }
 
-function community_links($clo, $logged_in_user){
+function community_links($clo, $logged_in_user) {
     $user = $clo->user;
     $team = $clo->team;
     $friends = $clo->friends;
@@ -501,15 +501,15 @@ 
                 "<a href=\"friend.php?action=cancel_confirm&userid=$user->id\">".tra("Cancel friendship")."</a>"
             );
         } else if ($friend) {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
         } else {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
         }
     }
     
     if ($friends) {
         $x = "";
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $x .= friend_links($friend);
         }
         row2(tra("Friends")." (".sizeof($friends).")", $x);
@@ -554,6 +554,6 @@ 
 }
 
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/team.inc

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
     row2(
         tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
-        '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
+        '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
     row2_init(tra('Country'), '');
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
     $country = $params->country;
@@ -48,7 +48,7 @@ 
     echo country_select_options($country);
     echo "</select></td></tr>\n";
     row2(tra('Type of team'), team_type_select($params->type, true));
-    $checked = $params->active?"checked":"";
+    $checked = $params->active ? "checked" : "";
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
     row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
     end_table();
@@ -96,7 +96,7 @@ 
     row2("Created", date_str($team->create_time));
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
         $founder = $team->founder;
-        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
+        row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
     }
     if (strlen($team->url)) {;
         if (strstr($team->url, "http://")) {
@@ -169,7 +169,7 @@ 
     }
     row1(tra('Members'));
     row2(tra('Founder'),
-        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
+        $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
     );
     if (count($team->admins)) {
         $first = true;
@@ -353,7 +353,7 @@ 
         foreach ($deltas as $delta) {
             $u = BoincUser::lookup_id($delta->userid);
             if ($u->teamid == $teamid) {
-                $new_members[] = $u;  // they might have later quit
+                $new_members[] = $u; // they might have later quit
             }
         }
     }
@@ -436,7 +436,7 @@ 
     if (!$user->teamid) return;
     $user->update("teamid=0");
     $team = BoincTeam::lookup_id($user->teamid);
-    if ($team && $team->ping_user==$user->id) {
+    if ($team && $team->ping_user == $user->id) {
         $team->update("ping_user=-ping_user");
     }
     BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
@@ -475,34 +475,34 @@ 
     start_table();
     row2(tra('Team name, text version').'
         <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
-        '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
+        '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
     );
     row2(tra('Team name, HTML version').'
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
-        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
+        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
     );
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
         '.tra('This URL will be linked to from the team\'s page on this site.'),
-        '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
+        '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
     );
     row2(tra('Description of team').':
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         </p>',
-        '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
+        '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
     );
 
-    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
+    row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
 
     row2_init(tra('Country'),
         '<select class="form-control" name="country">'
     );
-    echo country_select_options($team?$team->country:null);
+    echo country_select_options($team ? $team->country : null);
 
     echo "</select></td></tr>\n";
-    $x = (!$team || $team->joinable)?"checked":"";
+    $x = (!$team || $team->joinable) ? "checked" : "";
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
     // Check if we're using reCaptcha to prevent spam accounts
     //
@@ -566,12 +566,12 @@ 
 //
 function new_transfer_request_ok($team, $now) {
     if ($team->ping_user <= 0) {
-        if ($team->ping_time < $now - 60 * 86400) {
+        if ($team->ping_time < $now - 60*86400) {
             return true;
         }
         return false;
     }
-    if ($team->ping_time < $now - 90 * 86400) {
+    if ($team->ping_time < $now - 90*86400) {
         return true;
     }
     return false;
@@ -606,7 +606,7 @@ 
     if (!is_valid_country($country)) {
         $country = tra('None');
     }
-    $country = BoincDb::escape_string($country);  // for Cote d'Ivoire
+    $country = BoincDb::escape_string($country); // for Cote d'Ivoire
 
     $clause = sprintf(
         "(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
@@ -629,6 +629,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/user_util.inc

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 }
 
 function check_passwd_ui($user, $passwd) {
-		$passwd_hash = md5($passwd.$user->email_addr);
+        $passwd_hash = md5($passwd.$user->email_addr);
     if( !check_passwd_hash($user, $passwd_hash) ) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         page_head("Password incorrect");

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 
 function check_passwd_ui($user, $passwd) {
 		$passwd_hash = md5($passwd.$user->email_addr);
-    if( !check_passwd_hash($user, $passwd_hash) ) {
+    if (!check_passwd_hash($user, $passwd_hash)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         page_head("Password incorrect");
         echo "The password you entered is incorrect. Please go back and try again.\n";
@@ -68,7 +68,7 @@ 
 function is_banned_email_addr($email_addr) {
     global $banned_email_domains;
     if (isset($banned_email_domains)) {
-        foreach($banned_email_domains as $d) {
+        foreach ($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
             if ($x == $d) return true;
         }
@@ -96,7 +96,7 @@ 
 //
 function make_user(
     $email_addr, $name, $passwd_hash,
-    $country=null, $postal_code=null, $project_prefs=null, $teamid=0
+    $country = null, $postal_code = null, $project_prefs = null, $teamid = 0
 ) {
     if (!is_valid_email_addr($email_addr)) return null;
     if (is_banned_email_addr($email_addr)) return null;
@@ -224,7 +224,7 @@ 
         show_error(tra("Passwords may only include ASCII characters."));
     }
 
-    if (strlen($passwd)<$min_passwd_length) {
+    if (strlen($passwd) < $min_passwd_length) {
         show_error(
             tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length)
         );

html/inc/token.inc

Doc Comments +7 added lines

@@ -27,6 +27,10 @@ 
 define("TOKEN_DURATION_ONE_DAY", 86400);
 define("TOKEN_DURATION_ONE_WEEK", 604800);
 
+/**
+ * @param string $type
+ * @param integer $duration
+ */
 function create_token($userid, $type, $duration) {
     $token = random_string();
     $now = time();
@@ -46,6 +50,9 @@ 
     return $result;
 }
 
+/**
+ * @param string $type
+ */
 function is_valid_token($userid, $token, $type) {
     $boincToken = BoincToken::lookup_valid_token($userid, $token, $type);
     if ( $boincToken == null ) {

html/ops/delete_user.php

Spacing +3 added lines, -3 removed lines

@@ -27,17 +27,17 @@
 
 die("Delete this line first\n");
 $config = get_config();
-if ( !parse_bool($config, "enable_delete_account") ) {
+if (!parse_bool($config, "enable_delete_account")) {
     die(tra("This feature is disabled.  Please enable it in the config.xml."));
 }
 
-$id = (int) $argv[1];
+$id = (int)$argv[1];
 
 $user = BoincUser::lookup_id($id);
 if (!$user) die("no such user\n");
 
 $retval = delete_account($user);
-if ( $retval ) {
+if ($retval) {
     echo tra("User deleted");
 } else {
     echo tra("Failed to delete user");

html/user/delete_account_request.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 require_once("../inc/email.inc");
 
 $config = get_config();
-if ( !parse_bool($config, "enable_delete_account") ) {
+if (!parse_bool($config, "enable_delete_account")) {
     error_page(
         tra("This feature is disabled.  Please contact the project administrator.")
     );
@@ -48,7 +48,7 @@ 
         ."</ul><br/>";
     
     form_start(secure_url_base()."delete_account_request.php", "post");
-    form_input_text(tra("Password"), "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd"));
+    form_input_text(tra("Password"), "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd"));
     form_submit(tra("Send Confirmation Email"));
     form_end();
     

html/inc/email.inc

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
 
 // send an email, using PHPMailer or not.
 //
-function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
+function send_email($user, $subject, $body, $body_html = null, $email_addr = null) {
     if (function_exists("make_php_mailer")) {
         if (file_exists("../inc/PHPMailer/src/PHPMailer.php") && file_exists("../inc/PHPMailer/src/SMTP.php")) {
             require_once("../inc/PHPMailer/src/PHPMailer.php");
@@ -57,11 +57,11 @@ 
             return true;
         }
     } else {
-        $headers ="";
+        $headers = "";
         if (defined('EMAIL_FROM') && defined('EMAIL_FROM_NAME')) {
             $headers = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM.">";
         } else if (defined('EMAIL_FROM')) {
-            $headers = "From: ". EMAIL_FROM;
+            $headers = "From: ".EMAIL_FROM;
         }
         if ($email_addr) {
             return mail($email_addr, $subject, $body, $headers);
@@ -140,7 +140,7 @@ 
     if (defined("USE_STOPFORUMSPAM") && USE_STOPFORUMSPAM && array_key_exists('REMOTE_ADDR', $_SERVER)) {
         $ip = $_SERVER['REMOTE_ADDR'];
         // For obviously private IPs check just the email against SFS, otherwise check both IP and email
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE|FILTER_FLAG_NO_RES_RANGE)) {
             $x = @file_get_contents("https://www.stopforumspam.com/api?ip=".$ip."&email=".$addr);
         } else {
             $x = @file_get_contents("https://www.stopforumspam.com/api?email=".$addr);
@@ -151,12 +151,12 @@ 
     }
     $pattern = '/^([^@]+)@([^@\.]+)\.([^@]{2,})$/';
     $match = preg_match($pattern, $addr);
-    return (bool) $match;
+    return (bool)$match;
 }
 
 function send_confirm_delete_email($user) {
     $token = create_token($user->id, TOKEN_TYPE_DELETE_ACCOUNT, TOKEN_DURATION_ONE_DAY);
-    if ( $token === null ) {
+    if ($token === null) {
         error_page("Error creating token.  Please try again later.");
     }