@@ -108,6 +108,10 @@ discard block |
||
108 | 108 | // If you include any links, prepend URL with $prefix |
109 | 109 | // if you need to open divs here close them in project_footer() |
110 | 110 | // |
111 | +/** |
|
112 | + * @param string $prefix |
|
113 | + * @param boolean $is_main |
|
114 | + */ |
|
111 | 115 | function project_banner($title, $prefix, $is_main) { |
112 | 116 | if ($is_main) { |
113 | 117 | echo '<img class="img-responsive" src="img/water.jpg">'; |
@@ -119,6 +123,11 @@ discard block |
||
119 | 123 | } |
120 | 124 | //$fixed_navbar = true; |
121 | 125 | |
126 | +/** |
|
127 | + * @param boolean $show_return |
|
128 | + * @param boolean $show_date |
|
129 | + * @param string $prefix |
|
130 | + */ |
|
122 | 131 | function project_footer($show_return, $show_date, $prefix) { |
123 | 132 | // If you include any links, prepend URL with $prefix |
124 | 133 | // |
@@ -183,15 +183,15 @@ discard block |
||
183 | 183 | </ol>", PROJECT); |
184 | 184 | } |
185 | 185 | |
186 | -function project_workunit($wu){ |
|
186 | +function project_workunit($wu) { |
|
187 | 187 | // shown in the workunit page |
188 | 188 | } |
189 | 189 | |
190 | -function project_user_summary($user){ |
|
190 | +function project_user_summary($user) { |
|
191 | 191 | // shown in the user summary page |
192 | 192 | } |
193 | 193 | |
194 | -function project_user_page_private($user){ |
|
194 | +function project_user_page_private($user) { |
|
195 | 195 | // shown in the private account page |
196 | 196 | } |
197 | 197 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | array("name" => "Uppercase", "short_name" => "UC", "appids" => array(1, 25)), |
259 | 259 | ); |
260 | 260 | |
261 | -function project_user_credit($user){ |
|
261 | +function project_user_credit($user) { |
|
262 | 262 | global $sub_projects; |
263 | 263 | foreach ($sub_projects as $sp) { |
264 | 264 | show_app_credit_user($user, $sp["name"], $sp["appids"]); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | define("FORUM_QA_MERGED_MODE", true); |
50 | 50 | // Set to true to merge Message boards and Q&A section |
51 | -define ("DISABLE_PROFILES", true); |
|
51 | +define("DISABLE_PROFILES", true); |
|
52 | 52 | // enable profiles only after enabling reCAPTCHA |
53 | 53 | // https://boinc.berkeley.edu/trac/wiki/ProtectionFromSpam |
54 | 54 | define("USE_STOPFORUMSPAM", true); |
@@ -183,15 +183,15 @@ discard block |
||
183 | 183 | </ol>", PROJECT); |
184 | 184 | } |
185 | 185 | |
186 | -function project_workunit($wu){ |
|
186 | +function project_workunit($wu) { |
|
187 | 187 | // shown in the workunit page |
188 | 188 | } |
189 | 189 | |
190 | -function project_user_summary($user){ |
|
190 | +function project_user_summary($user) { |
|
191 | 191 | // shown in the user summary page |
192 | 192 | } |
193 | 193 | |
194 | -function project_user_page_private($user){ |
|
194 | +function project_user_page_private($user) { |
|
195 | 195 | // shown in the private account page |
196 | 196 | } |
197 | 197 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | array("name" => "Uppercase", "short_name" => "UC", "appids" => array(1, 25)), |
259 | 259 | ); |
260 | 260 | |
261 | -function project_user_credit($user){ |
|
261 | +function project_user_credit($user) { |
|
262 | 262 | global $sub_projects; |
263 | 263 | foreach ($sub_projects as $sp) { |
264 | 264 | show_app_credit_user($user, $sp["name"], $sp["appids"]); |
@@ -32,6 +32,9 @@ discard block |
||
32 | 32 | // Parse form variables into XML, and return it. |
33 | 33 | // Also error-check values, and return errors in $errors->* |
34 | 34 | |
35 | +/** |
|
36 | + * @param string $name |
|
37 | + */ |
|
35 | 38 | function option($name, $val) { |
36 | 39 | $x = ($name == $val) ? "selected" : ""; |
37 | 40 | return "<option name='$name' $x>$name\n"; |
@@ -90,6 +93,10 @@ discard block |
||
90 | 93 | return $x; |
91 | 94 | } |
92 | 95 | |
96 | +/** |
|
97 | + * @param string $name |
|
98 | + * @param integer $max |
|
99 | + */ |
|
93 | 100 | function number_select($name, $max, $n) { |
94 | 101 | $sel = ($n == 0) ? "selected":""; |
95 | 102 | $x = "<select class=\"form-control input-sm\" name=$name> <option value=0 $sel>".tra("No limit")."</option>"; |
@@ -106,6 +113,9 @@ discard block |
||
106 | 113 | return tra("No limit"); |
107 | 114 | } |
108 | 115 | |
116 | +/** |
|
117 | + * @param stdClass $prefs |
|
118 | + */ |
|
109 | 119 | function project_specific_prefs_edit($prefs, $error=false) { |
110 | 120 | global $app_array; |
111 | 121 | if (COLOR_PREFS) { |
@@ -162,6 +172,9 @@ discard block |
||
162 | 172 | } |
163 | 173 | } |
164 | 174 | |
175 | +/** |
|
176 | + * @param boolean $error |
|
177 | + */ |
|
165 | 178 | function project_specific_prefs_parse_form(&$error) { |
166 | 179 | global $app_array; |
167 | 180 | $x = ""; |
@@ -216,6 +229,9 @@ discard block |
||
216 | 229 | return $x; |
217 | 230 | } |
218 | 231 | |
232 | +/** |
|
233 | + * @param stdClass $prefs |
|
234 | + */ |
|
219 | 235 | function project_specific_prefs_show($prefs, $columns=false) { |
220 | 236 | global $app_array; |
221 | 237 | if ($columns) { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | // Also error-check values, and return errors in $errors->* |
34 | 34 | |
35 | 35 | function option($name, $val) { |
36 | - $x = ($name == $val) ? "selected" : ""; |
|
36 | + $x = ($name == $val) ? "selected" : ""; |
|
37 | 37 | return "<option name='$name' $x>$name\n"; |
38 | 38 | } |
39 | 39 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | if (APP_SELECT_PREFS) { |
54 | 54 | $app_array = array(); |
55 | 55 | $apps = BoincApp::enum("deprecated=0"); |
56 | - foreach($apps as $app) { |
|
56 | + foreach ($apps as $app) { |
|
57 | 57 | $app_array[] = array($app->id, $app->user_friendly_name); |
58 | 58 | } |
59 | 59 | } else { |
@@ -91,10 +91,10 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | function number_select($name, $max, $n) { |
94 | - $sel = ($n == 0) ? "selected":""; |
|
94 | + $sel = ($n == 0) ? "selected" : ""; |
|
95 | 95 | $x = "<select class=\"form-control input-sm\" name=$name> <option value=0 $sel>".tra("No limit")."</option>"; |
96 | - for ($i=1; $i<=$max; $i++) { |
|
97 | - $sel = ($n == $i) ? "selected":""; |
|
96 | + for ($i = 1; $i <= $max; $i++) { |
|
97 | + $sel = ($n == $i) ? "selected" : ""; |
|
98 | 98 | $x .= "<option value=$i $sel>$i</option>"; |
99 | 99 | } |
100 | 100 | $x .= "</select>"; |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | return tra("No limit"); |
107 | 107 | } |
108 | 108 | |
109 | -function project_specific_prefs_edit($prefs, $error=false) { |
|
109 | +function project_specific_prefs_edit($prefs, $error = false) { |
|
110 | 110 | global $app_array; |
111 | 111 | if (COLOR_PREFS) { |
112 | 112 | $x = $prefs->color_scheme; |
@@ -132,15 +132,15 @@ discard block |
||
132 | 132 | } else { |
133 | 133 | $present = true; |
134 | 134 | } |
135 | - $checked = $present?"checked":""; |
|
135 | + $checked = $present ? "checked" : ""; |
|
136 | 136 | $x .= "<input type=checkbox name=app_id_$app_id $checked> $app_name<br>"; |
137 | 137 | } |
138 | 138 | tooltip_row2(APP_SELECT_TOOLTIP, APP_SELECT_DESC, $x); |
139 | - $checked = $prefs->allow_non_preferred_apps?"checked":""; |
|
139 | + $checked = $prefs->allow_non_preferred_apps ? "checked" : ""; |
|
140 | 140 | row2(ACCEPT_ANY_DESC, "<input type=checkbox name=allow_non_preferred_apps $checked>"); |
141 | 141 | } |
142 | 142 | if (NON_GRAPHICAL_PREF) { |
143 | - $checked = $prefs->non_graphical?"checked":""; |
|
143 | + $checked = $prefs->non_graphical ? "checked" : ""; |
|
144 | 144 | row2( |
145 | 145 | NON_GRAPHICAL_DESC, |
146 | 146 | "<input type=checkbox name=non_graphical $checked>" |
@@ -216,11 +216,11 @@ discard block |
||
216 | 216 | return $x; |
217 | 217 | } |
218 | 218 | |
219 | -function project_specific_prefs_show($prefs, $columns=false) { |
|
219 | +function project_specific_prefs_show($prefs, $columns = false) { |
|
220 | 220 | global $app_array; |
221 | 221 | if ($columns) { |
222 | 222 | if (COLOR_PREFS) { |
223 | - row_defs(COLOR_DESC,"color_scheme", "", "", $prefs); |
|
223 | + row_defs(COLOR_DESC, "color_scheme", "", "", $prefs); |
|
224 | 224 | } |
225 | 225 | if (GFX_CPU_PREFS) { |
226 | 226 | row_defs(MAX_GFX_CPU_PCT_DESC, "max_gfx_cpu_pct", "", "", $prefs); |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | row2(ACCEPT_ANY_DESC, $prefs->allow_non_preferred_apps_text); |
255 | 255 | } |
256 | 256 | if (NON_GRAPHICAL_PREF) { |
257 | - row2(NON_GRAPHICAL_DESC, $prefs->non_graphical?tra("yes"):tra("no")); |
|
257 | + row2(NON_GRAPHICAL_DESC, $prefs->non_graphical ?tra("yes") : tra("no")); |
|
258 | 258 | } |
259 | 259 | if (MAX_JOBS_PREF) { |
260 | 260 | row2(tra("Max # jobs"), limit_string($prefs->max_jobs)); |
@@ -277,12 +277,12 @@ discard block |
||
277 | 277 | $cursor = 0; |
278 | 278 | while ($thisxml = parse_next_element($prefs_xml, "<app_id>", $cursor)) { |
279 | 279 | if (is_numeric($thisxml)) { |
280 | - $n = (int) $thisxml; |
|
280 | + $n = (int)$thisxml; |
|
281 | 281 | $prefs->app_ids[] = $n; |
282 | 282 | } |
283 | 283 | } |
284 | 284 | $prefs->allow_non_preferred_apps = parse_element($prefs_xml, "<allow_non_preferred_apps>"); |
285 | - $prefs->allow_non_preferred_apps_text = $prefs->allow_non_preferred_apps?"yes":"no"; |
|
285 | + $prefs->allow_non_preferred_apps_text = $prefs->allow_non_preferred_apps ? "yes" : "no"; |
|
286 | 286 | } |
287 | 287 | if (NON_GRAPHICAL_PREF) { |
288 | 288 | $prefs->non_graphical = parse_bool($prefs_xml, "non_graphical"); |
@@ -296,6 +296,6 @@ discard block |
||
296 | 296 | return $prefs; |
297 | 297 | } |
298 | 298 | |
299 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
299 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
300 | 300 | |
301 | 301 | ?> |
@@ -28,6 +28,9 @@ discard block |
||
28 | 28 | require_once("../inc/bolt_util.inc"); |
29 | 29 | require_once("../inc/util.inc"); |
30 | 30 | |
31 | +/** |
|
32 | + * @param string $tag |
|
33 | + */ |
|
31 | 34 | function debug_show_state($state, $tag) { |
32 | 35 | global $user; |
33 | 36 | global $refresh; |
@@ -82,6 +85,9 @@ discard block |
||
82 | 85 | |
83 | 86 | // A page is being shown to the user; make a record of it |
84 | 87 | // |
88 | +/** |
|
89 | + * @param integer $mode |
|
90 | + */ |
|
85 | 91 | function create_view($iter, $mode, $prev_view_id) { |
86 | 92 | global $user; |
87 | 93 | global $course; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | function default_mode($item) { |
80 | - return $item->is_exercise()?BOLT_MODE_SHOW:BOLT_MODE_LESSON; |
|
80 | + return $item->is_exercise() ?BOLT_MODE_SHOW:BOLT_MODE_LESSON; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | // A page is being shown to the user; make a record of it |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | |
171 | 171 | // show an item (lesson, exercise, answer page) |
172 | 172 | // |
173 | -function show_item($iter, $view_id, $prev_view_id, $mode, $repeat=null) { |
|
173 | +function show_item($iter, $view_id, $prev_view_id, $mode, $repeat = null) { |
|
174 | 174 | global $user; |
175 | 175 | global $course; |
176 | 176 | global $bolt_ex; |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | $bolt_ex->score = 0; |
463 | 463 | $bolt_query_string = $item->query_string; |
464 | 464 | srand($view_id); |
465 | - ob_start(); // buffer output to avoid showing exercise text |
|
465 | + ob_start(); // buffer output to avoid showing exercise text |
|
466 | 466 | require($item->filename); |
467 | 467 | ob_end_clean(); |
468 | 468 |
@@ -31,6 +31,10 @@ discard block |
||
31 | 31 | // If $selection is provided, and if it matches one of the entries in the file, |
32 | 32 | // it will be selected by default. |
33 | 33 | // |
34 | +/** |
|
35 | + * @param string $name |
|
36 | + * @param string $filename |
|
37 | + */ |
|
34 | 38 | function show_combo_box($name, $filename, $selection=null) { |
35 | 39 | echo "<select name=\"$name\" class=\"form-control\">\n"; |
36 | 40 | |
@@ -185,6 +189,9 @@ discard block |
||
185 | 189 | show_language_selection($profile); |
186 | 190 | } |
187 | 191 | |
192 | +/** |
|
193 | + * @param string $name |
|
194 | + */ |
|
188 | 195 | function show_textarea($name, $text) { |
189 | 196 | rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>"); |
190 | 197 | } |
@@ -311,6 +318,9 @@ discard block |
||
311 | 318 | page_tail(); |
312 | 319 | } |
313 | 320 | |
321 | +/** |
|
322 | + * @param string $warning |
|
323 | + */ |
|
314 | 324 | function show_profile_form($profile, $warning=null) { |
315 | 325 | if ($profile) { |
316 | 326 | page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra()); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | // If $selection is provided, and if it matches one of the entries in the file, |
32 | 32 | // it will be selected by default. |
33 | 33 | // |
34 | -function show_combo_box($name, $filename, $selection=null) { |
|
34 | +function show_combo_box($name, $filename, $selection = null) { |
|
35 | 35 | echo "<select name=\"$name\" class=\"form-control\">\n"; |
36 | 36 | |
37 | 37 | $file = fopen($filename, "r"); |
@@ -62,14 +62,14 @@ discard block |
||
62 | 62 | <tr><td colspan=2> |
63 | 63 | <table border=0 cellpadding=5 |
64 | 64 | <tr> |
65 | -<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a> |
|
65 | +<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a> |
|
66 | 66 | </td> |
67 | -<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning) ." |
|
67 | +<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)." |
|
68 | 68 | <p>". |
69 | -tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br /> |
|
69 | +tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br /> |
|
70 | 70 | <input name=picture type=file><br> |
71 | 71 | <p>". |
72 | -tra("To remove it from your profile, check this box:") . " |
|
72 | +tra("To remove it from your profile, check this box:")." |
|
73 | 73 | <input type=checkbox name=delete_pic> |
74 | 74 | <p> |
75 | 75 | </td></tr>"; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | end_table(); |
78 | 78 | echo "</td></tr>"; |
79 | 79 | } else { |
80 | - 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") . " |
|
80 | + 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 | 81 | <p> |
82 | 82 | <input name=picture type=file> |
83 | 83 | "); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | row1(tra("Language")); |
93 | 93 | echo "<tr><td> |
94 | 94 | <p>" . |
95 | - tra("Select the language in which your profile is written:") . " |
|
95 | + tra("Select the language in which your profile is written:")." |
|
96 | 96 | <p> |
97 | 97 | "; |
98 | 98 | if (isset($profile->language)) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | if ($publickey) { |
111 | 111 | table_row(boinc_recaptcha_get_html($publickey)); |
112 | 112 | } |
113 | - table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">"); |
|
113 | + table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">"); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | // Returns an array containing: |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | // Determine if the filetype uploaded is supported. |
126 | 126 | // TODO: Change these to constants. |
127 | - switch($size[2]) { |
|
127 | + switch ($size[2]) { |
|
128 | 128 | case '2': // JPEG |
129 | 129 | $image = imageCreateFromJPEG($fileName); |
130 | 130 | break; |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | |
162 | 162 | function show_description() { |
163 | 163 | echo " |
164 | - <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . " |
|
164 | + <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)." |
|
165 | 165 | <p> |
166 | 166 | "; |
167 | 167 | } |
@@ -179,14 +179,14 @@ discard block |
||
179 | 179 | row1(show_profile_heading1()); |
180 | 180 | rowify(show_profile_question1().bbcode_info()); |
181 | 181 | show_textarea("response1", $response1); |
182 | - row1( show_profile_heading2()); |
|
183 | - rowify( show_profile_question2().bbcode_info()); |
|
182 | + row1(show_profile_heading2()); |
|
183 | + rowify(show_profile_question2().bbcode_info()); |
|
184 | 184 | show_textarea("response2", $response2); |
185 | 185 | show_language_selection($profile); |
186 | 186 | } |
187 | 187 | |
188 | 188 | function show_textarea($name, $text) { |
189 | - rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>"); |
|
189 | + rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>"); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | // $profile is null if user doesn't already have a profile. |
@@ -233,8 +233,8 @@ discard block |
||
233 | 233 | $delete_pic = "off"; |
234 | 234 | } |
235 | 235 | |
236 | - if (strlen($response1)==0 && |
|
237 | - strlen($response2)==0 && |
|
236 | + if (strlen($response1) == 0 && |
|
237 | + strlen($response2) == 0 && |
|
238 | 238 | $delete_pic != "on" && |
239 | 239 | !is_uploaded_file($_FILES['picture']['tmp_name']) |
240 | 240 | ) { |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | $profile->verification = 0; |
249 | 249 | } |
250 | 250 | |
251 | - $profile ? $has_picture = $profile->has_picture: $has_picture = false; |
|
251 | + $profile ? $has_picture = $profile->has_picture : $has_picture = false; |
|
252 | 252 | |
253 | 253 | if (is_uploaded_file($_FILES['picture']['tmp_name'])) { |
254 | 254 | $has_picture = true; |
@@ -263,13 +263,13 @@ discard block |
||
263 | 263 | |
264 | 264 | // Write the original image file to disk. |
265 | 265 | // TODO: define a constant for image quality. |
266 | - ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg'); |
|
267 | - ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg'); |
|
266 | + ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg'); |
|
267 | + ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg'); |
|
268 | 268 | } |
269 | 269 | $response1 = sanitize_html($response1); |
270 | 270 | $response2 = sanitize_html($response2); |
271 | 271 | |
272 | - $has_picture = $has_picture?1:0; |
|
272 | + $has_picture = $has_picture ? 1 : 0; |
|
273 | 273 | if ($profile) { |
274 | 274 | $query = " response1 = '".BoincDb::escape_string($response1)."'," |
275 | 275 | ." response2 = '".BoincDb::escape_string($response2)."'," |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | page_tail(); |
312 | 312 | } |
313 | 313 | |
314 | -function show_profile_form($profile, $warning=null) { |
|
314 | +function show_profile_form($profile, $warning = null) { |
|
315 | 315 | if ($profile) { |
316 | 316 | page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra()); |
317 | 317 | } else { |
@@ -178,6 +178,9 @@ |
||
178 | 178 | row2($x1, $x2, false, "20%"); |
179 | 179 | } |
180 | 180 | |
181 | +/** |
|
182 | + * @param string $text |
|
183 | + */ |
|
181 | 184 | function quote_text($text) { |
182 | 185 | $text = "[quote]" . $text . "[/quote]"; |
183 | 186 | return $text; |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $parent_post_id = 0; |
51 | 51 | } |
52 | 52 | |
53 | -if ($filter != "false"){ |
|
53 | +if ($filter != "false") { |
|
54 | 54 | $filter = true; |
55 | 55 | } else { |
56 | 56 | $filter = false; |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | $warning = null; |
68 | -if ($content && (!$preview)){ |
|
69 | - if (post_str('add_signature',true)=="add_it"){ |
|
68 | +if ($content && (!$preview)) { |
|
69 | + if (post_str('add_signature',true)=="add_it") { |
|
70 | 70 | $add_signature=true; // set a flag and concatenate later |
71 | - } else { |
|
71 | + } else { |
|
72 | 72 | $add_signature=false; |
73 | 73 | } |
74 | 74 | check_tokens($logged_in_user->authenticator); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $parent_post_id = 0; |
51 | 51 | } |
52 | 52 | |
53 | -if ($filter != "false"){ |
|
53 | +if ($filter != "false") { |
|
54 | 54 | $filter = true; |
55 | 55 | } else { |
56 | 56 | $filter = false; |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | $warning = null; |
68 | -if ($content && (!$preview)){ |
|
69 | - if (post_str('add_signature',true)=="add_it"){ |
|
70 | - $add_signature=true; // set a flag and concatenate later |
|
71 | - } else { |
|
72 | - $add_signature=false; |
|
68 | +if ($content && (!$preview)) { |
|
69 | + if (post_str('add_signature', true) == "add_it") { |
|
70 | + $add_signature = true; // set a flag and concatenate later |
|
71 | + } else { |
|
72 | + $add_signature = false; |
|
73 | 73 | } |
74 | 74 | check_tokens($logged_in_user->authenticator); |
75 | 75 | if (!akismet_check($logged_in_user, $content)) { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | } |
89 | 89 | } |
90 | 90 | |
91 | -page_head(tra("Post to thread"),'','','', $bbcode_js); |
|
91 | +page_head(tra("Post to thread"), '', '', '', $bbcode_js); |
|
92 | 92 | |
93 | 93 | show_forum_header($logged_in_user); |
94 | 94 | |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $x1 = tra("Message:").bbcode_info().post_warning(); |
143 | 143 | $x2 = ""; |
144 | 144 | if ($parent_post) { |
145 | - $x2 .=" ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>"); |
|
145 | + $x2 .= " ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>"); |
|
146 | 146 | } |
147 | 147 | $x2 .= "<form action=forum_reply.php?thread=".$thread->id; |
148 | 148 | |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n"; |
154 | 154 | $x2 .= form_tokens($logged_in_user->authenticator); |
155 | 155 | $x2 .= start_table_str().$bbcode_html.end_table_str()."<textarea class=\"form-control\" name=\"content\" rows=\"18\">"; |
156 | - $no_quote = get_int("no_quote", true)==1; |
|
156 | + $no_quote = get_int("no_quote", true) == 1; |
|
157 | 157 | if ($preview) { |
158 | 158 | $x2 .= htmlspecialchars($content); |
159 | 159 | } else if (!$no_quote) { |
@@ -162,9 +162,9 @@ discard block |
||
162 | 162 | } |
163 | 163 | } |
164 | 164 | if (!$logged_in_user->prefs->no_signature_by_default) { |
165 | - $enable_signature="checked=\"true\""; |
|
165 | + $enable_signature = "checked=\"true\""; |
|
166 | 166 | } else { |
167 | - $enable_signature=""; |
|
167 | + $enable_signature = ""; |
|
168 | 168 | } |
169 | 169 | $x2 .= "</textarea><p> </p> |
170 | 170 | <input class=\"btn btn-primary btn-sm \" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\"> |
@@ -179,9 +179,9 @@ discard block |
||
179 | 179 | } |
180 | 180 | |
181 | 181 | function quote_text($text) { |
182 | - $text = "[quote]" . $text . "[/quote]"; |
|
182 | + $text = "[quote]".$text."[/quote]"; |
|
183 | 183 | return $text; |
184 | 184 | } |
185 | 185 | |
186 | -$cvs_version_tracker[]="\$Id$"; |
|
186 | +$cvs_version_tracker[] = "\$Id$"; |
|
187 | 187 | ?> |
@@ -29,6 +29,9 @@ discard block |
||
29 | 29 | // take a host.serialnum field (which may encode several GPUs) |
30 | 30 | // and extract the model name for the given vendor |
31 | 31 | // |
32 | +/** |
|
33 | + * @param string $vendor |
|
34 | + */ |
|
32 | 35 | function get_gpu_model($x, $vendor) { |
33 | 36 | $descs = explode("]", $x); |
34 | 37 | array_pop($descs); |
@@ -60,6 +63,10 @@ discard block |
||
60 | 63 | // $x->linux |
61 | 64 | // $x->mac |
62 | 65 | // |
66 | +/** |
|
67 | + * @param string $vendor |
|
68 | + * @param string $alt_vendor |
|
69 | + */ |
|
63 | 70 | function get_gpu_list($vendor, $alt_vendor=null) { |
64 | 71 | $clause = "plan_class like '%$vendor%'"; |
65 | 72 | if ($alt_vendor) { |
@@ -144,6 +151,9 @@ discard block |
||
144 | 151 | return $x1->avg_time > $x2->avg_time; |
145 | 152 | } |
146 | 153 | |
154 | +/** |
|
155 | + * @param string $name |
|
156 | + */ |
|
147 | 157 | function show_list($models, $name) { |
148 | 158 | echo "<td><h2>$name</h2>\n"; |
149 | 159 | if (!count($models)) { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | // $x->linux |
61 | 61 | // $x->mac |
62 | 62 | // |
63 | -function get_gpu_list($vendor, $alt_vendor=null) { |
|
63 | +function get_gpu_list($vendor, $alt_vendor = null) { |
|
64 | 64 | $clause = "plan_class like '%$vendor%'"; |
65 | 65 | if ($alt_vendor) { |
66 | 66 | $clause .= " or plan_class like '%$alt_vendor%'"; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | $av_ids = ""; |
76 | - foreach($avs as $av) { |
|
76 | + foreach ($avs as $av) { |
|
77 | 77 | $av_ids .= "$av->id, "; |
78 | 78 | } |
79 | 79 | if ($vendor == "cuda") { |
@@ -176,14 +176,14 @@ discard block |
||
176 | 176 | echo tra("No GPU tasks reported"); |
177 | 177 | return; |
178 | 178 | } |
179 | - $have_win = count($x->win)>0; |
|
180 | - $have_mac = count($x->mac)>0; |
|
181 | - $have_linux = count($x->linux)>0; |
|
179 | + $have_win = count($x->win) > 0; |
|
180 | + $have_mac = count($x->mac) > 0; |
|
181 | + $have_linux = count($x->linux) > 0; |
|
182 | 182 | $n = 0; |
183 | 183 | if ($have_win) $n++; |
184 | 184 | if ($have_mac) $n++; |
185 | 185 | if ($have_linux) $n++; |
186 | - $show_total = $n>1; |
|
186 | + $show_total = $n > 1; |
|
187 | 187 | start_table(); |
188 | 188 | echo "<tr>"; |
189 | 189 | if ($show_total) { |
@@ -196,7 +196,7 @@ |
||
196 | 196 | } |
197 | 197 | |
198 | 198 | $d = get_cached_data(86400); |
199 | -$data = FALSE; |
|
199 | +$data = false; |
|
200 | 200 | if ($d) { |
201 | 201 | $data = unserialize($d); |
202 | 202 | } |
@@ -18,6 +18,9 @@ |
||
18 | 18 | |
19 | 19 | require_once("../inc/util.inc"); |
20 | 20 | |
21 | +/** |
|
22 | + * @param integer $t |
|
23 | + */ |
|
21 | 24 | function rsc_name($t) { |
22 | 25 | switch ($t) { |
23 | 26 | case 2: return tra("CPU"); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | if (!$show_dep && $app->deprecated) { |
41 | 41 | return null; |
42 | 42 | } |
43 | - $rsc_type = $gavid % 1000000; |
|
43 | + $rsc_type = $gavid%1000000; |
|
44 | 44 | $r = rsc_name($rsc_type); |
45 | 45 | return "$app->user_friendly_name (".tra("anonymous platform").", $r)"; |
46 | 46 | } else { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | $platform = BoincPlatform::lookup_id($av->platformid); |
62 | 62 | if (!$platform) return tra("Missing platform"); |
63 | - $pc = (strlen($av->plan_class))?"($av->plan_class)":""; |
|
63 | + $pc = (strlen($av->plan_class)) ? "($av->plan_class)" : ""; |
|
64 | 64 | $v = number_format($av->version_num/100, 2); |
65 | 65 | return "$app->user_friendly_name $v $platform->name $pc"; |
66 | 66 | } |
@@ -20,6 +20,9 @@ |
||
20 | 20 | require_once("../inc/util.inc"); |
21 | 21 | require_once("../inc/host.inc"); |
22 | 22 | |
23 | +/** |
|
24 | + * @param string $msg |
|
25 | + */ |
|
23 | 26 | function fail($msg) { |
24 | 27 | echo "Error: $msg"; |
25 | 28 | page_tail(); |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $nhosts = get_int("nhosts"); |
42 | 42 | $hostid = get_int("id_0"); |
43 | 43 | $latest_host = get_host($hostid, $user); |
44 | -for ($i=1; $i<$nhosts; $i++) { |
|
44 | +for ($i = 1; $i < $nhosts; $i++) { |
|
45 | 45 | $var = "id_$i"; |
46 | 46 | $hostid = get_int($var, true); |
47 | 47 | if (!$hostid) continue; |
@@ -30,6 +30,9 @@ discard block |
||
30 | 30 | // |
31 | 31 | // output: success flag, CPU time per step, est. disk usage per job |
32 | 32 | // |
33 | +/** |
|
34 | + * @param resource $p |
|
35 | + */ |
|
33 | 36 | function terminate_job($p) { |
34 | 37 | $pstatus=proc_get_status($p); |
35 | 38 | $ppid=$pstatus['pid']; |
@@ -86,6 +89,9 @@ discard block |
||
86 | 89 | return array($test_result, $total_cpu, $disk_space); |
87 | 90 | } |
88 | 91 | |
92 | +/** |
|
93 | + * @param string $cmd_file |
|
94 | + */ |
|
89 | 95 | function get_total_steps($cmd_file) { |
90 | 96 | $fd = fopen($cmd_file,"r"); |
91 | 97 | if (!$fd) { |
@@ -116,6 +122,9 @@ discard block |
||
116 | 122 | return $total_steps; |
117 | 123 | } |
118 | 124 | |
125 | +/** |
|
126 | + * @param string $filename |
|
127 | + */ |
|
119 | 128 | function calc_step_cpu($filename) { |
120 | 129 | $fd = fopen("$filename", "r"); |
121 | 130 | $start_line = "Step CPU "; |
@@ -169,6 +178,11 @@ discard block |
||
169 | 178 | return array($avg_cpu,$test_steps); |
170 | 179 | } |
171 | 180 | |
181 | +/** |
|
182 | + * @param string $lammps_script |
|
183 | + * @param string $structure_file |
|
184 | + * @param string $cmd_file |
|
185 | + */ |
|
172 | 186 | function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){ |
173 | 187 | $dump_types = 0; |
174 | 188 | $fd = fopen($lammps_script,"r"); |
@@ -280,6 +294,11 @@ discard block |
||
280 | 294 | |
281 | 295 | // verify that an input file exists in sandbox, and return its physical path |
282 | 296 | // |
297 | +/** |
|
298 | + * @param string $name |
|
299 | + * |
|
300 | + * @return string |
|
301 | + */ |
|
283 | 302 | function get_file_path($user, $name) { |
284 | 303 | $fname = get_str($name); |
285 | 304 | |
@@ -308,6 +327,10 @@ discard block |
||
308 | 327 | // |
309 | 328 | // Note: these are both extremely optimistic estimates |
310 | 329 | // |
330 | +/** |
|
331 | + * @param integer $njobs |
|
332 | + * @param double $flops_per_job |
|
333 | + */ |
|
311 | 334 | function estimated_makespan($njobs, $flops_per_job) { |
312 | 335 | $nhosts = BoincHost::count("expavg_credit > 1"); |
313 | 336 | if ($nhosts < 10) { |
@@ -416,6 +439,9 @@ discard block |
||
416 | 439 | page_tail(); |
417 | 440 | } |
418 | 441 | |
442 | +/** |
|
443 | + * @param integer $i |
|
444 | + */ |
|
419 | 445 | function submit_job($app, $batch_id, $info, $cmdline, $i) { |
420 | 446 | $client_disk=$info->rsc_disk_bound*2; |
421 | 447 | if($client_disk<500000000) $client_disk=500000000; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $ppid=$pstatus['pid']; |
36 | 36 | $ret=`ps -o pid --no-heading --ppid $ppid`; |
37 | 37 | //echo "parent pid is $ppid\nterninate it\n"; |
38 | - proc_terminate($p); |
|
38 | + proc_terminate($p); |
|
39 | 39 | // echo "child process is $ret\n"; |
40 | 40 | $pids=preg_split('/\s+/',$ret); |
41 | 41 | foreach($pids as $pid){ |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | while (1) { |
62 | 62 | $ctime=time(); |
63 | 63 | if($ctime-$stime >=2 and ! file_exists("log.1")){ |
64 | - if($GLOBALS["debug"]) echo "time out "."<br>"; |
|
65 | - terminate_job($p); |
|
66 | - break; |
|
64 | + if($GLOBALS["debug"]) echo "time out "."<br>"; |
|
65 | + terminate_job($p); |
|
66 | + break; |
|
67 | 67 | } |
68 | 68 | if (file_exists("log.1")) { |
69 | 69 | list($avg_cpu, $test_steps) = calc_step_cpu("log.1"); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | fclose($fd); |
114 | 114 | //$total_steps = $loopno*$looprun; |
115 | - if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>"; |
|
115 | + if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>"; |
|
116 | 116 | return $total_steps; |
117 | 117 | } |
118 | 118 | |
@@ -147,12 +147,12 @@ discard block |
||
147 | 147 | $cpu = (float)$arr[2]; |
148 | 148 | //echo "step=".$step." cpu=".$cpu."\n"; |
149 | 149 | if ($cpu==0) { |
150 | - $count=0; |
|
151 | - $start_step = $step; |
|
150 | + $count=0; |
|
151 | + $start_step = $step; |
|
152 | 152 | } else { |
153 | 153 | $count+=1; |
154 | 154 | if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>"; |
155 | - if($count >= 10) { |
|
155 | + if($count >= 10) { |
|
156 | 156 | $end_step = $step; |
157 | 157 | $steps = $end_step-$start_step; |
158 | 158 | $avg_cpu = $cpu/$steps; |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | |
184 | 184 | if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches)) |
185 | 185 | { |
186 | - if($GLOBALS["debug"]){print "matches=";print_r($matches);} |
|
186 | + if($GLOBALS["debug"]){print "matches=";print_r($matches);} |
|
187 | 187 | |
188 | 188 | $dump_types=(int)$matches[1]; |
189 | 189 | break; |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | echo "can not open file $cmd_file\n"; |
199 | 199 | exit(-1); |
200 | 200 | } |
201 | - if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>"; |
|
201 | + if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>"; |
|
202 | 202 | |
203 | 203 | $loopno=1; |
204 | 204 | $looprun=1; |
@@ -216,8 +216,8 @@ discard block |
||
216 | 216 | } |
217 | 217 | fclose($fd); |
218 | 218 | if($GLOBALS["debug"]){ |
219 | - print "max loopno(number of loops to run)=".$loopno."<br>"; |
|
220 | - print "max looprun(steps for each loop)=".$looprun."<br>"; |
|
219 | + print "max loopno(number of loops to run)=".$loopno."<br>"; |
|
220 | + print "max looprun(steps for each loop)=".$looprun."<br>"; |
|
221 | 221 | } |
222 | 222 | //$est_size = $loopno*$structure_file_size*0.8*$dump_types; |
223 | 223 | $test_log_size = filesize("log.1"); |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | <br>Please refer to the following Error Message:<br><p> |
369 | 369 | "; |
370 | 370 | foreach($err_msgs as $line){ |
371 | - $err=$err.$line."<br>"; |
|
371 | + $err=$err.$line."<br>"; |
|
372 | 372 | } |
373 | 373 | $err=$err." <p> |
374 | 374 | <a href=sandbox.php><strong> File_Sandbox </strong></a> |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | // |
394 | 394 | $njobs = count(file($cmdline_file_path)); |
395 | 395 | $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est); |
396 | - if($GLOBALS["debug"])echo "secs_est is $secs_est\n"; |
|
396 | + if($GLOBALS["debug"])echo "secs_est is $secs_est\n"; |
|
397 | 397 | //assume the server's flops is 1.5G and the average client's flops is 1G |
398 | 398 | $hrs_est = number_format($secs_est*1.5/60, 2); |
399 | 399 | //$hrs_est = number_format($secs_est, 2); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | require_once("../inc/util.inc"); |
19 | 19 | require_once("../inc/submit_db.inc"); |
20 | 20 | require_once("../inc/sandbox.inc"); |
21 | -$debug=0; |
|
21 | +$debug = 0; |
|
22 | 22 | |
23 | 23 | // test a LAMMPS job |
24 | 24 | // |
@@ -31,17 +31,17 @@ discard block |
||
31 | 31 | // output: success flag, CPU time per step, est. disk usage per job |
32 | 32 | // |
33 | 33 | function terminate_job($p) { |
34 | - $pstatus=proc_get_status($p); |
|
35 | - $ppid=$pstatus['pid']; |
|
36 | - $ret=`ps -o pid --no-heading --ppid $ppid`; |
|
34 | + $pstatus = proc_get_status($p); |
|
35 | + $ppid = $pstatus['pid']; |
|
36 | + $ret = `ps -o pid --no-heading --ppid $ppid`; |
|
37 | 37 | //echo "parent pid is $ppid\nterninate it\n"; |
38 | 38 | proc_terminate($p); |
39 | 39 | // echo "child process is $ret\n"; |
40 | - $pids=preg_split('/\s+/',$ret); |
|
41 | - foreach($pids as $pid){ |
|
42 | - if(is_numeric($pid)){ |
|
43 | - if($GLOBALS["debug"])echo "killing child process $pid\n"; |
|
44 | - posix_kill($pid,9); |
|
40 | + $pids = preg_split('/\s+/', $ret); |
|
41 | + foreach ($pids as $pid) { |
|
42 | + if (is_numeric($pid)) { |
|
43 | + if ($GLOBALS["debug"])echo "killing child process $pid\n"; |
|
44 | + posix_kill($pid, 9); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | } |
@@ -52,23 +52,23 @@ discard block |
||
52 | 52 | $descs = array(); |
53 | 53 | $pipes = array(); |
54 | 54 | $options = file("cmd_variables"); |
55 | - $options[0] = chop($options[0],"\n"); |
|
55 | + $options[0] = chop($options[0], "\n"); |
|
56 | 56 | $cmd = "../lmp_linux ".$options[0]."&>output"; |
57 | 57 | if ($GLOBALS["debug"]) echo $cmd."<br>"; |
58 | 58 | system("unzip pot_files >/dev/null"); |
59 | 59 | $stime = time(); |
60 | 60 | $p = proc_open("$cmd", $descs, $pipes); |
61 | 61 | while (1) { |
62 | - $ctime=time(); |
|
63 | - if($ctime-$stime >=2 and ! file_exists("log.1")){ |
|
64 | - if($GLOBALS["debug"]) echo "time out "."<br>"; |
|
62 | + $ctime = time(); |
|
63 | + if ($ctime - $stime >= 2 and !file_exists("log.1")) { |
|
64 | + if ($GLOBALS["debug"]) echo "time out "."<br>"; |
|
65 | 65 | terminate_job($p); |
66 | 66 | break; |
67 | 67 | } |
68 | 68 | if (file_exists("log.1")) { |
69 | 69 | list($avg_cpu, $test_steps) = calc_step_cpu("log.1"); |
70 | 70 | if ($avg_cpu != 0) { |
71 | - if($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>"; |
|
71 | + if ($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>"; |
|
72 | 72 | terminate_job($p); |
73 | 73 | $test_result = 1; |
74 | 74 | break; |
@@ -87,32 +87,32 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | function get_total_steps($cmd_file) { |
90 | - $fd = fopen($cmd_file,"r"); |
|
90 | + $fd = fopen($cmd_file, "r"); |
|
91 | 91 | if (!$fd) { |
92 | 92 | echo "can not open file $cmd_file\n"; |
93 | 93 | exit(-1); |
94 | 94 | } |
95 | 95 | $this_loopno = 1; |
96 | 96 | $this_looprun = 1; |
97 | - $total_steps=1; |
|
97 | + $total_steps = 1; |
|
98 | 98 | while (!feof($fd)) { |
99 | - $line = fgets($fd,4096); |
|
99 | + $line = fgets($fd, 4096); |
|
100 | 100 | if (preg_match("/loopnumber\s+\d+/", $line, $matches) |
101 | 101 | && preg_match("/\d+/", $matches[0], $no) |
102 | 102 | ) { |
103 | - $this_loopno=$no[0]; |
|
103 | + $this_loopno = $no[0]; |
|
104 | 104 | } |
105 | 105 | if (preg_match("/looprun\s+\d+/", $line, $matches) |
106 | 106 | and preg_match("/\d+/", $matches[0], $no) |
107 | 107 | ) { |
108 | - $this_looprun=$no[0]; |
|
109 | - if($this_loopno*$this_looprun>$total_steps)$total_steps=$this_loopno*$this_looprun; |
|
108 | + $this_looprun = $no[0]; |
|
109 | + if ($this_loopno*$this_looprun > $total_steps)$total_steps = $this_loopno*$this_looprun; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | } |
113 | 113 | fclose($fd); |
114 | 114 | //$total_steps = $loopno*$looprun; |
115 | - if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>"; |
|
115 | + if ($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>"; |
|
116 | 116 | return $total_steps; |
117 | 117 | } |
118 | 118 | |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | } |
131 | 131 | $count = 0; |
132 | 132 | while (!feof($fd)) { |
133 | - $line = fgets($fd,4096); |
|
134 | - if (preg_match('/^Step\s+CPU/',$line)) { |
|
133 | + $line = fgets($fd, 4096); |
|
134 | + if (preg_match('/^Step\s+CPU/', $line)) { |
|
135 | 135 | //echo $line."\n"; |
136 | 136 | $start = 1; |
137 | 137 | continue; |
@@ -140,24 +140,24 @@ discard block |
||
140 | 140 | $arr = preg_split("/\s+/", $line); |
141 | 141 | //print_r($arr); |
142 | 142 | |
143 | - if (count($arr) <=6 || !is_numeric($arr[1])) { |
|
143 | + if (count($arr) <= 6 || !is_numeric($arr[1])) { |
|
144 | 144 | continue; |
145 | 145 | } |
146 | 146 | $step = (int)$arr[1]; |
147 | 147 | $cpu = (float)$arr[2]; |
148 | 148 | //echo "step=".$step." cpu=".$cpu."\n"; |
149 | - if ($cpu==0) { |
|
150 | - $count=0; |
|
149 | + if ($cpu == 0) { |
|
150 | + $count = 0; |
|
151 | 151 | $start_step = $step; |
152 | 152 | } else { |
153 | - $count+=1; |
|
154 | - if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>"; |
|
155 | - if($count >= 10) { |
|
153 | + $count += 1; |
|
154 | + if ($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>"; |
|
155 | + if ($count >= 10) { |
|
156 | 156 | $end_step = $step; |
157 | - $steps = $end_step-$start_step; |
|
157 | + $steps = $end_step - $start_step; |
|
158 | 158 | $avg_cpu = $cpu/$steps; |
159 | 159 | #$avg_cpu = $cpu/$count; |
160 | - if ($GLOBALS["debug"]){ |
|
160 | + if ($GLOBALS["debug"]) { |
|
161 | 161 | echo "test steps is ".$steps."<br>"; |
162 | 162 | echo "avg_cpu is ".$avg_cpu."<br>"; |
163 | 163 | } |
@@ -166,56 +166,56 @@ discard block |
||
166 | 166 | } |
167 | 167 | } |
168 | 168 | } |
169 | - return array($avg_cpu,$test_steps); |
|
169 | + return array($avg_cpu, $test_steps); |
|
170 | 170 | } |
171 | 171 | |
172 | -function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){ |
|
172 | +function calc_est_size($lammps_script, $structure_file, $cmd_file, $test_steps) { |
|
173 | 173 | $dump_types = 0; |
174 | - $fd = fopen($lammps_script,"r"); |
|
175 | - if (!$fd){ |
|
174 | + $fd = fopen($lammps_script, "r"); |
|
175 | + if (!$fd) { |
|
176 | 176 | echo "can not open file $lammps_script\n"; |
177 | 177 | exit(-1); |
178 | 178 | } |
179 | - while (!feof($fd)){ |
|
179 | + while (!feof($fd)) { |
|
180 | 180 | $line = fgets($fd, 4096); |
181 | 181 | //if (preg_match("/^\s*dump/", $line) |
182 | 182 | // and preg_match_all("/dump\S+\.\w{3}/", $line, $matches, PREG_PATTERN_ORDER)) |
183 | 183 | |
184 | - if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches)) |
|
184 | + if (preg_match("/^\s*dump\s+(\d)\s+/", $line, $matches)) |
|
185 | 185 | { |
186 | - if($GLOBALS["debug"]){print "matches=";print_r($matches);} |
|
186 | + if ($GLOBALS["debug"]) {print "matches="; print_r($matches); } |
|
187 | 187 | |
188 | - $dump_types=(int)$matches[1]; |
|
188 | + $dump_types = (int)$matches[1]; |
|
189 | 189 | break; |
190 | 190 | } |
191 | 191 | } |
192 | 192 | fclose($fd); |
193 | - if($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>"; |
|
193 | + if ($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>"; |
|
194 | 194 | |
195 | 195 | $structure_file_size = filesize($structure_file); |
196 | - $fd = fopen($cmd_file,"r"); |
|
197 | - if (!$fd){ |
|
196 | + $fd = fopen($cmd_file, "r"); |
|
197 | + if (!$fd) { |
|
198 | 198 | echo "can not open file $cmd_file\n"; |
199 | 199 | exit(-1); |
200 | 200 | } |
201 | - if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>"; |
|
201 | + if ($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>"; |
|
202 | 202 | |
203 | - $loopno=1; |
|
204 | - $looprun=1; |
|
205 | - while (!feof($fd)){ |
|
206 | - $line = fgets($fd,4096); |
|
207 | - if(preg_match("/loopnumber\s+\d+/", $line, $matches)){ |
|
208 | - if(preg_match("/\d+/", $matches[0], $no)){ |
|
203 | + $loopno = 1; |
|
204 | + $looprun = 1; |
|
205 | + while (!feof($fd)) { |
|
206 | + $line = fgets($fd, 4096); |
|
207 | + if (preg_match("/loopnumber\s+\d+/", $line, $matches)) { |
|
208 | + if (preg_match("/\d+/", $matches[0], $no)) { |
|
209 | 209 | //$loopno=$no[0]; |
210 | - if($no[0]>$loopno)$loopno=$no[0]; |
|
210 | + if ($no[0] > $loopno)$loopno = $no[0]; |
|
211 | 211 | } |
212 | 212 | } |
213 | 213 | if (preg_match("/looprun\s+\d+/", $line, $matches) and preg_match("/\d+/", $matches[0], $no)) { |
214 | - if($no[0]>$looprun)$looprun=$no[0]; |
|
214 | + if ($no[0] > $looprun)$looprun = $no[0]; |
|
215 | 215 | } |
216 | 216 | } |
217 | 217 | fclose($fd); |
218 | - if($GLOBALS["debug"]){ |
|
218 | + if ($GLOBALS["debug"]) { |
|
219 | 219 | print "max loopno(number of loops to run)=".$loopno."<br>"; |
220 | 220 | print "max looprun(steps for each loop)=".$looprun."<br>"; |
221 | 221 | } |
@@ -226,12 +226,12 @@ discard block |
||
226 | 226 | $dump_files = glob("dump1*"); |
227 | 227 | $test_dump_file = $dump_files[0]; |
228 | 228 | $test_dump_size = filesize($test_dump_file); |
229 | - $dump_size1 = $test_dump_size+0.5*$test_dump_size*ceil(($looprun-$test_steps)/$test_steps); |
|
229 | + $dump_size1 = $test_dump_size + 0.5*$test_dump_size*ceil(($looprun - $test_steps)/$test_steps); |
|
230 | 230 | $dump_size = $loopno*$dump_size1*$dump_types; |
231 | 231 | $app_fixed_size = 5e7; |
232 | - $est_size = $log_size+$dump_size+$app_fixed_size; |
|
232 | + $est_size = $log_size + $dump_size + $app_fixed_size; |
|
233 | 233 | |
234 | - if($GLOBALS["debug"]){ |
|
234 | + if ($GLOBALS["debug"]) { |
|
235 | 235 | print "test_steps=".$test_steps."<br>"; |
236 | 236 | print "test_log_size=".$test_log_size."<br>"; |
237 | 237 | print "log_size1=".$log_size1."<br>"; |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | if ($njobs < $nhosts) { |
323 | 323 | return $flops_per_job/$median_flops; |
324 | 324 | } else { |
325 | - $k = (int)(($njobs+$nhosts-1)/$nhosts); |
|
325 | + $k = (int)(($njobs + $nhosts - 1)/$nhosts); |
|
326 | 326 | return $k*$flops_per_job/$median_flops; |
327 | 327 | } |
328 | 328 | } |
@@ -362,27 +362,27 @@ discard block |
||
362 | 362 | if ($GLOBALS["debug"]) { |
363 | 363 | print "est_cpu_time is ".$est_cpu_time."<br>"; |
364 | 364 | } |
365 | - if ($error==0) { |
|
366 | - $err_msgs=file("output"); |
|
367 | - $err="Your test job <strong>failed</strong> |
|
365 | + if ($error == 0) { |
|
366 | + $err_msgs = file("output"); |
|
367 | + $err = "Your test job <strong>failed</strong> |
|
368 | 368 | <br>Please refer to the following Error Message:<br><p> |
369 | 369 | "; |
370 | - foreach($err_msgs as $line){ |
|
371 | - $err=$err.$line."<br>"; |
|
370 | + foreach ($err_msgs as $line) { |
|
371 | + $err = $err.$line."<br>"; |
|
372 | 372 | } |
373 | - $err=$err." <p> |
|
373 | + $err = $err." <p> |
|
374 | 374 | <a href=sandbox.php><strong> File_Sandbox </strong></a> |
375 | 375 | "; |
376 | 376 | error_page($err); |
377 | 377 | } |
378 | 378 | |
379 | 379 | system("rm *"); |
380 | - $info->rsc_fpops_est = $est_cpu_time * 1.5e9; |
|
381 | - $info->rsc_fpops_bound = $info->rsc_fpops_est * 20; |
|
380 | + $info->rsc_fpops_est = $est_cpu_time*1.5e9; |
|
381 | + $info->rsc_fpops_bound = $info->rsc_fpops_est*20; |
|
382 | 382 | |
383 | - if ($disk==0){ |
|
384 | - $info->rsc_disk_bound=1000000; |
|
385 | - } else{ |
|
383 | + if ($disk == 0) { |
|
384 | + $info->rsc_disk_bound = 1000000; |
|
385 | + } else { |
|
386 | 386 | $info->rsc_disk_bound = $disk; |
387 | 387 | } |
388 | 388 | |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | // |
394 | 394 | $njobs = count(file($cmdline_file_path)); |
395 | 395 | $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est); |
396 | - if($GLOBALS["debug"])echo "secs_est is $secs_est\n"; |
|
396 | + if ($GLOBALS["debug"])echo "secs_est is $secs_est\n"; |
|
397 | 397 | //assume the server's flops is 1.5G and the average client's flops is 1G |
398 | 398 | $hrs_est = number_format($secs_est*1.5/60, 2); |
399 | 399 | //$hrs_est = number_format($secs_est, 2); |
@@ -417,8 +417,8 @@ discard block |
||
417 | 417 | } |
418 | 418 | |
419 | 419 | function submit_job($app, $batch_id, $info, $cmdline, $i) { |
420 | - $client_disk=$info->rsc_disk_bound*2; |
|
421 | - if($client_disk<500000000) $client_disk=500000000; |
|
420 | + $client_disk = $info->rsc_disk_bound*2; |
|
421 | + if ($client_disk < 500000000) $client_disk = 500000000; |
|
422 | 422 | $cmd = "cd ../..; ./bin/create_work --appname $app->name --batch $batch_id --rsc_fpops_est $info->rsc_fpops_est --rsc_fpops_bound $info->rsc_fpops_bound --rsc_disk_bound $client_disk"; |
423 | 423 | if ($cmdline) { |
424 | 424 | $cmd .= " --command_line \"$cmdline\""; |
@@ -442,9 +442,9 @@ discard block |
||
442 | 442 | $x = file_get_contents("$tmpfile"); |
443 | 443 | $info = unserialize($x); |
444 | 444 | |
445 | - $njobs=0; |
|
445 | + $njobs = 0; |
|
446 | 446 | $cmdlines = file($info->cmdline_file_path); |
447 | - foreach ($cmdlines as $cmdline){ |
|
447 | + foreach ($cmdlines as $cmdline) { |
|
448 | 448 | if (preg_match("/^\s*-var/", $cmdline)) { |
449 | 449 | $njobs++; |
450 | 450 | } |
@@ -460,7 +460,7 @@ discard block |
||
460 | 460 | |
461 | 461 | $i = 0; |
462 | 462 | foreach ($cmdlines as $cmdline) { |
463 | - if (preg_match("/^\s*-var/", $cmdline)){ |
|
463 | + if (preg_match("/^\s*-var/", $cmdline)) { |
|
464 | 464 | submit_job($app, $batch_id, $info, $cmdline, $i); |
465 | 465 | $i++; |
466 | 466 | } |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | proc_terminate($p); |
39 | 39 | // echo "child process is $ret\n"; |
40 | 40 | $pids=preg_split('/\s+/',$ret); |
41 | - foreach($pids as $pid){ |
|
42 | - if(is_numeric($pid)){ |
|
41 | + foreach($pids as $pid) { |
|
42 | + if(is_numeric($pid)) { |
|
43 | 43 | if($GLOBALS["debug"])echo "killing child process $pid\n"; |
44 | 44 | posix_kill($pid,9); |
45 | 45 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $p = proc_open("$cmd", $descs, $pipes); |
61 | 61 | while (1) { |
62 | 62 | $ctime=time(); |
63 | - if($ctime-$stime >=2 and ! file_exists("log.1")){ |
|
63 | + if($ctime-$stime >=2 and ! file_exists("log.1")) { |
|
64 | 64 | if($GLOBALS["debug"]) echo "time out "."<br>"; |
65 | 65 | terminate_job($p); |
66 | 66 | break; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $steps = $end_step-$start_step; |
158 | 158 | $avg_cpu = $cpu/$steps; |
159 | 159 | #$avg_cpu = $cpu/$count; |
160 | - if ($GLOBALS["debug"]){ |
|
160 | + if ($GLOBALS["debug"]) { |
|
161 | 161 | echo "test steps is ".$steps."<br>"; |
162 | 162 | echo "avg_cpu is ".$avg_cpu."<br>"; |
163 | 163 | } |
@@ -169,20 +169,19 @@ discard block |
||
169 | 169 | return array($avg_cpu,$test_steps); |
170 | 170 | } |
171 | 171 | |
172 | -function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){ |
|
172 | +function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps) { |
|
173 | 173 | $dump_types = 0; |
174 | 174 | $fd = fopen($lammps_script,"r"); |
175 | - if (!$fd){ |
|
175 | + if (!$fd) { |
|
176 | 176 | echo "can not open file $lammps_script\n"; |
177 | 177 | exit(-1); |
178 | 178 | } |
179 | - while (!feof($fd)){ |
|
179 | + while (!feof($fd)) { |
|
180 | 180 | $line = fgets($fd, 4096); |
181 | 181 | //if (preg_match("/^\s*dump/", $line) |
182 | 182 | // and preg_match_all("/dump\S+\.\w{3}/", $line, $matches, PREG_PATTERN_ORDER)) |
183 | 183 | |
184 | - if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches)) |
|
185 | - { |
|
184 | + if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches)) { |
|
186 | 185 | if($GLOBALS["debug"]){print "matches=";print_r($matches);} |
187 | 186 | |
188 | 187 | $dump_types=(int)$matches[1]; |
@@ -194,7 +193,7 @@ discard block |
||
194 | 193 | |
195 | 194 | $structure_file_size = filesize($structure_file); |
196 | 195 | $fd = fopen($cmd_file,"r"); |
197 | - if (!$fd){ |
|
196 | + if (!$fd) { |
|
198 | 197 | echo "can not open file $cmd_file\n"; |
199 | 198 | exit(-1); |
200 | 199 | } |
@@ -202,10 +201,10 @@ discard block |
||
202 | 201 | |
203 | 202 | $loopno=1; |
204 | 203 | $looprun=1; |
205 | - while (!feof($fd)){ |
|
204 | + while (!feof($fd)) { |
|
206 | 205 | $line = fgets($fd,4096); |
207 | - if(preg_match("/loopnumber\s+\d+/", $line, $matches)){ |
|
208 | - if(preg_match("/\d+/", $matches[0], $no)){ |
|
206 | + if(preg_match("/loopnumber\s+\d+/", $line, $matches)) { |
|
207 | + if(preg_match("/\d+/", $matches[0], $no)) { |
|
209 | 208 | //$loopno=$no[0]; |
210 | 209 | if($no[0]>$loopno)$loopno=$no[0]; |
211 | 210 | } |
@@ -215,7 +214,7 @@ discard block |
||
215 | 214 | } |
216 | 215 | } |
217 | 216 | fclose($fd); |
218 | - if($GLOBALS["debug"]){ |
|
217 | + if($GLOBALS["debug"]) { |
|
219 | 218 | print "max loopno(number of loops to run)=".$loopno."<br>"; |
220 | 219 | print "max looprun(steps for each loop)=".$looprun."<br>"; |
221 | 220 | } |
@@ -231,7 +230,7 @@ discard block |
||
231 | 230 | $app_fixed_size = 5e7; |
232 | 231 | $est_size = $log_size+$dump_size+$app_fixed_size; |
233 | 232 | |
234 | - if($GLOBALS["debug"]){ |
|
233 | + if($GLOBALS["debug"]) { |
|
235 | 234 | print "test_steps=".$test_steps."<br>"; |
236 | 235 | print "test_log_size=".$test_log_size."<br>"; |
237 | 236 | print "log_size1=".$log_size1."<br>"; |
@@ -367,7 +366,7 @@ discard block |
||
367 | 366 | $err="Your test job <strong>failed</strong> |
368 | 367 | <br>Please refer to the following Error Message:<br><p> |
369 | 368 | "; |
370 | - foreach($err_msgs as $line){ |
|
369 | + foreach($err_msgs as $line) { |
|
371 | 370 | $err=$err.$line."<br>"; |
372 | 371 | } |
373 | 372 | $err=$err." <p> |
@@ -380,9 +379,9 @@ discard block |
||
380 | 379 | $info->rsc_fpops_est = $est_cpu_time * 1.5e9; |
381 | 380 | $info->rsc_fpops_bound = $info->rsc_fpops_est * 20; |
382 | 381 | |
383 | - if ($disk==0){ |
|
382 | + if ($disk==0) { |
|
384 | 383 | $info->rsc_disk_bound=1000000; |
385 | - } else{ |
|
384 | + } else { |
|
386 | 385 | $info->rsc_disk_bound = $disk; |
387 | 386 | } |
388 | 387 | |
@@ -444,7 +443,7 @@ discard block |
||
444 | 443 | |
445 | 444 | $njobs=0; |
446 | 445 | $cmdlines = file($info->cmdline_file_path); |
447 | - foreach ($cmdlines as $cmdline){ |
|
446 | + foreach ($cmdlines as $cmdline) { |
|
448 | 447 | if (preg_match("/^\s*-var/", $cmdline)) { |
449 | 448 | $njobs++; |
450 | 449 | } |
@@ -460,7 +459,7 @@ discard block |
||
460 | 459 | |
461 | 460 | $i = 0; |
462 | 461 | foreach ($cmdlines as $cmdline) { |
463 | - if (preg_match("/^\s*-var/", $cmdline)){ |
|
462 | + if (preg_match("/^\s*-var/", $cmdline)) { |
|
464 | 463 | submit_job($app, $batch_id, $info, $cmdline, $i); |
465 | 464 | $i++; |
466 | 465 | } |
@@ -430,7 +430,7 @@ |
||
430 | 430 | //echo "<br> $cmd\n"; |
431 | 431 | |
432 | 432 | system($cmd, $ret); |
433 | - if ($ret === FALSE) { |
|
433 | + if ($ret === false) { |
|
434 | 434 | error_page("can't create job"); |
435 | 435 | } else { |
436 | 436 | header('Location: submit.php'); |