@@ -32,7 +32,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 { |
@@ -93,9 +93,9 @@ |
||
| 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"); |
@@ -298,7 +298,7 @@ |
||
| 298 | 298 | |
| 299 | 299 | render(); |
| 300 | 300 | |
| 301 | -EOT; |
|
| 301 | +eot; |
|
| 302 | 302 | echo "</script>\n"; |
| 303 | 303 | } |
| 304 | 304 | |
@@ -31,14 +31,14 @@ |
||
| 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 | |
@@ -32,7 +32,7 @@ |
||
| 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 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | foreach ($res_in_prog as $res) { |
| 180 | 180 | $wus_in_prog[$res->workunitid] = true; |
| 181 | 181 | } |
| 182 | - unset($res_in_progress); // does this do anything? |
|
| 182 | + unset($res_in_progress); // does this do anything? |
|
| 183 | 183 | |
| 184 | 184 | $fp_total = 0; |
| 185 | 185 | $fp_done = 0; |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | // get the total size of output files of a batch |
| 353 | 353 | // |
| 354 | 354 | function batch_output_file_size($batchid) { |
| 355 | - $batch_td_size=0; |
|
| 355 | + $batch_td_size = 0; |
|
| 356 | 356 | $wus = BoincWorkunit::enum_fields( |
| 357 | 357 | 'canonical_resultid', |
| 358 | 358 | "batch=$batchid" |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | function boinc_get_wu_output_files_url($user, $wu_id) { |
| 388 | - $auth_str = md5($user->authenticator.$wu_id); |
|
| 388 | + $auth_str = md5($user->authenticator.$wu_id); |
|
| 389 | 389 | return "get_output.php?cmd=workunit_files&wu_id=$wu_id&auth_str=$auth_str"; |
| 390 | 390 | } |
| 391 | 391 | |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | if (!file_exists($path)) return null; |
| 420 | 420 | $x = file_get_contents($path); |
| 421 | 421 | $n = sscanf($x, "%s %d", $md5, $size); |
| 422 | - if ($n != 2 || strlen($md5)!=32) { |
|
| 422 | + if ($n != 2 || strlen($md5) != 32) { |
|
| 423 | 423 | return null; |
| 424 | 424 | } |
| 425 | 425 | return [$md5, $size]; |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | require_once('../inc/util.inc'); |
| 6 | 6 | require_once('../inc/sandbox.inc'); |
| 7 | 7 | |
| 8 | -function sb_file_select($user, $suffix=null) { |
|
| 8 | +function sb_file_select($user, $suffix = null) { |
|
| 9 | 9 | $sbfiles = sandbox_file_names($user); |
| 10 | 10 | $sbitems = []; |
| 11 | 11 | $exp = null; |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | $master_url = master_url(); |
| 31 | 31 | $idx = strpos($master_url, '://'); |
| 32 | 32 | if ($idx) { |
| 33 | - $url = substr($master_url, $idx+strlen('://')); |
|
| 33 | + $url = substr($master_url, $idx + strlen('://')); |
|
| 34 | 34 | } else { |
| 35 | 35 | $url = $master_url; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // convert invalid characters into underscores |
| 39 | 39 | // |
| 40 | -for ($i=0; $i<strlen($url); $i++) { |
|
| 40 | +for ($i = 0; $i < strlen($url); $i++) { |
|
| 41 | 41 | $c = $url[$i]; |
| 42 | 42 | if (!ctype_alnum($c) && $c != '.' && $c != '-' && $c != '_') { |
| 43 | 43 | $url[$i] = '_'; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | //remove trailing underscore(s) |
| 48 | 48 | // |
| 49 | -$account_file = "account_" . rtrim($url, '_') . ".xml"; |
|
| 49 | +$account_file = "account_".rtrim($url, '_').".xml"; |
|
| 50 | 50 | |
| 51 | 51 | page_head(tra("Account keys")); |
| 52 | 52 | text_start(); |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | <p>", |
| 59 | 59 | tra("This key can be used to:"), |
| 60 | 60 | "<ul> |
| 61 | - <li><a href=get_passwd.php>",tra("log in to your account on the web"),"</a>; |
|
| 61 | + <li><a href=get_passwd.php>",tra("log in to your account on the web"), "</a>; |
|
| 62 | 62 | <li>", |
| 63 | 63 | tra("attach a computer to your account without using the BOINC Manager. |
| 64 | 64 | To do so, install BOINC, |
| 65 | 65 | create a file named %1 in the BOINC |
| 66 | - data directory, and set its contents to:","<b>$account_file</b>")," |
|
| 66 | + data directory, and set its contents to:","<b>$account_file</b>"), " |
|
| 67 | 67 | <p><pre>", |
| 68 | 68 | htmlspecialchars( |
| 69 | 69 | "<account> |
@@ -77,10 +77,10 @@ discard block |
||
| 77 | 77 | as described above, but cannot be used to log in to your account or change it in any way. |
| 78 | 78 | If you want to attach untrusted or insecure computers to your account, |
| 79 | 79 | do so using your weak account key. |
| 80 | - Your weak account key is:")," |
|
| 80 | + Your weak account key is:"), " |
|
| 81 | 81 | <p><pre>$weak_auth</pre><p> |
| 82 | 82 | ", |
| 83 | - tra("The key depends on your account's email address and password. If you change either of these, the weak account key will change.")," |
|
| 83 | + tra("The key depends on your account's email address and password. If you change either of these, the weak account key will change."), " |
|
| 84 | 84 | </td></tr></table>" |
| 85 | 85 | ; |
| 86 | 86 | text_end(); |
@@ -24,77 +24,77 @@ discard block |
||
| 24 | 24 | define('KW_CATEGORY_SCIENCE', 0); |
| 25 | 25 | define('KW_CATEGORY_LOC', 1); |
| 26 | 26 | |
| 27 | -define('KW_ASTRONOMY', 1); |
|
| 28 | -define('KW_SETI', 2); |
|
| 29 | -define('KW_PULSARS', 3); |
|
| 30 | -define('KW_GW', 4); |
|
| 31 | -define('KW_COSMOLOGY', 5); |
|
| 32 | -define('KW_PHYSICS', 6); |
|
| 27 | +define('KW_ASTRONOMY', 1); |
|
| 28 | +define('KW_SETI', 2); |
|
| 29 | +define('KW_PULSARS', 3); |
|
| 30 | +define('KW_GW', 4); |
|
| 31 | +define('KW_COSMOLOGY', 5); |
|
| 32 | +define('KW_PHYSICS', 6); |
|
| 33 | 33 | define('KW_PARTICLE_PHYSICS', 7); |
| 34 | -define('KW_NANOSCIENCE', 8); |
|
| 35 | -define('KW_BIOMED', 9); |
|
| 34 | +define('KW_NANOSCIENCE', 8); |
|
| 35 | +define('KW_BIOMED', 9); |
|
| 36 | 36 | define('KW_DRUG_DISCOVERY', 10); |
| 37 | -define('KW_PROTEINS', 11); |
|
| 38 | -define('KW_GENETICS', 12); |
|
| 39 | -define('KW_DISEASE', 13); |
|
| 40 | -define('KW_CANCER', 14); |
|
| 41 | -define('KW_MATH_CS', 15); |
|
| 42 | -define('KW_AI', 16); |
|
| 43 | -define('KW_OCEANIA', 17); |
|
| 44 | -define('KW_AUSTRALIA', 18); |
|
| 37 | +define('KW_PROTEINS', 11); |
|
| 38 | +define('KW_GENETICS', 12); |
|
| 39 | +define('KW_DISEASE', 13); |
|
| 40 | +define('KW_CANCER', 14); |
|
| 41 | +define('KW_MATH_CS', 15); |
|
| 42 | +define('KW_AI', 16); |
|
| 43 | +define('KW_OCEANIA', 17); |
|
| 44 | +define('KW_AUSTRALIA', 18); |
|
| 45 | 45 | |
| 46 | -define('KW_EUROPE', 20); |
|
| 47 | -define('KW_GERMANY', 21); |
|
| 48 | -define('KW_ASIA', 22); |
|
| 49 | -define('KW_AMERICAS', 23); |
|
| 50 | -define('KW_US', 24); |
|
| 51 | -define('KW_UCB', 25); |
|
| 52 | -define('KW_AEI', 26); |
|
| 53 | -define('KW_CERN', 27); |
|
| 54 | -define('KW_UW', 28); |
|
| 55 | -define('KW_EARTH_SCI', 29); |
|
| 56 | -define('KW_SPAIN', 30); |
|
| 57 | -define('KW_SAN_JORGE', 31); |
|
| 58 | -define('KW_NUMBER_THEORY', 32); |
|
| 59 | -define('KW_CRYPTO', 33); |
|
| 60 | -define('KW_ENV_RESEARCH', 34); |
|
| 61 | -define('KW_CLIMATE', 35); |
|
| 62 | -define('KW_CZECH', 36); |
|
| 46 | +define('KW_EUROPE', 20); |
|
| 47 | +define('KW_GERMANY', 21); |
|
| 48 | +define('KW_ASIA', 22); |
|
| 49 | +define('KW_AMERICAS', 23); |
|
| 50 | +define('KW_US', 24); |
|
| 51 | +define('KW_UCB', 25); |
|
| 52 | +define('KW_AEI', 26); |
|
| 53 | +define('KW_CERN', 27); |
|
| 54 | +define('KW_UW', 28); |
|
| 55 | +define('KW_EARTH_SCI', 29); |
|
| 56 | +define('KW_SPAIN', 30); |
|
| 57 | +define('KW_SAN_JORGE', 31); |
|
| 58 | +define('KW_NUMBER_THEORY', 32); |
|
| 59 | +define('KW_CRYPTO', 33); |
|
| 60 | +define('KW_ENV_RESEARCH', 34); |
|
| 61 | +define('KW_CLIMATE', 35); |
|
| 62 | +define('KW_CZECH', 36); |
|
| 63 | 63 | define('KW_CHARLES_PRAGUE', 37); |
| 64 | -define('KW_RECHENKRAFT', 38); |
|
| 65 | -define('KW_RHEINMAIN', 39); |
|
| 66 | -define('KW_HUNGARY', 40); |
|
| 67 | -define('KW_IRELAND', 41); |
|
| 68 | -define('KW_UC_DUBLIN', 42); |
|
| 69 | -define('KW_POLAND', 43); |
|
| 70 | -define('KW_RUSSIA', 44); |
|
| 64 | +define('KW_RECHENKRAFT', 38); |
|
| 65 | +define('KW_RHEINMAIN', 39); |
|
| 66 | +define('KW_HUNGARY', 40); |
|
| 67 | +define('KW_IRELAND', 41); |
|
| 68 | +define('KW_UC_DUBLIN', 42); |
|
| 69 | +define('KW_POLAND', 43); |
|
| 70 | +define('KW_RUSSIA', 44); |
|
| 71 | 71 | define('KW_SW_STATE_RUSSIA', 45); |
| 72 | -define('KW_RAS', 46); |
|
| 73 | -define('KW_PRBB', 47); |
|
| 74 | -define('KW_UK', 48); |
|
| 75 | -define('KW_OXFORD', 49); |
|
| 76 | -define('KW_CHINA', 50); |
|
| 77 | -define('KW_U_DAYTON', 51); |
|
| 78 | -define('KW_WRIGHT_STATE', 52); |
|
| 79 | -define('KW_USC', 53); |
|
| 80 | -define('KW_FULLERTON', 54); |
|
| 81 | -define('KW_ARIZONA_STATE', 55); |
|
| 82 | -define('KW_U_ILLINOIS', 56); |
|
| 83 | -define('KW_U_WARSAW', 57); |
|
| 84 | -define('KW_RPI', 58); |
|
| 85 | -define('KW_INTERNATIONAL', 59); |
|
| 86 | -define('KW_UND', 60); |
|
| 87 | -define('KW_HOLLAND', 61); |
|
| 88 | -define('KW_CHEMISTRY', 62); |
|
| 89 | -define('KW_GAMES', 63); |
|
| 90 | -define('KW_VIRUS', 64); |
|
| 91 | -define('KW_FRANCE', 65); |
|
| 92 | -define('KW_CANADA', 66); |
|
| 93 | -define('KW_PSU', 67); |
|
| 94 | -define('KW_SU', 68); |
|
| 95 | -define('KW_SINAI_U', 69); |
|
| 96 | -define('KW_AFRICA', 70); |
|
| 97 | -define('KW_EGYPT', 71); |
|
| 72 | +define('KW_RAS', 46); |
|
| 73 | +define('KW_PRBB', 47); |
|
| 74 | +define('KW_UK', 48); |
|
| 75 | +define('KW_OXFORD', 49); |
|
| 76 | +define('KW_CHINA', 50); |
|
| 77 | +define('KW_U_DAYTON', 51); |
|
| 78 | +define('KW_WRIGHT_STATE', 52); |
|
| 79 | +define('KW_USC', 53); |
|
| 80 | +define('KW_FULLERTON', 54); |
|
| 81 | +define('KW_ARIZONA_STATE', 55); |
|
| 82 | +define('KW_U_ILLINOIS', 56); |
|
| 83 | +define('KW_U_WARSAW', 57); |
|
| 84 | +define('KW_RPI', 58); |
|
| 85 | +define('KW_INTERNATIONAL', 59); |
|
| 86 | +define('KW_UND', 60); |
|
| 87 | +define('KW_HOLLAND', 61); |
|
| 88 | +define('KW_CHEMISTRY', 62); |
|
| 89 | +define('KW_GAMES', 63); |
|
| 90 | +define('KW_VIRUS', 64); |
|
| 91 | +define('KW_FRANCE', 65); |
|
| 92 | +define('KW_CANADA', 66); |
|
| 93 | +define('KW_PSU', 67); |
|
| 94 | +define('KW_SU', 68); |
|
| 95 | +define('KW_SINAI_U', 69); |
|
| 96 | +define('KW_AFRICA', 70); |
|
| 97 | +define('KW_EGYPT', 71); |
|
| 98 | 98 | |
| 99 | 99 | $job_keywords = array(); |
| 100 | 100 | |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | -function kw_options($id, $indent='') { |
|
| 355 | +function kw_options($id, $indent = '') { |
|
| 356 | 356 | global $job_keywords; |
| 357 | 357 | $kw = $job_keywords[$id]; |
| 358 | 358 | $opts = [[$id, "$indent$kw->name"]]; |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | return $kw->name; |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | -function kw_array_to_str($kws, $sep='<br>') { |
|
| 372 | +function kw_array_to_str($kws, $sep = '<br>') { |
|
| 373 | 373 | $x = array_map('strval', $kws); |
| 374 | 374 | $x = array_map('kw_id_to_name', $x); |
| 375 | 375 | return implode($sep, $x); |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | // show list of BUDA apps and variants, |
| 37 | 37 | // w/ buttons for adding and deleting |
| 38 | 38 | // |
| 39 | -function app_list($notice=null) { |
|
| 39 | +function app_list($notice = null) { |
|
| 40 | 40 | global $buda_root; |
| 41 | 41 | if (!is_dir($buda_root)) { |
| 42 | 42 | mkdir($buda_root); |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | // |
| 225 | 225 | $x = "<input_template>\n"; |
| 226 | 226 | $ninfiles = count($desc->input_file_names); |
| 227 | - for ($i=0; $i<$ninfiles; $i++) { |
|
| 227 | + for ($i = 0; $i < $ninfiles; $i++) { |
|
| 228 | 228 | $x .= " <file_info>\n <sticky/>\n <no_delete/>\n <executable/>\n </file_info>\n"; |
| 229 | 229 | } |
| 230 | 230 | $x .= " <workunit>\n"; |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | ); |
| 246 | 246 | |
| 247 | 247 | $x .= sprintf(" <max_delay>%f</max_delay>\n", |
| 248 | - $desc->max_delay_days * 86400. |
|
| 248 | + $desc->max_delay_days*86400. |
|
| 249 | 249 | ); |
| 250 | 250 | |
| 251 | 251 | $x .= " <buda_app_name>$app</buda_app_name>\n"; |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | } else { |
| 319 | 319 | $creating = true; |
| 320 | 320 | } |
| 321 | - $variant = sprintf('%s_%s', $cpu_type, $plan_class?$plan_class:'cpu'); |
|
| 321 | + $variant = sprintf('%s_%s', $cpu_type, $plan_class ? $plan_class : 'cpu'); |
|
| 322 | 322 | if (!is_valid_filename($variant)) { |
| 323 | 323 | error_page(filename_rules()); |
| 324 | 324 | } |
@@ -463,8 +463,8 @@ discard block |
||
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | -function app_form($desc=null) { |
|
| 467 | - page_head_select2($desc?"Edit BUDA app $desc->name":'Create BUDA app'); |
|
| 466 | +function app_form($desc = null) { |
|
| 467 | + page_head_select2($desc ? "Edit BUDA app $desc->name" : 'Create BUDA app'); |
|
| 468 | 468 | form_start('buda.php'); |
| 469 | 469 | form_input_hidden('action', 'app_action'); |
| 470 | 470 | if ($desc) { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | ); |
| 196 | 196 | } |
| 197 | 197 | form_input_text("Plan class$pc", 'plan_class', $variant_desc->plan_class); |
| 198 | - form_select("Dockerfile$sb", 'dockerfile', $sbitems, $variant_desc->dockerfile); |
|
| 198 | + form_select("dockerfile$sb", 'dockerfile', $sbitems, $variant_desc->dockerfile); |
|
| 199 | 199 | form_select2_multi("Application files$sb", 'app_files', $sbitems, $variant_desc->app_files); |
| 200 | 200 | form_submit('OK'); |
| 201 | 201 | form_end(); |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | // Note: we don't currently allow indirect file access. |
| 394 | 394 | // If we did, we'd need to create job.toml to mount project dir |
| 395 | 395 | |
| 396 | - app_list("Variant $variant added for app $app."); |
|
| 396 | + app_list("variant $variant added for app $app."); |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | function variant_delete() { |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | if ($ret) { |
| 421 | 421 | error_page("delete failed"); |
| 422 | 422 | } |
| 423 | - $notice = "Variant $variant of app $app removed."; |
|
| 423 | + $notice = "variant $variant of app $app removed."; |
|
| 424 | 424 | app_list($notice); |
| 425 | 425 | } else { |
| 426 | 426 | page_head("Confirm"); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | if ($ret) { |
| 451 | 451 | error_page('delete failed'); |
| 452 | 452 | } |
| 453 | - $notice = "App $app removed."; |
|
| 453 | + $notice = "app $app removed."; |
|
| 454 | 454 | app_list($notice); |
| 455 | 455 | } else { |
| 456 | 456 | page_head('Confirm'); |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | } |
| 548 | 548 | $dir = "$buda_root/$app_name"; |
| 549 | 549 | if (file_exists($dir)) { |
| 550 | - error_page("App $app_name already exists."); |
|
| 550 | + error_page("app $app_name already exists."); |
|
| 551 | 551 | } |
| 552 | 552 | mkdir($dir); |
| 553 | 553 | $desc->user_id = $user->id; |