BOINC / boinc

html/inc/forum_db.inc

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
         $db = BoincDb::get();
         return $db->lookup('category', 'BoincCategory', $clause);
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('category', 'BoincCategory', $clause);
     }
@@ -78,7 +78,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'thread', $clause);
     }
-    static function enum($clause="") {
+    static function enum($clause = "") {
         $db = BoincDb::get();
         return $db->enum('thread', 'BoincThread', $clause);
     }
@@ -142,7 +142,7 @@ 
         $db = BoincDb::get();
         $ret = $db->insert('forum_preferences', $clause);
     }
-    static function lookup(&$user, $nocache=false) {
+    static function lookup(&$user, $nocache = false) {
         if (!$user) return;
         if (isset($user->prefs)) return;
         if (!$nocache && isset(self::$cache[$user->id])) {
@@ -164,7 +164,7 @@ 
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+         return (substr($this->special_user, $specialbit, 1) == 1);
     }
     function update($clause) {
         $db = BoincDb::get();
@@ -175,7 +175,7 @@ 
         $db = BoincDb::get();
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
     }
@@ -215,8 +215,8 @@ 
         //
         $fl = BoincForumLogging::lookup(0, 0);
         if ($fl) {
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
-                BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
+            if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) {
+                BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0");
                 BoincForumLogging::replace(0, 0, time());
             }
         } else {
@@ -326,10 +326,10 @@ 
     }
 }
 
-define ('NOTIFY_FRIEND_REQ', 1);
-define ('NOTIFY_FRIEND_ACCEPT', 2);
-define ('NOTIFY_PM', 3);
-define ('NOTIFY_SUBSCRIBED_THREAD', 4);
-define ('NOTIFY_SUBSCRIBED_FORUM', 5);
+define('NOTIFY_FRIEND_REQ', 1);
+define('NOTIFY_FRIEND_ACCEPT', 2);
+define('NOTIFY_PM', 3);
+define('NOTIFY_SUBSCRIBED_THREAD', 4);
+define('NOTIFY_SUBSCRIBED_FORUM', 5);
 
 ?>

html/inc/forum_email.inc

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
 // - project forums: everyone in POST_REPORT_EMAILS
 // - team message board: team founder and admins
 //
