Completed
Pull Request — master (#1795)
by Christian
16:22 queued 04:43
created
html/user/team.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -26,38 +26,38 @@
 block discarded – undo
26 26
 
27 27
 page_head(tra("Teams"));
28 28
 
29
-echo "<p>".tra("%1 participants may form %2teams%3.", PROJECT, "<b>", "</b>") ."
29
+echo "<p>".tra("%1 participants may form %2teams%3.", PROJECT, "<b>", "</b>")."
30 30
     <p>
31
-    ". tra("You may belong to only one team. You can join or quit a team at any time."). "
31
+    ". tra("You may belong to only one team. You can join or quit a team at any time.")."
32 32
     <p>" .
33
-    tra("Each team has a %1founder%2 who may:", "<b>", "</b>") . "
33
+    tra("Each team has a %1founder%2 who may:", "<b>", "</b>")."
34 34
     <ul>
35
-    <li> " . tra("edit the team's name and description") . "
36
-    <li> " . tra("add or remove team admins") . "
37
-    <li> " . tra("remove members from the team") . "
38
-    <li> " . tra("disband a team if it has no members") . "
35
+    <li> " . tra("edit the team's name and description")."
36
+    <li> " . tra("add or remove team admins")."
37
+    <li> " . tra("remove members from the team")."
38
+    <li> " . tra("disband a team if it has no members")."
39 39
     </ul>
40 40
     <p>" .
41
-    tra("To join a team, visit its team page and click %1Join this team%2.", "<b>", "</b>") . "
42
-    <h3>" . tra("Find a team") . "</h3>
41
+    tra("To join a team, visit its team page and click %1Join this team%2.", "<b>", "</b>")."
42
+    <h3>" . tra("Find a team")."</h3>
43 43
 ";
44 44
 team_search_form(null);
45 45
 echo "
46 46
 
47
-    <h3>" . tra("Top teams") . "</h3>
47
+    <h3>" . tra("Top teams")."</h3>
48 48
     <ul>
49
-    <li> <a href=\"top_teams.php\">" . tra("All teams") . "</a>
49
+    <li> <a href=\"top_teams.php\">" . tra("All teams")."</a>
50 50
 ";
51 51
 
52
-for ($i=1; $i<8; $i++) {
52
+for ($i = 1; $i < 8; $i++) {
53 53
     echo "<li> <a href=\"top_teams.php?type=".$i."\">".tra("%1 teams", team_type_name($i))."</a>
54 54
     ";
55 55
 }
56 56
 
57 57
 echo "
58 58
     </ul>
59
-    <h3>" . tra("Create a new team") . "</h3>
60
-    " . tra("If you cannot find a team that is right for you, you can %1create a team%2.", "<a href=\"team_create_form.php\">","</a>");
59
+    <h3>" . tra("Create a new team")."</h3>
60
+    " . tra("If you cannot find a team that is right for you, you can %1create a team%2.", "<a href=\"team_create_form.php\">", "</a>");
61 61
 page_tail();
62 62
 
63 63
 ?>
Please login to merge, or discard this patch.
html/user/create_account_action.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
     $project_prefs = "";
62 62
 }
63 63
 
