@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | BoincForumPrefs::lookup($user); |
| 31 | 31 | |
| 32 | -if (post_str("action", true)=="reset_confirm"){ |
|
| 32 | +if (post_str("action", true)=="reset_confirm") { |
|
| 33 | 33 | page_head(tra("Confirm reset")); |
| 34 | 34 | echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")." |
| 35 | 35 | <p> |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | // If the user has requested a reset of preferences; |
| 46 | 46 | // preserve a few fields. |
| 47 | 47 | // |
| 48 | -if (post_str("action", true)=="reset"){ |
|
| 48 | +if (post_str("action", true)=="reset") { |
|
| 49 | 49 | $posts = $user->prefs->posts; |
| 50 | 50 | $last_post = $user->prefs->last_post; |
| 51 | 51 | $rated_posts = $user->prefs->rated_posts; |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | // Update the user avatar |
| 73 | 73 | if ($avatar_type<0 or $avatar_type>3) $avatar_type=0; |
| 74 | -if ($avatar_type==0){ |
|
| 75 | - if (file_exists($newfile)){ |
|
| 74 | +if ($avatar_type==0) { |
|
| 75 | + if (file_exists($newfile)) { |
|
| 76 | 76 | // Delete the file on the server if the user |
| 77 | 77 | // decides not to use an avatar |
| 78 | 78 | // |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $avatar_url=""; |
| 82 | 82 | } elseif ($avatar_type == 1) { |
| 83 | 83 | $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&d=identicon"; |
| 84 | -} elseif ($avatar_type==2){ |
|
| 84 | +} elseif ($avatar_type==2) { |
|
| 85 | 85 | if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) { |
| 86 | 86 | if ($_FILES['picture']['tmp_name']!="") { |
| 87 | 87 | $file = $_FILES['picture']['tmp_name']; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | $file = post_str("avatar_url"); |
| 91 | 91 | } |
| 92 | 92 | $size = getImageSize($file); |
| 93 | - if ($size[2]!=2 and $size[2]!=3){ |
|
| 93 | + if ($size[2]!=2 and $size[2]!=3) { |
|
| 94 | 94 | //Not the right kind of file |
| 95 | 95 | error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported.")); |
| 96 | 96 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $image2 = intelligently_scale_image($file, 100, 100); |
| 100 | 100 | ImageJPEG($image2, $newfile); |
| 101 | 101 | } |
| 102 | - if (file_exists($newfile)){ |
|
| 102 | + if (file_exists($newfile)) { |
|
| 103 | 103 | $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile; |
| 104 | 104 | } else { |
| 105 | 105 | //User didn't upload a compatible file or it went lost on the server |
@@ -142,9 +142,9 @@ discard block |
||
| 142 | 142 | } else { |
| 143 | 143 | // todo: clean up the following |
| 144 | 144 | $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!=""); |
| 145 | - if ($add_user_to_filter){ |
|
| 145 | + if ($add_user_to_filter) { |
|
| 146 | 146 | $user_to_add = trim($_POST["forum_filter_user"]); |
| 147 | - if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){ |
|
| 147 | + if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))) { |
|
| 148 | 148 | $other_user = BoincUser::lookup_id($user_to_add); |
| 149 | 149 | if (!$other_user) { |
| 150 | 150 | echo tra("No such user:")." ".$user_to_add; |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | // |
| 160 | 160 | $ignored_users = get_ignored_list($user); |
| 161 | 161 | // todo: use foreach |
| 162 | -for ($i=0;$i<sizeof($ignored_users);$i++){ |
|
| 162 | +for ($i=0;$i<sizeof($ignored_users);$i++) { |
|
| 163 | 163 | $remove = "remove".trim($ignored_users[$i]); |
| 164 | - if (isset($_POST[$remove]) && $_POST[$remove]!=""){ |
|
| 164 | + if (isset($_POST[$remove]) && $_POST[$remove]!="") { |
|
| 165 | 165 | $other_user = BoincUser::lookup_id($ignored_users[$i]); |
| 166 | 166 | if (!$other_user) { |
| 167 | 167 | echo tra("No such user:")." ".$ignored_users[$j]; |
@@ -53,8 +53,9 @@ discard block |
||
| 53 | 53 | // ------------ Forum identity ----------- |
| 54 | 54 | |
| 55 | 55 | $select_0 = $select_1 = $select_2 = ""; |
| 56 | -if (strlen($user->prefs->avatar)){ |
|
| 57 | - if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar |
|
| 56 | +if (strlen($user->prefs->avatar)) { |
|
| 57 | + if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { |
|
| 58 | +// Gravatar |
|
| 58 | 59 | $select_1 = "checked=\"true\""; |
| 59 | 60 | } else { |
| 60 | 61 | $select_2 = "checked=\"true\""; |
@@ -73,7 +74,7 @@ discard block |
||
| 73 | 74 | <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2."> |
| 74 | 75 | <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">" |
| 75 | 76 | ); |
| 76 | -if (strlen($user->prefs->avatar)){ |
|
| 77 | +if (strlen($user->prefs->avatar)) { |
|
| 77 | 78 | row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>", |
| 78 | 79 | "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">"); |
| 79 | 80 | } |
@@ -103,7 +104,7 @@ discard block |
||
| 103 | 104 | tra("Attach signature by default") |
| 104 | 105 | ) |
| 105 | 106 | ); |
| 106 | -if ($user->prefs->signature!=""){ |
|
| 107 | +if ($user->prefs->signature!="") { |
|
| 107 | 108 | row2(tra("Signature preview"). |
| 108 | 109 | "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>", |
| 109 | 110 | output_transform($user->prefs->signature) |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | foreach ($files as $file) { |
| 62 | 62 | $path = "$dir/$file"; |
| 63 | 63 | [$err, $file_size, $file_md5] = sandbox_parse_link_file($path); |
| 64 | - if (!$err){ |
|
| 64 | + if (!$err) { |
|
| 65 | 65 | if (strcmp($md5, $file_md5) == 0) { |
| 66 | 66 | $exist = true; |
| 67 | 67 | $elf = $file; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | // TODO: this is a kludge. |
| 155 | 155 | // Should we use the job_file and batch_file_assoc tables instead? |
| 156 | 156 | // |
| 157 | -function sandbox_file_in_use($user, $file){ |
|
| 157 | +function sandbox_file_in_use($user, $file) { |
|
| 158 | 158 | $ufiles = array(); |
| 159 | 159 | |
| 160 | 160 | $pbatches = BoincBatch::enum( |
@@ -164,16 +164,16 @@ discard block |
||
| 164 | 164 | ); |
| 165 | 165 | if (!$pbatches) return false; |
| 166 | 166 | |
| 167 | - foreach ($pbatches as $batch){ |
|
| 167 | + foreach ($pbatches as $batch) { |
|
| 168 | 168 | $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" ); |
| 169 | - if ($wus == null){ |
|
| 169 | + if ($wus == null) { |
|
| 170 | 170 | continue; |
| 171 | 171 | } |
| 172 | - foreach($wus as $wu){ |
|
| 172 | + foreach($wus as $wu) { |
|
| 173 | 173 | $x = "<in>".$wu->xml_doc."</in>"; |
| 174 | 174 | $x = simplexml_load_string($x); |
| 175 | 175 | global $fanout; |
| 176 | - foreach($x->workunit->file_ref as $fr){ |
|
| 176 | + foreach($x->workunit->file_ref as $fr) { |
|
| 177 | 177 | $pname = (string)$fr->file_name; |
| 178 | 178 | $ufiles[] = $pname; |
| 179 | 179 | } |
@@ -182,10 +182,10 @@ discard block |
||
| 182 | 182 | $dir = sandbox_dir($user); |
| 183 | 183 | $path = $dir."/".$file; |
| 184 | 184 | list($err, $size, $md5) = sandbox_parse_link_file($path); |
| 185 | - if (!$err){ |
|
| 185 | + if (!$err) { |
|
| 186 | 186 | $f = sandbox_file_name($user, $md5); |
| 187 | 187 | foreach($ufiles as $uf) { |
| 188 | - if (strcmp($f,$uf) == 0){ |
|
| 188 | + if (strcmp($f,$uf) == 0) { |
|
| 189 | 189 | return true; |
| 190 | 190 | } |
| 191 | 191 | } |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | $user->id, |
| 408 | 408 | $name |
| 409 | 409 | ); |
| 410 | - if (function_exists("project_user_links")){ |
|
| 410 | + if (function_exists("project_user_links")) { |
|
| 411 | 411 | $x .= project_user_links($user); |
| 412 | 412 | } |
| 413 | 413 | if ($badge_height) { |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | |
| 531 | 531 | // return an object with data to show the user's community links |
| 532 | 532 | // |
| 533 | -function get_community_links_object($user){ |
|
| 533 | +function get_community_links_object($user) { |
|
| 534 | 534 | $cache_object = new StdClass; |
| 535 | 535 | $cache_object->post_count = total_posts($user); |
| 536 | 536 | $cache_object->user = $user; |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | |
| 549 | 549 | // show community links of another user (described by $clo) |
| 550 | 550 | // |
| 551 | -function community_links($clo, $logged_in_user){ |
|
| 551 | +function community_links($clo, $logged_in_user) { |
|
| 552 | 552 | $user = $clo->user; |
| 553 | 553 | if (!$user) { |
| 554 | 554 | error_log("community_links(): null user\n"); |
@@ -285,7 +285,8 @@ discard block |
||
| 285 | 285 | // (PM reply fills in the latter) |
| 286 | 286 | // |
| 287 | 287 | $x = explode(' ', $username); |
| 288 | - if (is_numeric($x[0])) { // user ID |
|
| 288 | + if (is_numeric($x[0])) { |
|
| 289 | +// user ID |
|
| 289 | 290 | $userid = (int)$x[0]; |
| 290 | 291 | $user = BoincUser::lookup_id($userid); |
| 291 | 292 | if ($user == null) { |
@@ -303,7 +304,8 @@ discard block |
||
| 303 | 304 | tra("Could not find user with username %1", $username) |
| 304 | 305 | ); |
| 305 | 306 | return; |
| 306 | - } elseif (count($users) > 1) { // Non-unique username |
|
| 307 | + } elseif (count($users) > 1) { |
|
| 308 | +// Non-unique username |
|
| 307 | 309 | pm_form_page( |
| 308 | 310 | $replyto, $userid, |
| 309 | 311 | tra("%1 is not a unique username; you will have to use user ID", $username) |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // There's a new post in the thread, which the user is subscribed to. |
| 127 | 127 | // send them an email notifying them. |
| 128 | 128 | // |
| 129 | -function send_thread_notification_email($thread, $user){ |
|
| 129 | +function send_thread_notification_email($thread, $user) { |
|
| 130 | 130 | $title = PROJECT . ": there is a new post in '". $thread->title ."'"; |
| 131 | 131 | $link = secure_url_base() . "forum_thread.php?id=" . $thread->id; |
| 132 | 132 | $body = "A " . PROJECT . " user has posted to the thread |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | // There's a new thread in the forum, which the user is subscribed to. |
| 145 | 145 | // send them an email notifying them. |
| 146 | 146 | // |
| 147 | -function send_forum_notification_email($forum, $user){ |
|
| 147 | +function send_forum_notification_email($forum, $user) { |
|
| 148 | 148 | $title = PROJECT . ": there is a new thread in '". $forum->title ."'"; |
| 149 | 149 | $link = secure_url_base() . "forum_forum.php?id=" . $forum->id; |
| 150 | 150 | $body = "A " . PROJECT . " user has added a thread to the forum |
@@ -46,14 +46,14 @@ |
||
| 46 | 46 | |
| 47 | 47 | if (!$sort_style) { |
| 48 | 48 | // get the sort style either from the logged in user or a cookie |
| 49 | - if ($user){ |
|
| 49 | + if ($user) { |
|
| 50 | 50 | $sort_style = $user->prefs->forum_sorting; |
| 51 | 51 | } else { |
| 52 | 52 | list($sort_style, $thread_style) = parse_forum_cookie(); |
| 53 | 53 | } |
| 54 | 54 | } else { |
| 55 | 55 | // set the sort style |
| 56 | - if ($user){ |
|
| 56 | + if ($user) { |
|
| 57 | 57 | $user->prefs->forum_sorting = $sort_style; |
| 58 | 58 | $user->prefs->update("forum_sorting=$sort_style"); |
| 59 | 59 | } else { |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | // for example inside <pre> containers |
| 285 | 285 | // The original \n was retained after the br when it was added |
| 286 | 286 | // |
| 287 | -function remove_br($text){ |
|
| 287 | +function remove_br($text) { |
|
| 288 | 288 | return str_replace("<br />", "", $text); |
| 289 | 289 | } |
| 290 | 290 | |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | $i=0; |
| 296 | 296 | $linkpos=true; |
| 297 | 297 | $out = ""; |
| 298 | - while (true){ |
|
| 298 | + while (true) { |
|
| 299 | 299 | // Find a link |
| 300 | 300 | // |
| 301 | 301 | $linkpos=strpos($text, "<a ", $i); |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | |
| 313 | 313 | // Converts image tags to links to the images. |
| 314 | 314 | // |
| 315 | -function image_as_link($text){ |
|
| 315 | +function image_as_link($text) { |
|
| 316 | 316 | $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si'; |
| 317 | 317 | $replacement = '<a href=${2}>[Image link]</a>'; |
| 318 | 318 | return preg_replace($pattern, $replacement, $text); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $parent_post_id = 0; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | -if ($filter != "false"){ |
|
| 59 | +if ($filter != "false") { |
|
| 60 | 60 | $filter = true; |
| 61 | 61 | } else { |
| 62 | 62 | $filter = false; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | $warning = null; |
| 74 | -if ($content && (!$preview)){ |
|
| 74 | +if ($content && (!$preview)) { |
|
| 75 | 75 | check_tokens($logged_in_user->authenticator); |
| 76 | 76 | if (!akismet_check($logged_in_user, $content)) { |
| 77 | 77 | $warning = tra("Your post has been flagged as spam by the Akismet anti-spam system. Please modify your text and try again."); |