BOINC /
boinc
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | function get_platform() { |
| 56 | 56 | global $user_agent; |
| 57 | 57 | if (strstr($user_agent, 'Windows')) { |
| 58 | - if (strstr($user_agent, 'Win64')||strstr($user_agent, 'WOW64')) { |
|
| 58 | + if (strstr($user_agent, 'Win64') || strstr($user_agent, 'WOW64')) { |
|
| 59 | 59 | return 'windows_x86_64'; |
| 60 | 60 | } else { |
| 61 | 61 | return 'windows_intelx86'; |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | $token, |
| 131 | 131 | $user->id, |
| 132 | 132 | (string)$v->filename, |
| 133 | - $green?"btn-success":"btn-info", |
|
| 133 | + $green ? "btn-success" : "btn-info", |
|
| 134 | 134 | (string)$v->platform, |
| 135 | 135 | (string)$v->size_mb, |
| 136 | 136 | (string)$v->version_num |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | function download_button_vbox($v, $project_id, $token, $user) { |
| 141 | 141 | // if no vbox version exists for platform, don't show vbox button |
| 142 | - if(!$v->vbox_filename) { |
|
| 142 | + if (!$v->vbox_filename) { |
|
| 143 | 143 | return; |
| 144 | 144 | } |
| 145 | 145 | return sprintf( |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | $action = get_str("action", true); |
| 357 | 357 | $dev = get_str("dev", true); |
| 358 | 358 | |
| 359 | -$user_agent = get_str("user_agent", true); // for debugging |
|
| 359 | +$user_agent = get_str("user_agent", true); // for debugging |
|
| 360 | 360 | if (!$user_agent) { |
| 361 | 361 | $user_agent = $_SERVER['HTTP_USER_AGENT']; |
| 362 | 362 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | $apps = BoincApp::enum(""); |
| 156 | 156 | foreach ($apps as $app) { |
| 157 | 157 | if (in_array($app->id, $show_only) |
| 158 | - || ( in_array("all", $show_only) |
|
| 158 | + || (in_array("all", $show_only) |
|
| 159 | 159 | && (!$app->deprecated || $show_deprecated) |
| 160 | 160 | )) { |
| 161 | 161 | |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | <b>Results for <tt>$app->name</tt>:</b> |
| 164 | 164 | <ul> |
| 165 | 165 | "; |
| 166 | - for ($i=0; $i<2; $i++) { |
|
| 166 | + for ($i = 0; $i < 2; $i++) { |
|
| 167 | 167 | if ($i) { |
| 168 | 168 | $secs = 7*86400; |
| 169 | 169 | $period = " 7 days"; |
@@ -220,5 +220,5 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | admin_page_tail(); |
| 222 | 222 | |
| 223 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
| 223 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
| 224 | 224 | ?> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | // send an email, using PHPMailer or not. |
| 28 | 28 | // |
| 29 | -function send_email($user, $subject, $body, $body_html=null, $email_addr=null) { |
|
| 29 | +function send_email($user, $subject, $body, $body_html = null, $email_addr = null) { |
|
| 30 | 30 | if (function_exists("make_php_mailer")) { |
| 31 | 31 | if (file_exists("../inc/PHPMailer/src/PHPMailer.php") && file_exists("../inc/PHPMailer/src/SMTP.php")) { |
| 32 | 32 | require_once("../inc/PHPMailer/src/PHPMailer.php"); |
@@ -58,11 +58,11 @@ discard block |
||
| 58 | 58 | return true; |
| 59 | 59 | } |
| 60 | 60 | } else { |
| 61 | - $headers =""; |
|
| 61 | + $headers = ""; |
|
| 62 | 62 | if (defined('EMAIL_FROM') && defined('EMAIL_FROM_NAME')) { |
| 63 | 63 | $headers = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM.">"; |
| 64 | 64 | } else if (defined('EMAIL_FROM')) { |
| 65 | - $headers = "From: ". EMAIL_FROM; |
|
| 65 | + $headers = "From: ".EMAIL_FROM; |
|
| 66 | 66 | } |
| 67 | 67 | if (!$email_addr) { |
| 68 | 68 | $email_addr = $user->email_addr; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $body = "<html><body>\n"; |
| 72 | 72 | $body .= $body_html; |
| 73 | 73 | $body .= "\n</body></html>\n"; |
| 74 | - $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n"; |
|
| 74 | + $headers .= 'Content-type: text/html; charset=UTF-8'."\r\n"; |
|
| 75 | 75 | } |
| 76 | 76 | return mail($email_addr, $subject, $body, $headers); |
| 77 | 77 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | if (defined("USE_STOPFORUMSPAM") && USE_STOPFORUMSPAM && array_key_exists('REMOTE_ADDR', $_SERVER)) { |
| 147 | 147 | $ip = $_SERVER['REMOTE_ADDR']; |
| 148 | 148 | // For obviously private IPs check just the email against SFS, otherwise check both IP and email |
| 149 | - if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { |
|
| 149 | + if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE|FILTER_FLAG_NO_RES_RANGE)) { |
|
| 150 | 150 | $x = @file_get_contents("https://www.stopforumspam.com/api?ip=".$ip."&email=".$addr); |
| 151 | 151 | } else { |
| 152 | 152 | $x = @file_get_contents("https://www.stopforumspam.com/api?email=".$addr); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | $pattern = '/^([^@]+)@([^@\.]+)\.([^@]{2,})$/'; |
| 159 | 159 | $match = preg_match($pattern, $addr); |
| 160 | - return (bool) $match; |
|
| 160 | + return (bool)$match; |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | function send_confirm_delete_email($user) { |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | return md5($key.'oogabooga'); |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | -function opt_out_url($user, $page="opt_out.php") { |
|
| 188 | +function opt_out_url($user, $page = "opt_out.php") { |
|
| 189 | 189 | return sprintf("%s%s?code=%s&userid=%d", |
| 190 | 190 | secure_url_base(), |
| 191 | 191 | $page, |
@@ -23,15 +23,15 @@ |
||
| 23 | 23 | admin_page_head("Account Ownership Keys"); |
| 24 | 24 | |
| 25 | 25 | if (!file_exists($account_ownership_private_key_file_path)) { |
| 26 | - echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>"; |
|
| 26 | + echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>"; |
|
| 27 | 27 | } else { |
| 28 | - echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>"; |
|
| 28 | + echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' exists.</p>"; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | if (!file_exists($account_ownership_public_key_file_path)) { |
| 32 | - echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>"; |
|
| 32 | + echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>"; |
|
| 33 | 33 | } else { |
| 34 | - echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>"; |
|
| 34 | + echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' exists.</p>"; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | echo "<p>For more info see the related wiki page: <a href=\"https://boinc.berkeley.edu/trac/wiki/ProofOfOwnership\">ProofOfOwnership</a></p>"; |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | require_once("../inc/boinc_db.inc"); |
| 22 | 22 | require_once("../inc/util.inc"); |
| 23 | 23 | |
| 24 | -define('CONSENT_TYPE_ENROLL','ENROLL'); |
|
| 24 | +define('CONSENT_TYPE_ENROLL', 'ENROLL'); |
|
| 25 | 25 | |
| 26 | 26 | // Utility function to check the terms of use. |
| 27 | 27 | function check_termsofuse() { |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | function consent_to_a_policy($user, $consent_type_id, $consent_flag, $consent_not_required, $source, $ctime = 0) { |
| 32 | 32 | $mys = BoincDb::escape_string($source); |
| 33 | - if ($ctime==0) { |
|
| 33 | + if ($ctime == 0) { |
|
| 34 | 34 | $mytime = $user->create_time; |
| 35 | 35 | } else { |
| 36 | 36 | $mytime = $ctime; |
| 37 | 37 | } |
| 38 | 38 | return BoincConsent::insert( |
| 39 | - "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) " . |
|
| 39 | + "(userid, consent_type_id, consent_time, consent_flag, consent_not_required, source) ". |
|
| 40 | 40 | "values($user->id, $consent_type_id, $mytime, $consent_flag, $consent_not_required, '$mys')" |
| 41 | 41 | ); |
| 42 | 42 | |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | // if checkenabled=TRUE, if the consent_type is enabled/available for |
| 61 | 61 | // use. The integer is the consent_type_id- the id from consent_type |
| 62 | 62 | // table. If the boolean is FALSE, the integer returned is -1. |
| 63 | -function check_consent_type($name, $checkenabled=TRUE) { |
|
| 63 | +function check_consent_type($name, $checkenabled = TRUE) { |
|
| 64 | 64 | $ct = BoincConsentType::lookup("shortname = '{$name}'"); |
| 65 | - if ($ct and ( !$checkenabled or ($ct->enabled)) ) { |
|
| 65 | + if ($ct and (!$checkenabled or ($ct->enabled))) { |
|
| 66 | 66 | return array(TRUE, $ct->id); |
| 67 | 67 | } |
| 68 | 68 | return array(FALSE, -1); |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | function intercept_login($user, $perm, $in_next_url = "") { |
| 75 | 75 | list($checkct, $ctid) = check_consent_type(CONSENT_TYPE_ENROLL); |
| 76 | 76 | $config = get_config(); |
| 77 | - if ( parse_bool($config, "enable_login_mustagree_termsofuse") and $checkct and check_termsofuse() and (!check_user_consent($user, CONSENT_TYPE_ENROLL))) { |
|
| 77 | + if (parse_bool($config, "enable_login_mustagree_termsofuse") and $checkct and check_termsofuse() and (!check_user_consent($user, CONSENT_TYPE_ENROLL))) { |
|
| 78 | 78 | // sent user to terms-of-use Web form after login |
| 79 | 79 | $mytoken = create_token($user->id, TOKEN_TYPE_LOGIN_INTERCEPT, TOKEN_DURATION_TWO_HOURS); |
| 80 | 80 | send_cookie('logintoken', $mytoken, false); |
@@ -412,9 +412,9 @@ discard block |
||
| 412 | 412 | "Canonical instance<br><small>click to see result page on BOINC server</smallp>", |
| 413 | 413 | "Download Results" |
| 414 | 414 | ); |
| 415 | - foreach($wus as $wu) { |
|
| 415 | + foreach ($wus as $wu) { |
|
| 416 | 416 | $resultid = $wu->canonical_resultid; |
| 417 | - $durl = boinc_get_wu_output_files_url($user,$wu->id); |
|
| 417 | + $durl = boinc_get_wu_output_files_url($user, $wu->id); |
|
| 418 | 418 | if ($resultid) { |
| 419 | 419 | $x = "<a href=result.php?resultid=$resultid>$resultid</a>"; |
| 420 | 420 | $y = '<font color="green">completed</font>'; |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | $text = "---"; |
| 425 | 425 | if ($batch->state == BATCH_STATE_COMPLETE) { |
| 426 | 426 | $y = '<font color="red">failed</font>'; |
| 427 | - } else { |
|
| 427 | + } else { |
|
| 428 | 428 | $y = "in progress"; |
| 429 | 429 | } |
| 430 | 430 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | $results = BoincResult::enum("workunitid=$wuid"); |
| 490 | 490 | $upload_dir = parse_config(get_config(), "<upload_dir>"); |
| 491 | 491 | $fanout = parse_config(get_config(), "<uldl_dir_fanout>"); |
| 492 | - foreach($results as $result) { |
|
| 492 | + foreach ($results as $result) { |
|
| 493 | 493 | echo "<tr> |
| 494 | 494 | <td><a href=result.php?resultid=$result->id>$result->id · $result->name </a></td> |
| 495 | 495 | <td>".state_string($result)."</td> |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | require_once("../inc/util.inc"); |
| 34 | 34 | require_once("../inc/account_ownership.inc"); |
| 35 | 35 | |
| 36 | -if ( !function_exists('openssl_pkey_new') ) { |
|
| 36 | +if (!function_exists('openssl_pkey_new')) { |
|
| 37 | 37 | echo "WARNING: OpenSSL functions not available. Not generating account ownership keys.\n"; |
| 38 | 38 | exit(1); |
| 39 | 39 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | throw new Exception('Failed to generate account ownership keypair.'); |
| 74 | 74 | } |
| 75 | 75 | } catch (Exception $e) { |
| 76 | - echo 'Caught exception during account ownership key generation: ', $e->getMessage(), "\n"; |
|
| 76 | + echo 'Caught exception during account ownership key generation: ', $e->getMessage(), "\n"; |
|
| 77 | 77 | } |
| 78 | 78 | } else { |
| 79 | 79 | echo "The private and public keys already exist. Repeat the command with the 'overwrite' parameter to replace the existing ownership keys. \n"; |
@@ -42,27 +42,27 @@ discard block |
||
| 42 | 42 | // @return String A user readable DateTime-String in UTC |
| 43 | 43 | // @param Integer $x The mysql-Timestamp to convert |
| 44 | 44 | function mysqltime_str($x) { |
| 45 | - if(strpos($x,"-")==4) { |
|
| 45 | + if (strpos($x, "-") == 4) { |
|
| 46 | 46 | // Syntax of supplied mysql-timestamp is YYYY-MM-DD HH:MM:SS |
| 47 | - $year = substr($x,0,4); |
|
| 48 | - $month = substr($x,5,2); |
|
| 49 | - $day = substr($x,8,2); |
|
| 50 | - $hour = substr($x,11,2); |
|
| 51 | - $minute = substr($x,14,2); |
|
| 52 | - $second = substr($x,17,2); |
|
| 47 | + $year = substr($x, 0, 4); |
|
| 48 | + $month = substr($x, 5, 2); |
|
| 49 | + $day = substr($x, 8, 2); |
|
| 50 | + $hour = substr($x, 11, 2); |
|
| 51 | + $minute = substr($x, 14, 2); |
|
| 52 | + $second = substr($x, 17, 2); |
|
| 53 | 53 | } else { |
| 54 | 54 | // Syntax of supplied mysql-timestamp is YYYYMMDDHHMMSS |
| 55 | - $year = substr($x,0,4); |
|
| 56 | - $month = substr($x,4,2); |
|
| 57 | - $day = substr($x,6,2); |
|
| 58 | - $hour = substr($x,8,2); |
|
| 59 | - $minute = substr($x,10,2); |
|
| 60 | - $second = substr($x,12,2); |
|
| 55 | + $year = substr($x, 0, 4); |
|
| 56 | + $month = substr($x, 4, 2); |
|
| 57 | + $day = substr($x, 6, 2); |
|
| 58 | + $hour = substr($x, 8, 2); |
|
| 59 | + $minute = substr($x, 10, 2); |
|
| 60 | + $second = substr($x, 12, 2); |
|
| 61 | 61 | |
| 62 | 62 | } |
| 63 | 63 | //make a Unix-Timestamp |
| 64 | 64 | // echo "Time string is " . "$x"; |
| 65 | - $time = mktime($hour,$minute,$second,$month,$day,$year); |
|
| 65 | + $time = mktime($hour, $minute, $second, $month, $day, $year); |
|
| 66 | 66 | return time_str($time); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $constants = get_defined_constants(true); |
| 101 | 101 | foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1]; |
| 102 | 102 | } |
| 103 | - return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown"; |
|
| 103 | + return array_key_exists($type_id, $types) ? strtolower($types[$type_id]) : "unknown"; |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // Function prints a description of $table |
@@ -110,38 +110,38 @@ discard block |
||
| 110 | 110 | $result = $db->do_query("SELECT * from $table LIMIT 1"); |
| 111 | 111 | $fields = $result->field_count; |
| 112 | 112 | |
| 113 | - $avgnum=(int)($fields/$columns); |
|
| 114 | - if ($avgnum*$columns<$fields) { |
|
| 113 | + $avgnum = (int)($fields/$columns); |
|
| 114 | + if ($avgnum*$columns < $fields) { |
|
| 115 | 115 | $avgnum++; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - $actualcolumns=0; |
|
| 119 | - while ($avgnum*$actualcolumns<$fields) { |
|
| 118 | + $actualcolumns = 0; |
|
| 119 | + while ($avgnum*$actualcolumns < $fields) { |
|
| 120 | 120 | $actualcolumns++; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - if ($which>$actualcolumns) { |
|
| 123 | + if ($which > $actualcolumns) { |
|
| 124 | 124 | return 0; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - $bot=($which-1)*$avgnum; |
|
| 128 | - $top=$which*$avgnum; |
|
| 127 | + $bot = ($which - 1)*$avgnum; |
|
| 128 | + $top = $which*$avgnum; |
|
| 129 | 129 | |
| 130 | - $width=100.0/$actualcolumns; |
|
| 130 | + $width = 100.0/$actualcolumns; |
|
| 131 | 131 | |
| 132 | 132 | echo "<td>"; |
| 133 | 133 | start_table('table-striped'); |
| 134 | 134 | echo "<tr><th align=\"left\">NAME</th><th align=\"left\">Type</th><th align=\"left\">Bytes</th>\n"; |
| 135 | - for ($count=$bot; $count<$top; $count++) { |
|
| 136 | - if ($count<$fields) { |
|
| 135 | + for ($count = $bot; $count < $top; $count++) { |
|
| 136 | + if ($count < $fields) { |
|
| 137 | 137 | $x = $result->fetch_field_direct($count); |
| 138 | 138 | $name = $x->name; |
| 139 | 139 | $type = mysql_fieldtype_str($x->type); |
| 140 | 140 | $length = $x->length; |
| 141 | 141 | } else { |
| 142 | - $name="<br/> "; |
|
| 143 | - $type="<br/>"; |
|
| 144 | - $length="<br/>"; |
|
| 142 | + $name = "<br/> "; |
|
| 143 | + $type = "<br/>"; |
|
| 144 | + $length = "<br/>"; |
|
| 145 | 145 | } |
| 146 | 146 | echo "\t<tr><td><b>$name</b></td><td>$type</td><td>$length</td></tr>\n"; |
| 147 | 147 | } |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | echo "<h2>Description of <b>$table</b> table fields:</h2>\n"; |
| 157 | 157 | start_table(); |
| 158 | 158 | echo "<tr>"; |
| 159 | - for ($i=1; $i<=$how_many_columns; $i++) { |
|
| 159 | + for ($i = 1; $i <= $how_many_columns; $i++) { |
|
| 160 | 160 | print_describe_table_onecol($table, $i, $how_many_columns); |
| 161 | 161 | } |
| 162 | 162 | echo "</tr>"; |
@@ -175,10 +175,10 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | function print_query_field() { |
| 178 | - $currenttime=time(); |
|
| 179 | - $hourago=$currenttime-3600; |
|
| 180 | - $dayago=$currenttime-24*3600; |
|
| 181 | - $weekago=$currenttime-7*24*3600; |
|
| 178 | + $currenttime = time(); |
|
| 179 | + $hourago = $currenttime - 3600; |
|
| 180 | + $dayago = $currenttime - 24*3600; |
|
| 181 | + $weekago = $currenttime - 7*24*3600; |
|
| 182 | 182 | echo " |
| 183 | 183 | <tr> |
| 184 | 184 | <td align=\"right\">Additional clauses</td> |
@@ -202,11 +202,11 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | -function append_sql_query($original,$addition,$first) { |
|
| 205 | +function append_sql_query($original, $addition, $first) { |
|
| 206 | 206 | if ($first == 1) { |
| 207 | - return $original . " where " . $addition; |
|
| 207 | + return $original." where ".$addition; |
|
| 208 | 208 | } else { |
| 209 | - return $original . " and " . $addition; |
|
| 209 | + return $original." and ".$addition; |
|
| 210 | 210 | } |
| 211 | 211 | } |
| 212 | 212 | |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | if (isset($_GET[$name])) { |
| 308 | 308 | $value = $_GET[$name]; |
| 309 | 309 | } else { |
| 310 | - $value=null; |
|
| 310 | + $value = null; |
|
| 311 | 311 | } |
| 312 | 312 | if (isset($_GET[$order])) { |
| 313 | 313 | $order = $_GET[$order]; |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | function get_url($base = "db_action.php") { |
| 351 | - $s = $base . "?table=$this->table$this->urlquery"; |
|
| 351 | + $s = $base."?table=$this->table$this->urlquery"; |
|
| 352 | 352 | return $s; |
| 353 | 353 | } |
| 354 | 354 | |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | $this->addeq('app_version_id'); |
| 364 | 364 | $this->addeq('exit_status'); |
| 365 | 365 | if (isset($_GET['nsecs'])) { |
| 366 | - $_GET['mod_time'] = date("YmdHis",time() - $_GET['nsecs']); |
|
| 366 | + $_GET['mod_time'] = date("YmdHis", time() - $_GET['nsecs']); |
|
| 367 | 367 | } |
| 368 | 368 | $this->addgt('mod_time'); |
| 369 | 369 | $this->addeq_not_CHOOSE_ALL('server_state'); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | if ($n == '0') { // intentional compare by string |
| 385 | 385 | return "0"; |
| 386 | 386 | } else { |
| 387 | - if(strlen($clauses)) { |
|
| 387 | + if (strlen($clauses)) { |
|
| 388 | 388 | return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>"; |
| 389 | 389 | } |
| 390 | 390 | else { |
@@ -397,13 +397,13 @@ discard block |
||
| 397 | 397 | // Determines if in stderr_out is an error reported and prints as human readable String |
| 398 | 398 | // @return String A human readable string if error otherwise FALSE |
| 399 | 399 | // @param String $stderr_out the stderr_out value to parse |
| 400 | -function stderr_error_string($stderr_out){ |
|
| 400 | +function stderr_error_string($stderr_out) { |
|
| 401 | 401 | $y = parse_element($stderr_out, "<error_code>"); |
| 402 | 402 | $x = 0; |
| 403 | 403 | if ($y) { |
| 404 | 404 | $x = (int)$y; |
| 405 | 405 | } |
| 406 | - if (0<=$x && $x<=9) { |
|
| 406 | + if (0 <= $x && $x <= 9) { |
|
| 407 | 407 | return FALSE; |
| 408 | 408 | } else { |
| 409 | 409 | return "$x ".error_code_str($x); |
@@ -411,8 +411,8 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | function admin_show_result_summary() { |
| 414 | - $ntotal =0; // TODO: how to count $result? |
|
| 415 | - $nvalid = 0; // for SUCCESS results |
|
| 414 | + $ntotal = 0; // TODO: how to count $result? |
|
| 415 | + $nvalid = 0; // for SUCCESS results |
|
| 416 | 416 | $ninvalid = 0; |
| 417 | 417 | $nfile_deleted = 0; |
| 418 | 418 | |
@@ -420,20 +420,20 @@ discard block |
||
| 420 | 420 | $outcome = array(); |
| 421 | 421 | $client_state = array(); |
| 422 | 422 | |
| 423 | - for ($ss=1; $ss<6; $ss++) { |
|
| 423 | + for ($ss = 1; $ss < 6; $ss++) { |
|
| 424 | 424 | $server_state[$ss] = 0; |
| 425 | 425 | } |
| 426 | - for ($ro=0; $ro<8; $ro++) { |
|
| 426 | + for ($ro = 0; $ro < 8; $ro++) { |
|
| 427 | 427 | $outcome[$ro] = 0; |
| 428 | 428 | } |
| 429 | - for ($cs=1; $cs<7; $cs++) { |
|
| 429 | + for ($cs = 1; $cs < 7; $cs++) { |
|
| 430 | 430 | $client_state[$cs] = 0; |
| 431 | 431 | } |
| 432 | - for ($fds=0; $fds<4; $fds++) { |
|
| 432 | + for ($fds = 0; $fds < 4; $fds++) { |
|
| 433 | 433 | $delete_state[$fds] = 0; |
| 434 | 434 | } |
| 435 | - for ($vs=0; $vs<NVALIDATE_STATES; $vs++) { |
|
| 436 | - $validate_state[$vs]=0; |
|
| 435 | + for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) { |
|
| 436 | + $validate_state[$vs] = 0; |
|
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | $_GET['table'] = 'result'; |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | // |
| 509 | 509 | $delay = parse_config(get_config(), "<delete_delay_hours>"); |
| 510 | 510 | if ($delay) { |
| 511 | - $start2 = $start - $delay*3600;; |
|
| 511 | + $start2 = $start - $delay*3600; ; |
|
| 512 | 512 | $main_query .= " and ((file_delete_state>1 and mod_time>FROM_UNIXTIME($start2)) or (mod_time>FROM_UNIXTIME($start)))"; |
| 513 | 513 | } else { |
| 514 | 514 | $main_query .= " and mod_time > FROM_UNIXTIME($start)"; |
@@ -567,20 +567,20 @@ discard block |
||
| 567 | 567 | |
| 568 | 568 | start_table(); |
| 569 | 569 | echo "<tr valign=\"top\">"; |
| 570 | - echo "<td><h2>" . link_results("$ntotal results", $urlquery, '', '') . "</h2></td>"; |
|
| 571 | - echo "<td><h2>" . link_results("'Over' results", $urlquery, "server_state=5", '') . "</h2></td>"; |
|
| 572 | - echo "<td><h2>" . link_results("'Success' results", $urlquery, "outcome=1", '') . "</h2></td>"; |
|
| 573 | - echo "<td><h2>" . link_results("'Client error' results", $urlquery, "outcome=3", '') . "</h2></td>"; |
|
| 570 | + echo "<td><h2>".link_results("$ntotal results", $urlquery, '', '')."</h2></td>"; |
|
| 571 | + echo "<td><h2>".link_results("'Over' results", $urlquery, "server_state=5", '')."</h2></td>"; |
|
| 572 | + echo "<td><h2>".link_results("'Success' results", $urlquery, "outcome=1", '')."</h2></td>"; |
|
| 573 | + echo "<td><h2>".link_results("'Client error' results", $urlquery, "outcome=3", '')."</h2></td>"; |
|
| 574 | 574 | echo "</tr>"; |
| 575 | 575 | echo "<tr valign=\"top\">"; |
| 576 | 576 | echo "<td>"; |
| 577 | 577 | start_table('table-striped'); |
| 578 | 578 | echo "<tr><th>Server state</th><th># results</th></tr>\n"; |
| 579 | - for ($ss=1; $ss<6; $ss++) { |
|
| 579 | + for ($ss = 1; $ss < 6; $ss++) { |
|
| 580 | 580 | $res = new StdClass; |
| 581 | 581 | $res->server_state = $ss; |
| 582 | 582 | row2(result_server_state_string($res), |
| 583 | - link_results("$server_state[$ss]", $urlquery,"server_state=$ss", '') |
|
| 583 | + link_results("$server_state[$ss]", $urlquery, "server_state=$ss", '') |
|
| 584 | 584 | ); |
| 585 | 585 | } |
| 586 | 586 | end_table(); |
@@ -590,11 +590,11 @@ discard block |
||
| 590 | 590 | start_table('table-striped'); |
| 591 | 591 | echo "<tr><th>Outcome</th><th># results</th></tr>\n"; |
| 592 | 592 | |
| 593 | - for ($ro=0; $ro<8; $ro++) { |
|
| 593 | + for ($ro = 0; $ro < 8; $ro++) { |
|
| 594 | 594 | $res = new StdClass; |
| 595 | 595 | $res->outcome = $ro; |
| 596 | 596 | $res->exit_status = 0; |
| 597 | - c_row2($outcome[$ro]?outcome_color($ro):'', result_outcome_string($res), |
|
| 597 | + c_row2($outcome[$ro] ?outcome_color($ro) : '', result_outcome_string($res), |
|
| 598 | 598 | link_results("$outcome[$ro]", $urlquery, "outcome=$ro", '') |
| 599 | 599 | ); |
| 600 | 600 | } |
@@ -604,18 +604,18 @@ discard block |
||
| 604 | 604 | echo "<td>"; |
| 605 | 605 | start_table('table-striped'); |
| 606 | 606 | echo "<tr><th>Validate state</th><th># results</th></tr>\n"; |
| 607 | - for ($vs=0; $vs<NVALIDATE_STATES; $vs++) { |
|
| 607 | + for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) { |
|
| 608 | 608 | $res = new StdClass; |
| 609 | 609 | $res->validate_state = $vs; |
| 610 | 610 | $res->exit_status = 0; |
| 611 | - c_row2($validate_state[$vs]?validate_color($vs):'', validate_state_str($res), |
|
| 611 | + c_row2($validate_state[$vs] ?validate_color($vs) : '', validate_state_str($res), |
|
| 612 | 612 | link_results("$validate_state[$vs]", $urlquery, "validate_state=$vs", "outcome=1")); |
| 613 | 613 | } |
| 614 | 614 | end_table(); |
| 615 | 615 | start_table('table-striped'); |
| 616 | 616 | echo "<tr><th>File Delete state</th><th># results</th></tr>\n"; |
| 617 | 617 | |
| 618 | - for ($fds=0; $fds<4; $fds++) { |
|
| 618 | + for ($fds = 0; $fds < 4; $fds++) { |
|
| 619 | 619 | row2(file_delete_state_str($fds), |
| 620 | 620 | link_results("$file_delete[$fds]", $urlquery, "outcome=1", "file_delete_state=$fds")); |
| 621 | 621 | } |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | echo "<td>"; |
| 628 | 628 | start_table('table-striped'); |
| 629 | 629 | echo "<tr><th>Client state</th><th># results</th></tr>\n"; |
| 630 | - for ($cs=1; $cs<7; $cs++) { |
|
| 630 | + for ($cs = 1; $cs < 7; $cs++) { |
|
| 631 | 631 | $res = new StdClass; |
| 632 | 632 | $res->client_state = $cs; |
| 633 | 633 | $res->exit_status = 0; |
@@ -646,9 +646,9 @@ discard block |
||
| 646 | 646 | <select name=\"server_state\"> |
| 647 | 647 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
| 648 | 648 | "; |
| 649 | - for ($i=1; $i<6; $i++) { |
|
| 649 | + for ($i = 1; $i < 6; $i++) { |
|
| 650 | 650 | $res = new StdClass; |
| 651 | - $res->server_state=$i; |
|
| 651 | + $res->server_state = $i; |
|
| 652 | 652 | echo "<option value=\"$i\"> "."[$i] ".' '.result_server_state_string($res)."</option>\n"; |
| 653 | 653 | } |
| 654 | 654 | echo "</select>\n"; |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | <select name=\"outcome\"> |
| 660 | 660 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
| 661 | 661 | "; |
| 662 | - for ($i=0; $i<8; $i++) { |
|
| 662 | + for ($i = 0; $i < 8; $i++) { |
|
| 663 | 663 | $res = new StdClass; |
| 664 | 664 | $res->outcome = $i; |
| 665 | 665 | $res->exit_status = 0; |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | <select name=\"validate_state\"> |
| 674 | 674 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
| 675 | 675 | "; |
| 676 | - for ($vs=0; $vs<NVALIDATE_STATES; $vs++) { |
|
| 676 | + for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) { |
|
| 677 | 677 | $res = new StdClass; |
| 678 | 678 | $res->validate_state = $vs; |
| 679 | 679 | $res->exit_status = 0; |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | <select name=\"client_state\"> |
| 688 | 688 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
| 689 | 689 | "; |
| 690 | - for ($i=0; $i<7; $i++) { |
|
| 690 | + for ($i = 0; $i < 7; $i++) { |
|
| 691 | 691 | $res = new StdClass; |
| 692 | 692 | $res->client_state = $i; |
| 693 | 693 | $res->exit_status = 0; |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | } |
| 725 | 725 | |
| 726 | 726 | function table_title($table) { |
| 727 | - switch($table) { |
|
| 727 | + switch ($table) { |
|
| 728 | 728 | case "platform": return "Platforms"; |
| 729 | 729 | case "app": return "Applications"; |
| 730 | 730 | case "app_version": return "Application Versions"; |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | row("Created", time_str($platform->create_time)); |
| 745 | 745 | row("Name", $platform->name); |
| 746 | 746 | row("User friendly name", $platform->user_friendly_name); |
| 747 | - row("","<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>"); |
|
| 747 | + row("", "<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>"); |
|
| 748 | 748 | end_table(); |
| 749 | 749 | } |
| 750 | 750 | |
@@ -756,8 +756,8 @@ discard block |
||
| 756 | 756 | row("User-friendly name", $app->user_friendly_name); |
| 757 | 757 | row("Deprecated", $app->deprecated); |
| 758 | 758 | row("Homogeneous redundancy", $app->homogeneous_redundancy); |
| 759 | - row("","<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>"); |
|
| 760 | - row("","<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>"); |
|
| 759 | + row("", "<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>"); |
|
| 760 | + row("", "<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>"); |
|
| 761 | 761 | end_table(); |
| 762 | 762 | } |
| 763 | 763 | |
@@ -765,9 +765,9 @@ discard block |
||
| 765 | 765 | start_table(); |
| 766 | 766 | row("ID", $app_version->id); |
| 767 | 767 | row("Created", time_str($app_version->create_time)); |
| 768 | - row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">" . app_name_by_id($app_version->appid) . "</a>"); |
|
| 768 | + row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">".app_name_by_id($app_version->appid)."</a>"); |
|
| 769 | 769 | row("Version num", $app_version->version_num); |
| 770 | - row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">" . platform_name_by_id($app_version->platformid) . "</a>" ); |
|
| 770 | + row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">".platform_name_by_id($app_version->platformid)."</a>"); |
|
| 771 | 771 | row("Plan Class", $app_version->plan_class); |
| 772 | 772 | row("XML doc", "<pre>".htmlspecialchars($app_version->xml_doc)."</pre>"); |
| 773 | 773 | row("min_core_version", $app_version->min_core_version); |
@@ -902,7 +902,7 @@ discard block |
||
| 902 | 902 | row("External IP address", "$host->external_ip_addr<br>"); |
| 903 | 903 | row("Domain name", $host->domain_name); |
| 904 | 904 | $x = $host->timezone/3600; |
| 905 | - if ($x >= 0) $x="+$x"; |
|
| 905 | + if ($x >= 0) $x = "+$x"; |
|
| 906 | 906 | row("Local Standard Time", "UTC $x hours"); |
| 907 | 907 | row("Number of CPUs", $host->p_ncpus); |
| 908 | 908 | row("CPU", "$host->p_vendor $host->p_model"); |
@@ -954,10 +954,10 @@ discard block |
||
| 954 | 954 | start_table(); |
| 955 | 955 | row("Created", time_str($wu->create_time)); |
| 956 | 956 | row("Transition Time", time_str($wu->transition_time)); |
| 957 | - row("Last time modified",mysqltime_str($wu->mod_time)); |
|
| 957 | + row("Last time modified", mysqltime_str($wu->mod_time)); |
|
| 958 | 958 | row("Name", $wu->name); |
| 959 | 959 | row("XML doc", "<pre>".htmlspecialchars($wu->xml_doc)."</pre>"); |
| 960 | - row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">" . app_name_by_id($wu->appid) . " [".$wu->appid."]</a>"); |
|
| 960 | + row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">".app_name_by_id($wu->appid)." [".$wu->appid."]</a>"); |
|
| 961 | 961 | row("Application version number", $wu->app_version_num); |
| 962 | 962 | row("Batch", $wu->batch); |
| 963 | 963 | $x = number_format($wu->rsc_fpops_est/1e9, 2); |
@@ -970,12 +970,12 @@ discard block |
||
| 970 | 970 | $x = $wu->rsc_disk_bound/(1024*1024); |
| 971 | 971 | $y = number_format($x, 2); |
| 972 | 972 | row("Max Disk Usage", "$y MB"); |
| 973 | - row("Need validate?", ($wu->need_validate?"yes [":"no [").$wu->need_validate."]"); |
|
| 973 | + row("Need validate?", ($wu->need_validate ? "yes [" : "no [").$wu->need_validate."]"); |
|
| 974 | 974 | row("Canonical resultid", |
| 975 | 975 | "<a href=\"db_action.php?table=result&id=$wu->canonical_resultid\">".$wu->canonical_resultid."</a>"); |
| 976 | 976 | row("Canonical credit", $wu->canonical_credit); |
| 977 | 977 | //row("Timeout check time", time_str($wu->timeout_check_time)); |
| 978 | - row("Delay bound", "$wu->delay_bound" . " = " . time_diff($wu->delay_bound) ); |
|
| 978 | + row("Delay bound", "$wu->delay_bound"." = ".time_diff($wu->delay_bound)); |
|
| 979 | 979 | row("Error mask", wu_error_mask_str($wu->error_mask)); |
| 980 | 980 | row("File delete state", file_delete_state_str($wu->file_delete_state)." [".$wu->file_delete_state."]"); |
| 981 | 981 | row("Assimilation state", assimilate_state_str($wu->assimilate_state)." [".$wu->assimilate_state."]"); |
@@ -985,7 +985,7 @@ discard block |
||
| 985 | 985 | row("max error results", $wu->max_error_results); |
| 986 | 986 | row("max total results", $wu->max_total_results); |
| 987 | 987 | row("max success results", $wu->max_success_results); |
| 988 | - row("result template file",$wu->result_template_file); |
|
| 988 | + row("result template file", $wu->result_template_file); |
|
| 989 | 989 | row("hr_class", $wu->hr_class); |
| 990 | 990 | row("opaque", $wu->opaque); |
| 991 | 991 | row("Priority", $wu->priority); |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | } |
| 1064 | 1064 | |
| 1065 | 1065 | function outcome_color($outcome) { |
| 1066 | - switch($outcome) { |
|
| 1066 | + switch ($outcome) { |
|
| 1067 | 1067 | case 0: return '9900cc'; // "Init", purple |
| 1068 | 1068 | case 1: return '33cc33'; // "Success", green |
| 1069 | 1069 | case 3: return 'ff3333'; // "Client error", red |
@@ -1090,18 +1090,18 @@ discard block |
||
| 1090 | 1090 | row("Sent", time_str($result->sent_time)); |
| 1091 | 1091 | row("Report deadline", time_str($result->report_deadline)); |
| 1092 | 1092 | row("Received", time_str($result->received_time)); |
| 1093 | - row("Last time modified",mysqltime_str($result->mod_time)); |
|
| 1093 | + row("Last time modified", mysqltime_str($result->mod_time)); |
|
| 1094 | 1094 | row("Name", $result->name); |
| 1095 | - row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">" . wu_name_by_id($result->workunitid) . "</a> [$result->workunitid]" ); |
|
| 1095 | + row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">".wu_name_by_id($result->workunitid)."</a> [$result->workunitid]"); |
|
| 1096 | 1096 | row("Server state", result_server_state_string($result)." [$result->server_state]"); |
| 1097 | 1097 | row("Outcome", result_outcome_string($result)." [$result->outcome]"); |
| 1098 | 1098 | row("Client state", result_client_state_string($result)." [$result->client_state]"); |
| 1099 | 1099 | row("Exit status", exit_status_string($result->exit_status)); |
| 1100 | - row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">" . host_name_by_id($result->hostid) . "</a> [$result->hostid]"); |
|
| 1101 | - row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">" . user_name_by_id($result->userid) . "</a> [$result->userid]"); |
|
| 1100 | + row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">".host_name_by_id($result->hostid)."</a> [$result->hostid]"); |
|
| 1101 | + row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">".user_name_by_id($result->userid)."</a> [$result->userid]"); |
|
| 1102 | 1102 | row("CPU time", $result->cpu_time); |
| 1103 | 1103 | row("Elapsed time", $result->elapsed_time); |
| 1104 | - if($error=stderr_error_string($result->stderr_out)) { |
|
| 1104 | + if ($error = stderr_error_string($result->stderr_out)) { |
|
| 1105 | 1105 | row("error in stderr out", $error); |
| 1106 | 1106 | } |
| 1107 | 1107 | row("Batch", $result->batch); |
@@ -1118,16 +1118,16 @@ discard block |
||
| 1118 | 1118 | row("App version", $x1.app_version_string($result).$x2); |
| 1119 | 1119 | row("App version ID", $result->app_version_id); |
| 1120 | 1120 | row("Estimated GFLOPS", number_format($result->flops_estimate/1e9, 2)); |
| 1121 | - row("Random",$result->random); |
|
| 1122 | - row("Opaque",$result->opaque); |
|
| 1123 | - row("Teamid",$result->teamid); |
|
| 1124 | - row("Priority",$result->priority); |
|
| 1121 | + row("Random", $result->random); |
|
| 1122 | + row("Opaque", $result->opaque); |
|
| 1123 | + row("Teamid", $result->teamid); |
|
| 1124 | + row("Priority", $result->priority); |
|
| 1125 | 1125 | row("XML doc in", "<pre>".htmlspecialchars($result->xml_doc_in)."</pre>"); |
| 1126 | 1126 | row("XML doc out", "<pre>".htmlspecialchars($result->xml_doc_out)."</pre>"); |
| 1127 | 1127 | row("stderr out", "<pre>" |
| 1128 | 1128 | .htmlspecialchars( |
| 1129 | 1129 | $result->stderr_out, |
| 1130 | - ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0), |
|
| 1130 | + ENT_QUOTES|(defined('ENT_SUBSTITUTE') ?ENT_SUBSTITUTE:0), |
|
| 1131 | 1131 | 'utf-8' |
| 1132 | 1132 | ) |
| 1133 | 1133 | ."</pre>" |
@@ -1175,23 +1175,23 @@ discard block |
||
| 1175 | 1175 | } else { |
| 1176 | 1176 | // result has not been received yet, so show report deadline either |
| 1177 | 1177 | // in green if in the future or in red if in the past. |
| 1178 | - $timenow=time(); |
|
| 1179 | - if ($result->report_deadline==0) { |
|
| 1178 | + $timenow = time(); |
|
| 1179 | + if ($result->report_deadline == 0) { |
|
| 1180 | 1180 | // not sent -- show create time in purple |
| 1181 | - $received = "<font color=\"9900cc\">". time_str($result->create_time) . "</font>"; |
|
| 1182 | - } else if ($result->report_deadline>=$timenow) { |
|
| 1181 | + $received = "<font color=\"9900cc\">".time_str($result->create_time)."</font>"; |
|
| 1182 | + } else if ($result->report_deadline >= $timenow) { |
|
| 1183 | 1183 | // overdue -- show deadline in red |
| 1184 | - $received = "<font color=\"#33cc33\">". time_str($result->report_deadline) . "</font>"; |
|
| 1184 | + $received = "<font color=\"#33cc33\">".time_str($result->report_deadline)."</font>"; |
|
| 1185 | 1185 | } else { |
| 1186 | 1186 | // in progress and not overdue -- show deadline in green |
| 1187 | - $received = "<font color=\"#ff3333\">". time_str($result->report_deadline) . "</font>"; |
|
| 1187 | + $received = "<font color=\"#ff3333\">".time_str($result->report_deadline)."</font>"; |
|
| 1188 | 1188 | } |
| 1189 | 1189 | } |
| 1190 | 1190 | $version = app_version_string($result)." (<a href=\"db_action.php?table=app_version&id=$result->app_version_id\">$result->app_version_id</a>)"; |
| 1191 | 1191 | $outcome_color = outcome_color($result->outcome); |
| 1192 | 1192 | $validate_color = validate_color($result->validate_state); |
| 1193 | 1193 | $host_user = host_user_link($result->hostid); |
| 1194 | - $cpu_hours = sprintf("%.1f",$result->cpu_time / 3600); |
|
| 1194 | + $cpu_hours = sprintf("%.1f", $result->cpu_time/3600); |
|
| 1195 | 1195 | $granted_credit = "<a href=credit.php?wu_id=$result->workunitid>".credit_str($result->granted_credit)."</a>"; |
| 1196 | 1196 | $delete_state = file_delete_state_str($result->file_delete_state); |
| 1197 | 1197 | |
@@ -1219,7 +1219,7 @@ discard block |
||
| 1219 | 1219 | row("ID", $user->id); |
| 1220 | 1220 | row("Created", time_str($user->create_time)); |
| 1221 | 1221 | row("Name", $user->name); |
| 1222 | - if(!in_rops()) { |
|
| 1222 | + if (!in_rops()) { |
|
| 1223 | 1223 | row("Authenticator", $user->authenticator); |
| 1224 | 1224 | } |
| 1225 | 1225 | row("Email address", $user->email_addr); |
@@ -1234,7 +1234,7 @@ discard block |
||
| 1234 | 1234 | row("Default venue", $user->venue); |
| 1235 | 1235 | row("Hosts", "<a href=\"db_action.php?table=host&userid=$user->id&detail=low\">click</a>"); |
| 1236 | 1236 | row("Cross project ID", $user->cross_project_id); |
| 1237 | - if(!in_rops()) { |
|
| 1237 | + if (!in_rops()) { |
|
| 1238 | 1238 | row("Password Hash", $user->passwd_hash); |
| 1239 | 1239 | } |
| 1240 | 1240 | row("Donated", $user->donated); |
@@ -1285,7 +1285,7 @@ discard block |
||
| 1285 | 1285 | echo "</table></td>"; |
| 1286 | 1286 | echo "<td><table border=\"2\">\n"; |
| 1287 | 1287 | echo "<tr><th>User</th><th># posts</th></tr>\n"; |
| 1288 | - for ($p=1; $p<=10; $p++) { |
|
| 1288 | + for ($p = 1; $p <= 10; $p++) { |
|
| 1289 | 1289 | row2_plain(user_links_ops($top10poster[$p]), $top10poster[$p]->posts); |
| 1290 | 1290 | } |
| 1291 | 1291 | echo "</table></td>"; |
@@ -1324,10 +1324,10 @@ discard block |
||
| 1324 | 1324 | function admin_show_team($team) { |
| 1325 | 1325 | start_table(); |
| 1326 | 1326 | row("ID", $team->id); |
| 1327 | - row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">" . user_name_by_id($team->userid) . "</a>"); |
|
| 1327 | + row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">".user_name_by_id($team->userid)."</a>"); |
|
| 1328 | 1328 | row("Name", $team->name); |
| 1329 | - row("Name (HTML Formatted)", "<pre>" . htmlspecialchars($team->name_html) . "</pre>" ); |
|
| 1330 | - row("Url", "<a href=\"http://$team->url\">" . $team->url . "</a>"); |
|
| 1329 | + row("Name (HTML Formatted)", "<pre>".htmlspecialchars($team->name_html)."</pre>"); |
|
| 1330 | + row("Url", "<a href=\"http://$team->url\">".$team->url."</a>"); |
|
| 1331 | 1331 | row("Type", team_type_string($team->type)); |
| 1332 | 1332 | row("Description", $team->description); |
| 1333 | 1333 | row("", "<a href=\"db_action.php?table=user&teamid=$team->id\">List All Members</a>"); |
@@ -1370,7 +1370,7 @@ discard block |
||
| 1370 | 1370 | if (!strlen($host->domain_name) && !strlen($host->last_ip_addr)) { |
| 1371 | 1371 | return "(blank)"; |
| 1372 | 1372 | } else { |
| 1373 | - return $host->domain_name . " (" . $host->last_ip_addr . ")"; |
|
| 1373 | + return $host->domain_name." (".$host->last_ip_addr.")"; |
|
| 1374 | 1374 | } |
| 1375 | 1375 | } |
| 1376 | 1376 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | function flag_abuse_reason_views_api() { |
| 31 | 31 | return array( |
| 32 | 32 | 'api' => 2.0, |
| 33 | - 'path' => drupal_get_path('module', 'flag_abuse_reason') . '/includes', |
|
| 33 | + 'path' => drupal_get_path('module', 'flag_abuse_reason').'/includes', |
|
| 34 | 34 | ); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | * Here we change our flag event/action to 'reset'. |
| 48 | 48 | */ |
| 49 | 49 | function flag_abuse_reason_preprocess_flag(&$vars) { |
| 50 | - drupal_add_js(drupal_get_path('module', 'flag_abuse_reason') . "/includes/flag_abuse_reason.js"); |
|
| 51 | - drupal_add_css(drupal_get_path('module', 'flag_abuse_reason') . "/css/flag_abuse_reason.css"); |
|
| 50 | + drupal_add_js(drupal_get_path('module', 'flag_abuse_reason')."/includes/flag_abuse_reason.js"); |
|
| 51 | + drupal_add_css(drupal_get_path('module', 'flag_abuse_reason')."/css/flag_abuse_reason.css"); |
|
| 52 | 52 | $myuser = $vars['user']; |
| 53 | 53 | $metaflags = array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta'); |
| 54 | 54 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | // If there are flags on this content, clear the flags and |
| 81 | 81 | // lock the content. |
| 82 | 82 | if (user_access('reset abuse flags', $myuser)) { |
| 83 | - if ($count>0) { |
|
| 83 | + if ($count > 0) { |
|
| 84 | 84 | $vars['action'] = 'reset'; |
| 85 | 85 | $vars['link_text'] = t('Clear Reports and Lock'); |
| 86 | 86 | $vars['link_title'] = t('Remove all flags on this content and prevent any new flagging.'); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | // Normal users may cancel their all their reported flags on this |
| 153 | 153 | // content. |
| 154 | 154 | else { |
| 155 | - if ( ($event=='unflag') && (in_array($flag->name, $metaflags)) ) { |
|
| 155 | + if (($event == 'unflag') && (in_array($flag->name, $metaflags))) { |
|
| 156 | 156 | $allflags = flag_get_user_flags($flag->content_type, $content_id, $account->uid); |
| 157 | 157 | foreach ($allflags as $subflag) { |
| 158 | 158 | $myflag = flag_get_flag(NULL, $subflag->fid); |
