Completed
Push — master ( f0d1ed...d02cee )
by Vitalii
51s queued 16s
created
html/user/sample_index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,10 +58,10 @@
 block discarded – undo
58 58
     //panel(null, 'panel_contents');
59 59
 }
60 60
 
61
-function left(){
61
+function left() {
62 62
     global $user, $no_web_account_creation, $project_id;
63 63
     panel(
64
-        $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
64
+        $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT),
65 65
         function() use($user) {
66 66
             global $no_web_account_creation, $project_id;
67 67
             if ($user) {
Please login to merge, or discard this patch.
html/user/create_profile.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 // If $selection is provided, and if it matches one of the entries in the file,
33 33
 // it will be selected by default.
34 34
 //
35
-function show_combo_box($name, $filename, $selection=null) {
35
+function show_combo_box($name, $filename, $selection = null) {
36 36
     echo "<select name=\"$name\" class=\"form-control\">\n";
37 37
 
38 38
     $file = fopen($filename, "r");
@@ -63,14 +63,14 @@  discard block
 block discarded – undo
63 63
 <tr><td colspan=2>
64 64
 <table border=0 cellpadding=5
65 65
 <tr>
66
-<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a>
66
+<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a>
67 67
 </td>
68
-<td valign=top>" .tra("%1 Your profile picture is shown to the left.",  $warning) ."
68
+<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)."
69 69
 <p>".
70
-tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br />
70
+tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br />
71 71
 <input name=picture type=file><br>
72 72
 <p>".
73
-tra("To remove it from your profile, check this box:") . "
73
+tra("To remove it from your profile, check this box:")."
74 74
 <input type=checkbox name=delete_pic>
75 75
 <p>
76 76
 </td></tr>";
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         end_table();
79 79
         echo "</td></tr>";
80 80
     } else {
81
-        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB") . "
81
+        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB")."
82 82
 <p>
83 83
 <input name=picture type=file>
84 84
         ");
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     row1(tra("Language"));
94 94
     echo "<tr><td>
95 95
         <p>" .
96
-        tra("Select the language in which your profile is written:") . "
96
+        tra("Select the language in which your profile is written:")."
97 97
         <p>
98 98
     ";
99 99
     if (isset($profile->language)) {
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
     if (recaptcha_public_key()) {
110 110
         table_row(boinc_recaptcha_get_html(recaptcha_public_key()));
111 111
     }
112
-    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
112
+    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">");
113 113
 }
114 114
 
115 115
 // Returns an array containing:
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
     // Determine if the filetype uploaded is supported.
125 125
     // TODO: Change these to constants.
126
-    switch($size[2]) {
126
+    switch ($size[2]) {
127 127
     case '2':    // JPEG
128 128
         $image = imageCreateFromJPEG($fileName);
129 129
         break;
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 
161 161
 function show_description() {
162 162
     echo "
163
-        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . "
163
+        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)."
164 164
         <p>
165 165
     ";
166 166
 }
@@ -178,14 +178,14 @@  discard block
 block discarded – undo
178 178
     row1(show_profile_heading1());
179 179
     rowify(show_profile_question1().bbcode_info());
180 180
     show_textarea("response1", $response1);
181
-    row1( show_profile_heading2());
182
-    rowify( show_profile_question2().bbcode_info());
181
+    row1(show_profile_heading2());
182
+    rowify(show_profile_question2().bbcode_info());
183 183
     show_textarea("response2", $response2);
184 184
     show_language_selection($profile);
185 185
 }
186 186
 
187 187
 function show_textarea($name, $text) {
188
-    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>");
188
+    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>");
189 189
 }
190 190
 
191 191
 // $profile is null if user doesn't already have a profile.
@@ -229,8 +229,8 @@  discard block
 block discarded – undo
229 229
         $delete_pic = "off";
230 230
     }
231 231
 
232
-    if (strlen($response1)==0 &&
233
-        strlen($response2)==0 &&
232
+    if (strlen($response1) == 0 &&
233
+        strlen($response2) == 0 &&
234 234
         $delete_pic != "on" &&
235 235
         !is_uploaded_file($_FILES['picture']['tmp_name'])
236 236
     ) {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
         $profile->verification = 0;
245 245
     }
246 246
 
247
-    $profile ? $has_picture = $profile->has_picture: $has_picture = false;
247
+    $profile ? $has_picture = $profile->has_picture : $has_picture = false;
248 248
 
249 249
     if (is_uploaded_file($_FILES['picture']['tmp_name'])) {
250 250
         $has_picture = true;
@@ -259,13 +259,13 @@  discard block
 block discarded – undo
259 259
 
260 260
         // Write the original image file to disk.
261 261
         // TODO: define a constant for image quality.
262
-        ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg');
263
-        ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg');
262
+        ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg');
263
+        ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg');
264 264
     }
265 265
     $response1 = sanitize_html($response1);
266 266
     $response2 = sanitize_html($response2);
267 267
 
268
-    $has_picture = $has_picture?1:0;
268
+    $has_picture = $has_picture ? 1 : 0;
269 269
     if ($profile) {
270 270
         $query = " response1 = '".BoincDb::escape_string($response1)."',"
271 271
             ." response2 = '".BoincDb::escape_string($response2)."',"
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
     page_tail();
308 308
 }
309 309
 
310
-function show_profile_form($profile, $warning=null) {
310
+function show_profile_form($profile, $warning = null) {
311 311
     if ($profile) {
312 312
         page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra());
313 313
     } else {
Please login to merge, or discard this patch.
html/inc/forum_email.inc 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 // - project forums: everyone in POST_REPORT_EMAILS
25 25
 // - team message board: team founder and admins
26 26
 //
27
-function mail_report_list($forum, $subject, $body, $must_send=false) {
27
+function mail_report_list($forum, $subject, $body, $must_send = false) {
28 28
     $success = true;
29 29
     switch ($forum->parent_type) {
30 30
     case 0:
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 function send_moderation_email($forum, $post, $thread, $explanation, $action) {
66 66
     $master_url = master_url();
67 67
 
68
-    $moderator=get_logged_in_user();
68
+    $moderator = get_logged_in_user();
69 69
     $body = "";
70 70
     $user = BoincUser::lookup_id($post->user);
71 71
 
@@ -126,11 +126,11 @@  discard block
 block discarded – undo
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){
130
-    $title = PROJECT . ": there is a new post in '". $thread->title ."'";
131
-    $link = secure_url_base() . "forum_thread.php?id=" . $thread->id;
132
-    $body = "A " . PROJECT . " user has posted to the thread
133
-\"" . $thread->title . "\".\n"
129
+function send_thread_notification_email($thread, $user) {
130
+    $title = PROJECT.": there is a new post in '".$thread->title."'";
131
+    $link = secure_url_base()."forum_thread.php?id=".$thread->id;
132
+    $body = "A ".PROJECT." user has posted to the thread
133
+\"" . $thread->title."\".\n"
134 134
            ."To view the updated thread, visit:\n$link
135 135
 
136 136
 --------------------------
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
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){
148
-    $title = PROJECT . ": there is a new thread in '". $forum->title ."'";
149
-    $link = secure_url_base() . "forum_forum.php?id=" . $forum->id;
150
-    $body = "A " . PROJECT . " user has added a thread to the forum
151
-\"" . $thread->title . "\".\n"
147
+function send_forum_notification_email($forum, $user) {
148
+    $title = PROJECT.": there is a new thread in '".$forum->title."'";
149
+    $link = secure_url_base()."forum_forum.php?id=".$forum->id;
150
+    $body = "A ".PROJECT." user has added a thread to the forum
151
+\"" . $thread->title."\".\n"
152 152
            ."To view the updated forum, visit:\n$link
153 153
 
154 154
 --------------------------
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 
162 162
 //////////////////// a user clicks the red "x" to report a post ///////////
163 163
 //
164
-function send_report_post_email($user, $forum, $thread,  $post, $message) {
164
+function send_report_post_email($user, $forum, $thread, $post, $message) {
165 165
 	$master_url = master_url();
166 166
 
167 167
     $body = "";
@@ -219,16 +219,16 @@  discard block
 block discarded – undo
219 219
 //
220 220
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
221 221
 	$master_url = master_url();
222
-    $now=time();
222
+    $now = time();
223 223
     $subject = PROJECT." banishment vote underway";
224 224
     $vote_url = $master_url."forum_banishment_vote.php";
225 225
     $body = "
226 226
 A vote has been started to banish you
227 227
 from the ".PROJECT." message boards until ".date('M j,
228
-Y G:i', $duration+$now).",
228
+Y G:i', $duration + $now).",
229 229
 because your postings have not followed our guidelines.
230 230
 
231
-This vote will last until ".date('M j, Y G:i',$end_time)." or until a majority
231
+This vote will last until ".date('M j, Y G:i', $end_time)." or until a majority
232 232
 decision has been reached.  If the vote does not result in banishment, you will be
233 233
 able to resume posting at that time.
234 234
     ";
Please login to merge, or discard this patch.
html/inc/cache.inc 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
         mkdir("../cache", 0770);
33 33
         chmod("../cache", 0770);
34 34
     }
35
-    for ($i=0;$i<256;$i++) {
36
-        $j=sprintf("%02x",$i);
35
+    for ($i = 0; $i < 256; $i++) {
36
+        $j = sprintf("%02x", $i);
37 37
         if (!@filemtime("../cache/$j")) {
38 38
             mkdir("../cache/$j", 0770);
39 39
             chmod("../cache/$j", 0770);
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     }
42 42
 }
43 43
 
44
-function get_path($params, $phpfile=null) {
44
+function get_path($params, $phpfile = null) {
45 45
     if (!@filemtime("../cache/00")) make_cache_dirs();
46 46
     if ($phpfile) {
47 47
         $z = $phpfile;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     }
52 52
 
53 53
     // add a layer of subdirectories for reducing file lookup time
54
-    $sz = substr(md5($z."_".urlencode($params)),1,2);
54
+    $sz = substr(md5($z."_".urlencode($params)), 1, 2);
55 55
     $path = "../cache/".$sz."/".$z;
56 56
     if ($params) {
57 57
         $path = $path."_".urlencode($params);
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 }
61 61
 
62 62
 function disk_usage($dir) {
63
-    $usage=0;
64
-    if ($handle=@opendir($dir)) {
65
-        while ($file=readdir($handle)) {
63
+    $usage = 0;
64
+    if ($handle = @opendir($dir)) {
65
+        while ($file = readdir($handle)) {
66 66
             if (($file != ".") && ($file != "..")) {
67 67
                 if (@is_dir($dir."/".$file)) {
68
-                    $usage+=disk_usage($dir."/".$file);
68
+                    $usage += disk_usage($dir."/".$file);
69 69
                 } else {
70
-                    $usage+=@filesize($dir."/".$file);
70
+                    $usage += @filesize($dir."/".$file);
71 71
                 }
72 72
             }
73 73
         }
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
     if (!chdir($dir)) {
82 82
         return;
83 83
     }
84
-    if ($handle=@opendir(".")) {
85
-        while ($file=readdir($handle)) {
84
+    if ($handle = @opendir(".")) {
85
+        while ($file = readdir($handle)) {
86 86
             if ($file == ".") continue;
87 87
             if ($file == "..") continue;
88 88
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             if (@is_dir($file)) {
94 94
                 clean_cache($max_age, $file);
95 95
             } else {
96
-                if ((time()-@filemtime($file))>$max_age) {
96
+                if ((time() - @filemtime($file)) > $max_age) {
97 97
                     //echo "unlinking ".getcwd()."/$file\n";
98 98
                     @unlink($file);
99 99
                 }
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 
108 108
 // check cache size every once in a while, purge if too big
109 109
 //
110
-function cache_check_diskspace(){
111
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
110
+function cache_check_diskspace() {
111
+    if ((rand()%CACHE_SIZE_CHECK_FREQ)) return;
112 112
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
113 113
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
114 114
         USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
     clean_cache($x, "../cache");
117 117
 }
118 118
 
119
-function cache_need_to_regenerate($path, $max_age){
119
+function cache_need_to_regenerate($path, $max_age) {
120 120
     $regenerate = false;
121 121
     $request = apache_request_headers();
122 122
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         // and touch the cached copy so other processes
129 129
         // don't regenerate at the same time
130 130
         //
131
-        if ($lastmodified<time()-$max_age) {
131
+        if ($lastmodified < time() - $max_age) {
132 132
             $regenerate = true;
133 133
             @touch($path);
134 134
         }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 }
140 140
 
141 141
 // Returns cached data or false if nothing was found
142
-function get_cached_data($max_age, $params=""){
142
+function get_cached_data($max_age, $params = "") {
143 143
     global $no_cache;
144 144
 
145 145
     if ($no_cache) return false;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             }
156 156
         } else {
157 157
             cache_check_diskspace();
158
-            $regenerate=cache_need_to_regenerate($path, $max_age);
158
+            $regenerate = cache_need_to_regenerate($path, $max_age);
159 159
             if (!$regenerate) {
160 160
                 return file_get_contents($path);
161 161
             }
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 }
166 166
 
167 167
 // DEPRECATED
168
-function start_cache($max_age, $params=""){
168
+function start_cache($max_age, $params = "") {
169 169
     global $no_cache, $caching, $memcache;
170 170
 
171 171
     if ($no_cache) return;
@@ -188,15 +188,15 @@  discard block
 block discarded – undo
188 188
             $regenerate = cache_need_to_regenerate($path, $max_age);
189 189
         }
190 190
         //Is the stored version too old, do we need to regenerate it?
191
-        if ($regenerate){
191
+        if ($regenerate) {
192 192
             // If cached version is too old (or non-existent)
193 193
             // generate the page and write to cache
194 194
             //
195 195
             ob_start();
196 196
             ob_implicit_flush(0);
197
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
198
-            Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT");
199
-            Header("Cache-Control: public, max-age=" . $max_age);
197
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
198
+            Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT");
199
+            Header("Cache-Control: public, max-age=".$max_age);
200 200
 
201 201
             // allow the calling page to see cache period
202 202
             //
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
             if (strstr($params, "format=xml")) {
209 209
                 header('Content-type: text/xml');
210 210
             }
211
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
212
-            Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
213
-            Header("Cache-Control: public, max-age=" . $max_age );
211
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT");
212
+            Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT");
213
+            Header("Cache-Control: public, max-age=".$max_age);
214 214
             if ($cache && $cache->content) {
215 215
                 echo $cache->content;
216 216
                 exit;
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 
229 229
 // write output buffer both to client and to cache
230 230
 // DEPRECATED
231
-function end_cache($max_age,$params=""){
231
+function end_cache($max_age, $params = "") {
232 232
     global $no_cache;
233 233
     if ($no_cache) return;
234 234
 
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
     }
254 254
 }
255 255
 
256
-function set_cached_data($max_age, $data, $params=""){
256
+function set_cached_data($max_age, $data, $params = "") {
257 257
     // for the benefit of hackers
258 258
     if (strstr($params, "..")) {
259 259
         return "bad params";
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
         }
296 296
         $server_arr = array();
297 297
         $servers = explode('|', MEMCACHE_SERVERS);
298
-        foreach($servers as &$server) {
298
+        foreach ($servers as &$server) {
299 299
             list($ip, $port, $weight) = explode(':', $server);
300 300
             if (!$port) { $port = 11211; }
301 301
             $server_arr[] = array($ip, $port, $weight);
Please login to merge, or discard this patch.
html/user/kw_prefs.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -93,9 +93,9 @@
 block discarded – undo
93 93
     global $job_keywords;
94 94
     $kw = $job_keywords[$id];
95 95
     $u = $uprefs[$id];
96
-    $yes_checked = ($u == KW_YES)?"checked":"";
97
-    $no_checked = ($u == KW_NO)?"checked":"";
98
-    $maybe_checked = ($u == KW_MAYBE)?"checked":"";
96
+    $yes_checked = ($u == KW_YES) ? "checked" : "";
97
+    $no_checked = ($u == KW_NO) ? "checked" : "";
98
+    $maybe_checked = ($u == KW_MAYBE) ? "checked" : "";
99 99
 
100 100
     echo sprintf('<tr id="%s" hidden>%s', "row$id", "\n");
101 101
     echo sprintf('   <td width=50%% id="%s"></td>%s', "text$id", "\n");
Please login to merge, or discard this patch.
html/inc/kw_prefs.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
     if (file_exists($path)) {
32 32
         $x = file($path);
33 33
         $yes = explode(' ', trim($x[0]));
34
-        if ($yes[0]=='') $yes=[];
34
+        if ($yes[0] == '') $yes = [];
35 35
         $yes = array_map('intval', $yes);
36 36
         $no = explode(' ', trim($x[1]));
37
-        if ($no[0]=='') $no=[];
37
+        if ($no[0] == '') $no = [];
38 38
         $no = array_map('intval', $no);
39 39
         return [$yes, $no];
40 40
     } else {
41
-        return [[],[]];
41
+        return [[], []];
42 42
     }
43 43
 }
44 44
 
Please login to merge, or discard this patch.
html/inc/recaptchalib.inc 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 
33 33
 function boinc_recaptcha_get_html($publickey) {
34 34
     if ($publickey) {
35
-        return '<div class="g-recaptcha" data-sitekey="' . $publickey . '"></div>';
35
+        return '<div class="g-recaptcha" data-sitekey="'.$publickey.'"></div>';
36 36
     } else {
37 37
         return '';
38 38
     }
Please login to merge, or discard this patch.
html/inc/forum_db.inc 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $db = BoincDb::get();
29 29
         return $db->lookup('category', 'BoincCategory', $clause);
30 30
     }
31
-    static function enum($clause=null) {
31
+    static function enum($clause = null) {
32 32
         $db = BoincDb::get();
33 33
         return $db->enum('category', 'BoincCategory', $clause);
34 34
     }
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         $db = BoincDb::get();
82 82
         return $db->update($this, 'thread', $clause);
83 83
     }
84
-    static function enum($clause="") {
84
+    static function enum($clause = "") {
85 85
         $db = BoincDb::get();
86 86
         return $db->enum('thread', 'BoincThread', $clause);
87 87
     }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         $db = BoincDb::get();
148 148
         $ret = $db->insert('forum_preferences', $clause);
149 149
     }
150
-    static function lookup(&$user, $nocache=false) {
150
+    static function lookup(&$user, $nocache = false) {
151 151
         if (!$user) return;
152 152
         if (isset($user->prefs)) return;
153 153
         if (!$nocache && isset(self::$cache[$user->id])) {
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
         $db = BoincDb::get();
180 180
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
181 181
     }
182
-    static function enum($clause=null) {
182
+    static function enum($clause = null) {
183 183
         $db = BoincDb::get();
184 184
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
185 185
     }
@@ -220,8 +220,8 @@  discard block
 block discarded – undo
220 220
         //
221 221
         $fl = BoincForumLogging::lookup(0, 0);
222 222
         if ($fl) {
223
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
224
-                BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
223
+            if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) {
224
+                BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0");
225 225
                 BoincForumLogging::replace(0, 0, time());
226 226
             }
227 227
         } else {
@@ -335,10 +335,10 @@  discard block
 block discarded – undo
335 335
     }
336 336
 }
337 337
 
338
-define ('NOTIFY_FRIEND_REQ', 1);
339
-define ('NOTIFY_FRIEND_ACCEPT', 2);
340
-define ('NOTIFY_PM', 3);
341
-define ('NOTIFY_SUBSCRIBED_THREAD', 4);
342
-define ('NOTIFY_SUBSCRIBED_FORUM', 5);
338
+define('NOTIFY_FRIEND_REQ', 1);
339
+define('NOTIFY_FRIEND_ACCEPT', 2);
340
+define('NOTIFY_PM', 3);
341
+define('NOTIFY_SUBSCRIBED_THREAD', 4);
342
+define('NOTIFY_SUBSCRIBED_FORUM', 5);
343 343
 
344 344
 ?>
Please login to merge, or discard this patch.
html/user/submit_rpc_handler.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     if ($template) {
60 60
         $t = (double)$template->workunit->rsc_fpops_est;
61 61
     }
62
-    foreach($r->batch->job as $job) {
62
+    foreach ($r->batch->job as $job) {
63 63
         $y = (double)$job->rsc_fpops_est;
64 64
         if ($y) {
65 65
             $x += $y;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 function est_elapsed_time($r, $template) {
86 86
     // crude estimate: batch FLOPs / project FLOPS
87 87
     //
88
-    return batch_flop_count($r, $template) / project_flops();
88
+    return batch_flop_count($r, $template)/project_flops();
89 89
 }
90 90
 
91 91
 // if batch-level input template filename was given, read it;
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 //
96 96
 function read_input_template($app, $r) {
97 97
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
98
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
98
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
99 99
     } else {
100
-        $path = project_dir() . "/templates/$app->name"."_in";
100
+        $path = project_dir()."/templates/$app->name"."_in";
101 101
     }
102 102
     if (file_exists($path)) {
103 103
         $x = simplexml_load_file($path);
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 function validate_batch($jobs, $template) {
146 146
     $i = 0;
147 147
     $n = count($template->file_info);
148
-    foreach($jobs as $job) {
148
+    foreach ($jobs as $job) {
149 149
         $m = count($job->input_files);
150 150
         if ($n != $m) {
151 151
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 // stage all the files
215 215
 //
216 216
 function stage_files(&$jobs, $user) {
217
-    foreach($jobs as $job) {
217
+    foreach ($jobs as $job) {
218 218
         foreach ($job->input_files as $file) {
219 219
             if ($file->mode != "remote") {
220 220
                 $file->name = stage_file($file, $user);
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 //
228 228
 function submit_jobs(
229 229
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
230
-    $input_template_filename,        // batch-level; can also specify per job
230
+    $input_template_filename, // batch-level; can also specify per job
231 231
     $output_template_filename,
232 232
     $user
233 233
 ) {
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
     // one line per job
238 238
     //
239 239
     $x = "";
240
-    foreach($jobs as $job) {
240
+    foreach ($jobs as $job) {
241 241
         if ($job->name) {
242 242
             $x .= " --wu_name $job->name";
243 243
         }
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $x .= "\n";
273 273
     }
274 274
 
275
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
275
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
276 276
 
277 277
     if ($user->seti_id) {
278 278
         $cmd .= " --target_user $user->id ";
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 //
384 384
 function xml_get_jobs($r) {
385 385
     $jobs = array();
386
-    foreach($r->batch->job as $j) {
386
+    foreach ($r->batch->job as $j) {
387 387
         $job = new StdClass;
388 388
         $job->input_files = array();
389 389
         $job->command_line = (string)$j->command_line;
@@ -436,16 +436,16 @@  discard block
 block discarded – undo
436 436
 //
437 437
 function logical_end_time($r, $jobs, $user, $app) {
438 438
     $total_flops = 0;
439
-    foreach($jobs as $job) {
439
+    foreach ($jobs as $job) {
440 440
         //print_r($job);
441 441
         if ($job->rsc_fpops_est) {
442 442
             $total_flops += $job->rsc_fpops_est;
443 443
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
444
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
444
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
445 445
         } else if ($r->batch->job_params->rsc_fpops_est) {
446
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
446
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
447 447
         } else {
448
-            $x = (double) $template->workunit->rsc_fpops_est;
448
+            $x = (double)$template->workunit->rsc_fpops_est;
449 449
             if ($x) {
450 450
                 $total_flops += $x;
451 451
             } else {
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
             }
454 454
         }
455 455
     }
456
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
456
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
457 457
     $x = exec($cmd);
458 458
     if (!is_numeric($x) || (double)$x == 0) {
459 459
         xml_error(-1, "$cmd returned $x");
@@ -538,15 +538,15 @@  discard block
 block discarded – undo
538 538
     }
539 539
 
540 540
     $job_params = new StdClass;
541
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
542
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
543
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
544
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
545
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
541
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
542
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
543
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
544
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
545
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
546 546
         // could add quorum-related stuff
547 547
 
548
-    $input_template_filename = (string) $r->batch->input_template_filename;
549
-    $output_template_filename = (string) $r->batch->output_template_filename;
548
+    $input_template_filename = (string)$r->batch->input_template_filename;
549
+    $output_template_filename = (string)$r->batch->output_template_filename;
550 550
         // possibly empty
551 551
 
552 552
     submit_jobs(
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 }
640 640
 
641 641
 function n_outfiles($wu) {
642
-    $path = project_dir() . "/$wu->output_template_filename";
642
+    $path = project_dir()."/$wu->output_template_filename";
643 643
     $r = simplexml_load_file($path);
644 644
     return count($r->file_info);
645 645
 }
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 ";
847 847
         if ($result->server_state == 5) {   // over?
848 848
             $paths = get_outfile_paths($result);
849
-            foreach($paths as $path) {
849
+            foreach ($paths as $path) {
850 850
                 if (is_file($path)) {
851 851
                     $size = filesize($path);
852 852
                     echo "        <outfile>
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
     } else {
891 891
         $results = BoincResult::enum("workunitid=$job_id");
892 892
         foreach ($results as $r) {
893
-            switch($r->outcome) {
893
+            switch ($r->outcome) {
894 894
             case 1:
895 895
             case 3:
896 896
             case 6:
@@ -1005,8 +1005,8 @@  discard block
 block discarded – undo
1005 1005
     }
1006 1006
 
1007 1007
     $user = check_remote_submit_permissions($r, $app);
1008
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
1009
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
1008
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
1009
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
1010 1010
     if ($in === false || $out === false) {
1011 1011
         log_write("template file missing");
1012 1012
         xml_error(-1, "template file missing");
@@ -1018,7 +1018,7 @@  discard block
 block discarded – undo
1018 1018
 
1019 1019
 function ping($r) {
1020 1020
     xml_start_tag("ping");
1021
-    BoincDb::get();     // errors out if DB down or web disabled
1021
+    BoincDb::get(); // errors out if DB down or web disabled
1022 1022
     echo "<success>1</success>
1023 1023
         </ping>
1024 1024
     ";
@@ -1092,9 +1092,9 @@  discard block
 block discarded – undo
1092 1092
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
1093 1093
 if ($request_log) {
1094 1094
     $log_dir = parse_config(get_config(), "<log_dir>");
1095
-    $request_log = $log_dir . "/" . $request_log;
1095
+    $request_log = $log_dir."/".$request_log;
1096 1096
     if ($file = fopen($request_log, "a")) {
1097
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $req . "\n</submit_rpc_handler>\n");
1097
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$req."\n</submit_rpc_handler>\n");
1098 1098
         fclose($file);
1099 1099
     }
1100 1100
 }
Please login to merge, or discard this patch.