@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | function send_friend_request_email($src_user, $dest_user, $msg) { |
| 53 | - $message = " |
|
| 53 | + $message = " |
|
| 54 | 54 | $src_user->name has added you as a friend at ".PROJECT.". |
| 55 | 55 | "; |
| 56 | 56 | if (strlen($msg)) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | function send_friend_accept_email($dest_user, $src_user, $msg) { |
| 75 | - $message = " |
|
| 75 | + $message = " |
|
| 76 | 76 | $dest_user->name has confirmed you as a friend at ".PROJECT.". |
| 77 | 77 | "; |
| 78 | 78 | if (strlen($msg)) { |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // Some of this should be merged with translation.inc |
| 21 | 21 | |
| 22 | 22 | function get_lang_list() { |
| 23 | - if (isset($_COOKIE['lang'])){ |
|
| 23 | + if (isset($_COOKIE['lang'])) { |
|
| 24 | 24 | $language_string = $_COOKIE['lang'].","; |
| 25 | 25 | } else { |
| 26 | 26 | $language_string = ''; |
@@ -28,28 +28,28 @@ discard block |
||
| 28 | 28 | if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { |
| 29 | 29 | $language_string .= strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]); |
| 30 | 30 | } |
| 31 | - $client_languages = explode(",",$language_string); |
|
| 31 | + $client_languages = explode(",", $language_string); |
|
| 32 | 32 | |
| 33 | 33 | $lang_list = array(); |
| 34 | - for ($i=0; $i<sizeof($client_languages); $i++) { |
|
| 35 | - if ((strlen($client_languages[$i])>2) |
|
| 36 | - && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-")) |
|
| 34 | + for ($i = 0; $i < sizeof($client_languages); $i++) { |
|
| 35 | + if ((strlen($client_languages[$i]) > 2) |
|
| 36 | + && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")) |
|
| 37 | 37 | { |
| 38 | 38 | // If this is defined as primary-secondary, represent it as xx_YY |
| 39 | 39 | // |
| 40 | 40 | $language = substr( |
| 41 | - $client_languages[$i],0,2)."_".strtoupper(substr($client_languages[$i],3,2) |
|
| 41 | + $client_languages[$i], 0, 2)."_".strtoupper(substr($client_languages[$i], 3, 2) |
|
| 42 | 42 | ); |
| 43 | 43 | $lang_list[] = $language; |
| 44 | 44 | |
| 45 | 45 | // And also check for the primary language |
| 46 | 46 | // |
| 47 | - $language = substr($client_languages[$i],0,2); |
|
| 47 | + $language = substr($client_languages[$i], 0, 2); |
|
| 48 | 48 | $lang_list[] = $language; |
| 49 | 49 | } else { |
| 50 | 50 | // else just use xx |
| 51 | 51 | // |
| 52 | - $language = substr($client_languages[$i],0,2); |
|
| 52 | + $language = substr($client_languages[$i], 0, 2); |
|
| 53 | 53 | $lang_list[] = $language; |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // Some of this should be merged with translation.inc |
| 21 | 21 | |
| 22 | 22 | function get_lang_list() { |
| 23 | - if (isset($_COOKIE['lang'])){ |
|
| 23 | + if (isset($_COOKIE['lang'])) { |
|
| 24 | 24 | $language_string = $_COOKIE['lang'].","; |
| 25 | 25 | } else { |
| 26 | 26 | $language_string = ''; |
@@ -33,8 +33,7 @@ discard block |
||
| 33 | 33 | $lang_list = array(); |
| 34 | 34 | for ($i=0; $i<sizeof($client_languages); $i++) { |
| 35 | 35 | if ((strlen($client_languages[$i])>2) |
| 36 | - && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-")) |
|
| 37 | - { |
|
| 36 | + && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-")) { |
|
| 38 | 37 | // If this is defined as primary-secondary, represent it as xx_YY |
| 39 | 38 | // |
| 40 | 39 | $language = substr( |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | return; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - $news_date=gmdate('D, d M Y H:i:s',$notify->create_time) . ' GMT'; |
|
| 49 | + $news_date = gmdate('D, d M Y H:i:s', $notify->create_time).' GMT'; |
|
| 50 | 50 | echo "<item> |
| 51 | 51 | <title><![CDATA[$title]]></title> |
| 52 | 52 | <guid>".url_base()."_notify_$notify->id</guid> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $master_url_enc = urlencode($master_url); |
| 28 | 28 | $response = akismet_request("key=$key&blog=$master_url_enc", "rest.akismet.com", "/1.1/verify-key"); |
| 29 | - if ("valid" == $response[1] ) { |
|
| 29 | + if ("valid" == $response[1]) { |
|
| 30 | 30 | $post = urlencode($post); |
| 31 | 31 | $ip = urlencode($_SERVER['REMOTE_ADDR']); |
| 32 | 32 | $referrer = urlencode($_SERVER['HTTP_REFERER']); |
@@ -56,15 +56,15 @@ discard block |
||
| 56 | 56 | $http_request = "POST $path HTTP/1.0\r\n"; |
| 57 | 57 | $http_request .= "Host: $host\r\n"; |
| 58 | 58 | $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n"; |
| 59 | - $http_request .= "Content-Length: " . strlen($request) . "\r\n"; |
|
| 59 | + $http_request .= "Content-Length: ".strlen($request)."\r\n"; |
|
| 60 | 60 | $http_request .= "User-Agent: BOINC | Akismet 1.1\r\n"; |
| 61 | 61 | $http_request .= "\r\n"; |
| 62 | 62 | $http_request .= $request; |
| 63 | 63 | |
| 64 | 64 | $response = ''; |
| 65 | - if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) { |
|
| 65 | + if (false !== ($fs = @fsockopen($host, $port, $errno, $errstr, 3))) { |
|
| 66 | 66 | fwrite($fs, $http_request); |
| 67 | - while ( !feof($fs) ) |
|
| 67 | + while (!feof($fs)) |
|
| 68 | 68 | $response .= fgets($fs, 1160); // One TCP-IP packet |
| 69 | 69 | fclose($fs); |
| 70 | 70 | $response = explode("\r\n\r\n", $response, 2); |
@@ -42,7 +42,8 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $response = akismet_request($request, "$key.rest.akismet.com", "/1.1/comment-check"); |
| 44 | 44 | |
| 45 | - if ("true" == $response[1]) { // Akismet says it's spam |
|
| 45 | + if ("true" == $response[1]) { |
|
| 46 | +// Akismet says it's spam |
|
| 46 | 47 | return false; |
| 47 | 48 | } else { |
| 48 | 49 | return true; |
@@ -64,8 +65,10 @@ discard block |
||
| 64 | 65 | $response = ''; |
| 65 | 66 | if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) { |
| 66 | 67 | fwrite($fs, $http_request); |
| 67 | - while ( !feof($fs) ) |
|
| 68 | - $response .= fgets($fs, 1160); // One TCP-IP packet |
|
| 68 | + while ( !feof($fs) ) { |
|
| 69 | + $response .= fgets($fs, 1160); |
|
| 70 | + } |
|
| 71 | + // One TCP-IP packet |
|
| 69 | 72 | fclose($fs); |
| 70 | 73 | $response = explode("\r\n\r\n", $response, 2); |
| 71 | 74 | } |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | function akismet_request($request, $host, $path, $port = 80) { |
| 56 | - $http_request = "POST $path HTTP/1.0\r\n"; |
|
| 56 | + $http_request = "post $path HTTP/1.0\r\n"; |
|
| 57 | 57 | $http_request .= "Host: $host\r\n"; |
| 58 | 58 | $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n"; |
| 59 | 59 | $http_request .= "Content-Length: " . strlen($request) . "\r\n"; |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | class views_handler_argument_boincteam_id extends views_handler_argument_numeric { |
| 10 | - function construct() { |
|
| 10 | + function construct() { |
|
| 11 | 11 | parent::construct(); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function set_argument($arg) { |
|
| 14 | + function set_argument($arg) { |
|
| 15 | 15 | // When setting the ID argument, convert to BOINC ID |
| 16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
| 17 | 17 | $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id)); |
| 18 | 18 | $this->argument = $boinc_id; |
| 19 | 19 | return $this->validate_arg($boinc_id); |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | class views_handler_argument_boincuser_id extends views_handler_argument_numeric { |
| 10 | - function construct() { |
|
| 10 | + function construct() { |
|
| 11 | 11 | parent::construct(); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function set_argument($arg) { |
|
| 14 | + function set_argument($arg) { |
|
| 15 | 15 | // When setting the ID argument, convert to BOINC ID |
| 16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
| 17 | 17 | $boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id)); |
| 18 | 18 | $this->argument = $boinc_id; |
| 19 | 19 | return $this->validate_arg($boinc_id); |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -7,15 +7,15 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | class views_handler_argument_boincteam_id extends views_handler_argument_numeric { |
| 10 | - function construct() { |
|
| 10 | + function construct() { |
|
| 11 | 11 | parent::construct(); |
| 12 | - } |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function set_argument($arg) { |
|
| 14 | + function set_argument($arg) { |
|
| 15 | 15 | // When setting the ID argument, convert to BOINC ID |
| 16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
| 17 | 17 | $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id)); |
| 18 | 18 | $this->argument = $boinc_id; |
| 19 | 19 | return $this->validate_arg($boinc_id); |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $bitset = ''; |
| 27 | 27 | |
| 28 | 28 | for ($i=0;$i<S_NFLAGS;$i++) { |
| 29 | - if (post_int("role".$i, TRUE) == '1') { |
|
| 29 | + if (post_int("role".$i, true) == '1') { |
|
| 30 | 30 | $bitset = str_pad($bitset, $i+1, '1'); |
| 31 | 31 | } else { |
| 32 | 32 | $bitset = str_pad($bitset, $i+1, '0'); |
@@ -25,11 +25,11 @@ |
||
| 25 | 25 | |
| 26 | 26 | $bitset = ''; |
| 27 | 27 | |
| 28 | -for ($i=0;$i<S_NFLAGS;$i++) { |
|
| 28 | +for ($i = 0; $i < S_NFLAGS; $i++) { |
|
| 29 | 29 | if (post_int("role".$i, TRUE) == '1') { |
| 30 | - $bitset = str_pad($bitset, $i+1, '1'); |
|
| 30 | + $bitset = str_pad($bitset, $i + 1, '1'); |
|
| 31 | 31 | } else { |
| 32 | - $bitset = str_pad($bitset, $i+1, '0'); |
|
| 32 | + $bitset = str_pad($bitset, $i + 1, '0'); |
|
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | if ($bitset == "0000000") $bitset = ''; |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | global $special_user_bitfield; |
| 142 | 142 | $Nbf = sizeof($special_user_bitfield); |
| 143 | 143 | |
| 144 | - admin_page_head("Management $user->name"); |
|
| 144 | + admin_page_head("management $user->name"); |
|
| 145 | 145 | |
| 146 | 146 | if (!defined("POST_REPORT_EMAILS")) { |
| 147 | 147 | echo "<p><font color='RED'> |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | // Delete a user if they have no credit, results, or posts |
| 41 | 41 | // |
| 42 | -function possibly_delete_user($user){ |
|
| 43 | - if ($user->total_credit > 0.0){ |
|
| 42 | +function possibly_delete_user($user) { |
|
| 43 | + if ($user->total_credit > 0.0) { |
|
| 44 | 44 | admin_error_page("Cannot delete user: User has credit."); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | admin_error_page("Cannot delete user: User has forum posts."); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - if ($user->teamid){ |
|
| 59 | + if ($user->teamid) { |
|
| 60 | 60 | user_quit_team($user); |
| 61 | 61 | } |
| 62 | 62 | delete_user($user); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | // put a timestamp in wiki to trigger re-validation of credentials |
| 102 | 102 | |
| 103 | - if (function_exists('touch_wiki_user')){ |
|
| 103 | + if (function_exists('touch_wiki_user')) { |
|
| 104 | 104 | touch_wiki_user($user); |
| 105 | 105 | } |
| 106 | 106 | |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | // Delete a user if they have no credit, results, or posts |
| 41 | 41 | // |
| 42 | -function possibly_delete_user($user){ |
|
| 43 | - if ($user->total_credit > 0.0){ |
|
| 42 | +function possibly_delete_user($user) { |
|
| 43 | + if ($user->total_credit > 0.0) { |
|
| 44 | 44 | admin_error_page("Cannot delete user: User has credit."); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | admin_error_page("Cannot delete user: User has forum posts."); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - if ($user->teamid){ |
|
| 59 | + if ($user->teamid) { |
|
| 60 | 60 | user_quit_team($user); |
| 61 | 61 | } |
| 62 | 62 | delete_user($user); |
@@ -67,8 +67,8 @@ discard block |
||
| 67 | 67 | function handle_special_user($user) { |
| 68 | 68 | global $special_user_bitfield; |
| 69 | 69 | $Nbf = sizeof($special_user_bitfield); |
| 70 | - $bits=""; |
|
| 71 | - for ($i=0; $i<$Nbf; $i++) { |
|
| 70 | + $bits = ""; |
|
| 71 | + for ($i = 0; $i < $Nbf; $i++) { |
|
| 72 | 72 | $key = "special_user_$i"; |
| 73 | 73 | if (array_key_exists($key, $_POST) && $_POST[$key]) { |
| 74 | 74 | $bits .= "1"; |
@@ -94,35 +94,35 @@ discard block |
||
| 94 | 94 | ); |
| 95 | 95 | } else { |
| 96 | 96 | if (is_numeric($dt)) { |
| 97 | - $t = $dt>0 ? time()+$dt : 0; |
|
| 97 | + $t = $dt > 0 ? time() + $dt : 0; |
|
| 98 | 98 | $q = "UPDATE forum_preferences SET banished_until=$t WHERE userid=$user->id"; |
| 99 | 99 | _mysql_query($q); |
| 100 | 100 | |
| 101 | 101 | // put a timestamp in wiki to trigger re-validation of credentials |
| 102 | 102 | |
| 103 | - if (function_exists('touch_wiki_user')){ |
|
| 103 | + if (function_exists('touch_wiki_user')) { |
|
| 104 | 104 | touch_wiki_user($user); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | // Send suspension e-mail to user and administrators |
| 108 | 108 | |
| 109 | - if ($dt>0) { |
|
| 110 | - $subject = PROJECT." posting privileges suspended for ". $user->name; |
|
| 109 | + if ($dt > 0) { |
|
| 110 | + $subject = PROJECT." posting privileges suspended for ".$user->name; |
|
| 111 | 111 | $body = " |
| 112 | -Forum posting privileges for the " .PROJECT. " user \"".$user->name."\" |
|
| 113 | -have been suspended for " .time_diff($dt). " by ".$g_logged_in_user->name.". |
|
| 112 | +Forum posting privileges for the " .PROJECT." user \"".$user->name."\" |
|
| 113 | +have been suspended for " .time_diff($dt)." by ".$g_logged_in_user->name.". |
|
| 114 | 114 | The reason given was: |
| 115 | 115 | |
| 116 | 116 | $reason |
| 117 | 117 | |
| 118 | -The suspension will end at " .time_str($t)."\n"; |
|
| 118 | +The suspension will end at ".time_str($t)."\n"; |
|
| 119 | 119 | } else { |
| 120 | - $subject = PROJECT." user ". $user->name. " unsuspended"; |
|
| 120 | + $subject = PROJECT." user ".$user->name." unsuspended"; |
|
| 121 | 121 | $body = " |
| 122 | -Forum posting privileges for the " .PROJECT. " user \"".$user->name."\" |
|
| 122 | +Forum posting privileges for the " .PROJECT." user \"".$user->name."\" |
|
| 123 | 123 | have been restored by ".$g_logged_in_user->name."\n"; |
| 124 | 124 | if ($reason) { |
| 125 | - $body.="The reason given was:\n\n $reason\n"; |
|
| 125 | + $body .= "The reason given was:\n\n $reason\n"; |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -186,13 +186,13 @@ discard block |
||
| 186 | 186 | row1("Special User Status"); |
| 187 | 187 | |
| 188 | 188 | echo "<tr>\n"; |
| 189 | - for ($i=0; $i<$Nbf; $i++) { |
|
| 189 | + for ($i = 0; $i < $Nbf; $i++) { |
|
| 190 | 190 | $bit = substr($user->prefs->special_user, $i, 1); |
| 191 | 191 | echo "<tr><td><input type='checkbox'' name='special_user_".$i."' value='1'"; |
| 192 | 192 | if ($bit == 1) { |
| 193 | 193 | echo " checked='checked'"; |
| 194 | 194 | } |
| 195 | - echo ">". $special_user_bitfield[$i] ."</td></tr>\n"; |
|
| 195 | + echo ">".$special_user_bitfield[$i]."</td></tr>\n"; |
|
| 196 | 196 | } |
| 197 | 197 | echo "</tr>"; |
| 198 | 198 | |
@@ -217,10 +217,10 @@ discard block |
||
| 217 | 217 | if ($user->prefs->banished_until) { |
| 218 | 218 | $dt = $user->prefs->banished_until - time(); |
| 219 | 219 | if ($dt > 0) { |
| 220 | - $x = " Suspended until " . time_str($user->prefs->banished_until) |
|
| 221 | - ."<br/> (Expires in " . time_diff($dt) .")" ; |
|
| 220 | + $x = " Suspended until ".time_str($user->prefs->banished_until) |
|
| 221 | + ."<br/> (Expires in ".time_diff($dt).")"; |
|
| 222 | 222 | } else { |
| 223 | - $x = " last suspended " . time_str($user->prefs->banished_until); |
|
| 223 | + $x = " last suspended ".time_str($user->prefs->banished_until); |
|
| 224 | 224 | } |
| 225 | 225 | row1($x); |
| 226 | 226 | } else { |
@@ -238,11 +238,11 @@ discard block |
||
| 238 | 238 | "; |
| 239 | 239 | echo " |
| 240 | 240 | <input type='radio' name='suspend_for' value='172800'> 48 hours <br/> |
| 241 | - <input type='radio' name='suspend_for' value='",86400*7,"'> 1 week <br/> |
|
| 242 | - <input type='radio' name='suspend_for' value='",86400*14,"'> 2 weeks <br/> |
|
| 241 | + <input type='radio' name='suspend_for' value='",86400*7, "'> 1 week <br/> |
|
| 242 | + <input type='radio' name='suspend_for' value='",86400*14, "'> 2 weeks <br/> |
|
| 243 | 243 | "; |
| 244 | 244 | |
| 245 | - if ($dt>0) { |
|
| 245 | + if ($dt > 0) { |
|
| 246 | 246 | echo " |
| 247 | 247 | <input type='radio' name='suspend_for' value='-1'> <b>unsuspend</b> <br/>"; |
| 248 | 248 | } |