-function mail_report_list($forum, $subject, $body, $must_send=false) {
+function mail_report_list($forum, $subject, $body, $must_send = false) {
     $success = true;
     switch ($forum->parent_type) {
     case 0:
@@ -65,7 +65,7 @@ 
 function send_moderation_email($forum, $post, $thread, $explanation, $action) {
     global $master_url;
 
-    $moderator=get_logged_in_user();
+    $moderator = get_logged_in_user();
     $body = "";
     $user = BoincUser::lookup_id($post->user);
 
@@ -126,11 +126,11 @@ 
 // There's a new post in the thread, which the user is subscribed to.
 // send them an email notifying them.
 //
-function send_thread_notification_email($thread, $user){
-    $title = PROJECT . ": there is a new post in '". $thread->title ."'";
-    $link = secure_url_base() . "forum_thread.php?id=" . $thread->id;
-    $body = "A " . PROJECT . " user has posted to the thread
-\"" . $thread->title . "\".\n"
+function send_thread_notification_email($thread, $user) {
+    $title = PROJECT.": there is a new post in '".$thread->title."'";
+    $link = secure_url_base()."forum_thread.php?id=".$thread->id;
+    $body = "A ".PROJECT." user has posted to the thread
+\"" . $thread->title."\".\n"
            ."To view the updated thread, visit:\n$link
 
 --------------------------
@@ -144,11 +144,11 @@ 
 // There's a new thread in the forum, which the user is subscribed to.
 // send them an email notifying them.
 //
-function send_forum_notification_email($forum, $user){
-    $title = PROJECT . ": there is a new thread in '". $forum->title ."'";
-    $link = secure_url_base() . "forum_forum.php?id=" . $forum->id;
-    $body = "A " . PROJECT . " user has added a thread to the forum
-\"" . $thread->title . "\".\n"
+function send_forum_notification_email($forum, $user) {
+    $title = PROJECT.": there is a new thread in '".$forum->title."'";
+    $link = secure_url_base()."forum_forum.php?id=".$forum->id;
+    $body = "A ".PROJECT." user has added a thread to the forum
+\"" . $thread->title."\".\n"
            ."To view the updated forum, visit:\n$link
 
 --------------------------
@@ -161,7 +161,7 @@ 
 
 //////////////////// a user clicks the red "x" to report a post ///////////
 //
-function send_report_post_email($user, $forum, $thread,  $post, $message) {
+function send_report_post_email($user, $forum, $thread, $post, $message) {
 	global $master_url;
 
     $body = "";
@@ -219,16 +219,16 @@ 
 //
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
 	global $master_url;
-    $now=time();
+    $now = time();
     $subject = PROJECT." banishment vote underway";
     $vote_url = $master_url."forum_banishment_vote.php";
     $body = "
 A vote has been started to banish you
 from the ".PROJECT." message boards until ".date('M j,
-Y G:i', $duration+$now).",
+Y G:i', $duration + $now).",
 because your postings have not followed our guidelines.
 
-This vote will last until ".date('M j, Y G:i',$end_time)." or until a majority
+This vote will last until ".date('M j, Y G:i', $end_time)." or until a majority
 decision has been reached.  If the vote does not result in banishment, you will be
 able to resume posting at that time.
     ";

html/ops/delete_user.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 die("Delete this line first\n");
 
 if (is_numeric($argv[1])) {
-    $user = BoincUser::lookup_id((int) $argv[1]);
+    $user = BoincUser::lookup_id((int)$argv[1]);
     if (!$user) die("no such user\n");
     $retval = delete_account($user);
     if ($retval) {

html/inc/boinc_db.inc

Spacing +19 added lines, -19 removed lines

@@ -44,8 +44,8 @@ 
 // close() closes the connection.
 
 class BoincDb {
-    static $instance;       // a DbConn object, or null
-    static $dbnum;          // which replica we're connected to
+    static $instance; // a DbConn object, or null
+    static $dbnum; // which replica we're connected to
 
     // connect to DB $dbnum (0, 1, ...)
     // If the requested DB doesn't exist or connection fails, connect to DB 0.
@@ -56,7 +56,7 @@ 
         self::$instance = null;
         $config = get_config();
         if ($dbnum) {
-            $r = $dbnum==1?'':strval($dbnum);
+            $r = $dbnum == 1 ? '' : strval($dbnum);
             $host = parse_config($config, sprintf('<replica%s_db_host>', $r));
             $name = parse_config($config, sprintf('<replica%s_db_name>', $r));
             $user = parse_config($config, sprintf('<replica%s_db_user>', $r));
@@ -201,11 +201,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -255,7 +255,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -280,7 +280,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -318,11 +318,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -444,7 +444,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -502,11 +502,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -901,12 +901,12 @@ 
         return $db->enum('consent', 'BoincConsent', $where_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent', $clause);
     }
@@ -931,17 +931,17 @@ 
         return $db->lookup('consent_type', 'BoincConsentType', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('consent_type', 'BoincConsentType', $where_clause, $order_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent_type', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent_type', $clause);
     }
@@ -967,7 +967,7 @@ 
         return $db->lookup('latest_consent', 'BoincLatestConsent', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('latest_consent', 'BoincLatestConsent', $where_clause, $order_clause);
     }
@@ -978,7 +978,7 @@ 
 // apply this to any user-supplied strings used in queries
 //
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);

html/user/server_status.php

Spacing +9 added lines, -9 removed lines

@@ -180,7 +180,7 @@ 
             $avg = round($app->info->avg, 2);
             $min = round($app->info->min, 2);
             $max = round($app->info->max, 2);
-            $x = $max?"$avg ($min - $max)":"---";
+            $x = $max ? "$avg ($min - $max)" : "---";
             $u = $app->info->users;
         } else {
             $x = '---';
@@ -275,7 +275,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -316,12 +316,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -331,7 +331,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -343,14 +343,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -361,7 +361,7 @@ 
     $y = new StdClass;
     $y->cmd = "Scheduler";
     $y->host = $sched_host;
-    $y->status = !file_exists("../../stop_sched");;
+    $y->status = !file_exists("../../stop_sched"); ;
     $local_daemons[] = $y;
 
     foreach ($daemons->daemon as $d) {
@@ -374,7 +374,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

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 (!$email_addr) {
         $email_addr = $user->email_addr;
     }
@@ -69,17 +69,17 @@ 
             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 ($body_html) {
             $body = "<html><body>\n";
             $body .= $body_html;
             $body .= "\n</body></html>\n";
-            $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";
+            $headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";
         }
         return mail($email_addr, $subject, $body, $headers);
     }
@@ -160,7 +160,7 @@ 
     // otherwise check both IP and email
     if ($ip && filter_var(
         $ip, FILTER_VALIDATE_IP,
-        FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
+        FILTER_FLAG_NO_PRIV_RANGE|FILTER_FLAG_NO_RES_RANGE
     )) {
         $x = @file_get_contents("https://www.stopforumspam.com/api?ip=".$ip."&email=".$addr);
     } else {
@@ -205,7 +205,7 @@ 
     return md5($key.'oogabooga');
 }
 
-function opt_out_url($user, $page="opt_out.php") {
+function opt_out_url($user, $page = "opt_out.php") {
     return sprintf("%s%s?code=%s&userid=%d",
         secure_url_base(),
         $page,

html/inc/user_util.inc

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,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";
@@ -69,7 +69,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;
         }
@@ -108,7 +108,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_syntax($email_addr)) return null;
         // caller generally has already checked
@@ -243,7 +243,7 @@ 
             $users = BoincUser::enum(
                 sprintf("name like '%s%%'", $new_name)
             );
-            foreach ($users as $u){
+            foreach ($users as $u) {
                 echo "<p>$u->name\n";
             }
             page_tail();
@@ -278,7 +278,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/user/user_permissions.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
     start_table('table-striped');
 
     $x = ['User'];
-    for ($i=0; $i<S_NFLAGS; $i++) {
+    for ($i = 0; $i < S_NFLAGS; $i++) {
         $x[] = $special_user_bitfield[$i];
     }
     $x[] = '';
@@ -42,9 +42,9 @@ 
             $pref->userid
         );
         $x = ["$user->name ($user->id)"];
-        for ($j=0; $j<S_NFLAGS; $j++) {
+        for ($j = 0; $j < S_NFLAGS; $j++) {
             $bit = substr($pref->special_user, $j, 1);
-            $c = ($bit == 1)?"checked":"";
+            $c = ($bit == 1) ? "checked" : "";
             $x[] = sprintf(
                 '<input type="checkbox" name="role%d" value="1" %s>',
                 $j, $c
@@ -57,7 +57,7 @@ 
 
     echo '<form action="user_permissions.php" method="POST">';
     $x = ['Add User ID: <input type="text" name="userid" size="6">'];
-    for ($j=0; $j<S_NFLAGS; $j++) {
+    for ($j = 0; $j < S_NFLAGS; $j++) {
         $x[] = sprintf(
             '<input type="checkbox" name="role%d" value="1">',
             $j
@@ -77,7 +77,7 @@ 
     if (!$user) error_page('no user');
     BoincForumPrefs::lookup($user);
 
-    for ($i=0; $i<S_NFLAGS; $i++) {
+    for ($i = 0; $i < S_NFLAGS; $i++) {
         if (post_int("role$i", true) == 1) {
             $bitset .= '1';
             echo "<br> setting $i";
@@ -103,5 +103,5 @@ 
     user_permissions_form();
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/ops/botnet.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 //      add other criteria like # of countries (based on IP addr)
 //      consider only hosts with recent last RPC time
 
-define ('MAX_HOSTS', 100);
+define('MAX_HOSTS', 100);
 
 require_once('../inc/boinc_db.inc');