64
-if(defined('INVITE_CODES')) {
64
+if (defined('INVITE_CODES')) {
65 65
     $invite_code = post_str("invite_code");
66
-    if (strlen($invite_code)==0) {
66
+    if (strlen($invite_code) == 0) {
67 67
         show_error(tra("You must supply an invitation code to create an account."));
68 68
     }
69 69
     if (!preg_match(INVITE_CODES, $invite_code)) {
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
     show_error(tra("Passwords may only include ASCII characters."));
99 99
 }
100 100
 
101
-if (strlen($passwd)<$min_passwd_length) {
101
+if (strlen($passwd) < $min_passwd_length) {
102 102
     show_error(
103 103
         tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length)
104 104
     );
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     show_error(tra("Couldn't create account"));
125 125
 }
126 126
 
127
-if(defined('INVITE_CODES')) {
127
+if (defined('INVITE_CODES')) {
128 128
     error_log("Account '$new_email_addr' created using invitation code '$invite_code'");
129 129
 }
130 130
 
Please login to merge, or discard this patch.
html/user/create_profile.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
110 110
     if ($publickey) {
111 111
         table_row(boinc_recaptcha_get_html($publickey));
112 112
     }
113
-    table_row("<p><input class=\"btn btn-default\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
113
+    table_row("<p><input class=\"btn btn-default\" 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
 block discarded – undo
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
 block discarded – undo
161 161
 
162 162
 function show_description() {
163 163
     echo "
164
-        <p>" .tra("Your %1profile%2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . "
164
+        <p>" .tra("Your %1profile%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
 block discarded – undo
179 179
     row1(show_profile_heading1());
180 180
     rowify(show_profile_question1().html_info());
181 181
     show_textarea("response1", $response1);
182
-    row1( show_profile_heading2());
183
-    rowify( show_profile_question2().html_info());
182
+    row1(show_profile_heading2());
183
+    rowify(show_profile_question2().html_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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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 {
Please login to merge, or discard this patch.
html/user/host_edit_action.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
html/user/bolt_sched.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
     if ($repeat) {
225 225
         $avg = number_format($repeat->avg_score*100, 0);
226 226
         echo "<p>Score on this exercise set: $avg%";
227
-        if ($repeat->flags & REVIEW) {
227
+        if ($repeat->flags&REVIEW) {
228 228
             //echo "<pre>";
229 229
             //print_r($repeat);
230 230
             //echo "</pre>";
@@ -232,11 +232,11 @@  discard block
 block discarded – undo
232 232
             $r = "<a href=bolt_sched.php?$url_args&action=review&view_id=$view_id&unit_name=$name>Review, then repeat exercises</a>";
233 233
             $links[] = $r;
234 234
         }
235
-        if ($repeat->flags & REPEAT) {
235
+        if ($repeat->flags&REPEAT) {
236 236
             $r = "<a href=bolt_sched.php?$url_args&action=repeat&view_id=$view_id>Repeat exercises</a>";
237 237
             $links[] = $r;
238 238
         }
239
-        if ($repeat->flags & NEXT) {
239
+        if ($repeat->flags&NEXT) {
240 240
             $links[] = $next;
241 241
         }
242 242
     } else {
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
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
 
Please login to merge, or discard this patch.
html/user/team_edit_action.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 if (!is_valid_country($country)) {
55 55
     error_page(tra("bad country"));
56 56
 }
57
-$joinable = post_str('joinable', true)?1:0;
57
+$joinable = post_str('joinable', true) ? 1 : 0;
58 58
 
59 59
 $t = BoincTeam::lookup("name='$team_name'");
60 60
 if ($t && $t->id != $teamid) {
Please login to merge, or discard this patch.
html/user/team_founder_transfer_action.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,6 +148,6 @@
 block discarded – undo
148 148
 
149 149
 page_tail();
150 150
 
151
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
151
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
152 152
 
153 153
 ?>
Please login to merge, or discard this patch.
html/user/login_action.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         page_tail();
45 45
         exit;
46 46
     }
47
-    if (substr($user->authenticator, 0, 1) == 'x'){
47
+    if (substr($user->authenticator, 0, 1) == 'x') {
48 48
         sleep(LOGIN_FAIL_SLEEP_SEC);
49 49
         error_page("This account has been administratively disabled.");
50 50
     }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
             Please <a href=get_passwd.php>try again</a>.
106 106
         ";
107 107
         page_tail();
108
-    } else if (substr($user->authenticator, 0, 1) == 'x'){
108
+    } else if (substr($user->authenticator, 0, 1) == 'x') {
109 109
         sleep(LOGIN_FAIL_SLEEP_SEC);
110 110
         error_page("This account has been administratively disabled.");
111 111
     } else {
Please login to merge, or discard this patch.
html/user/lammps.php 1 patch
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.