BOINC / boinc

html/user/create_profile.php

Doc Comments +10 added lines

@@ -31,6 +31,10 @@ 
 // If $selection is provided, and if it matches one of the entries in the file,
 // it will be selected by default.
 //
+/**
+ * @param string $name
+ * @param string $filename
+ */
 function show_combo_box($name, $filename, $selection=null) {
     echo "<select name=\"$name\" class=\"form-control\">\n";
 
@@ -185,6 +189,9 @@ 
     show_language_selection($profile);
 }
 
+/**
+ * @param string $name
+ */
 function show_textarea($name, $text) {
     rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>");
 }
@@ -311,6 +318,9 @@ 
     page_tail();
 }
 
+/**
+ * @param string $warning
+ */
 function show_profile_form($profile, $warning=null) {
     if ($profile) {
         page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra());

Spacing +20 added lines, -20 removed lines

@@ -31,7 +31,7 @@ 
 // If $selection is provided, and if it matches one of the entries in the file,
 // it will be selected by default.
 //
-function show_combo_box($name, $filename, $selection=null) {
+function show_combo_box($name, $filename, $selection = null) {
     echo "<select name=\"$name\" class=\"form-control\">\n";
 
     $file = fopen($filename, "r");
@@ -62,14 +62,14 @@ 
 <tr><td colspan=2>
 <table border=0 cellpadding=5
 <tr>
-<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a>
+<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a>
 </td>
-<td valign=top>" .tra("%1 Your profile picture is shown to the left.",  $warning) ."
+<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)."
 <p>".
-tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br />
+tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br />
 <input name=picture type=file><br>
 <p>".
-tra("To remove it from your profile, check this box:") . "
+tra("To remove it from your profile, check this box:")."
 <input type=checkbox name=delete_pic>
 <p>
 </td></tr>";
@@ -77,7 +77,7 @@ 
         end_table();
         echo "</td></tr>";
     } else {
-        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") . "
+        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")."
 <p>
 <input name=picture type=file>
         ");
@@ -92,7 +92,7 @@ 
     row1(tra("Language"));
     echo "<tr><td>
         <p>" .
-        tra("Select the language in which your profile is written:") . "
+        tra("Select the language in which your profile is written:")."
         <p>
     ";
     if (isset($profile->language)) {
@@ -110,7 +110,7 @@ 
     if ($publickey) {
         table_row(boinc_recaptcha_get_html($publickey));
     }
-    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
+    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">");
 }
 
 // Returns an array containing:
@@ -124,7 +124,7 @@ 
 
     // Determine if the filetype uploaded is supported.
     // TODO: Change these to constants.
-    switch($size[2]) {
+    switch ($size[2]) {
     case '2':    // JPEG
         $image = imageCreateFromJPEG($fileName);
         break;
@@ -161,7 +161,7 @@ 
 
 function show_description() {
     echo "
-        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . "
+        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)."
         <p>
     ";
 }
@@ -179,14 +179,14 @@ 
     row1(show_profile_heading1());
     rowify(show_profile_question1().bbcode_info());
     show_textarea("response1", $response1);
-    row1( show_profile_heading2());
-    rowify( show_profile_question2().bbcode_info());
+    row1(show_profile_heading2());
+    rowify(show_profile_question2().bbcode_info());
     show_textarea("response2", $response2);
     show_language_selection($profile);
 }
 
 function show_textarea($name, $text) {
-    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>");
+    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>");
 }
 
 // $profile is null if user doesn't already have a profile.
@@ -233,8 +233,8 @@ 
         $delete_pic = "off";
     }
 
-    if (strlen($response1)==0 &&
-        strlen($response2)==0 &&
+    if (strlen($response1) == 0 &&
+        strlen($response2) == 0 &&
         $delete_pic != "on" &&
         !is_uploaded_file($_FILES['picture']['tmp_name'])
     ) {
@@ -248,7 +248,7 @@ 
         $profile->verification = 0;
     }
 
-    $profile ? $has_picture = $profile->has_picture: $has_picture = false;
+    $profile ? $has_picture = $profile->has_picture : $has_picture = false;
 
     if (is_uploaded_file($_FILES['picture']['tmp_name'])) {
         $has_picture = true;
@@ -263,13 +263,13 @@ 
 
         // Write the original image file to disk.
         // TODO: define a constant for image quality.
-        ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg');
-        ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg');
+        ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg');
+        ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg');
     }
     $response1 = sanitize_html($response1);
     $response2 = sanitize_html($response2);
 
-    $has_picture = $has_picture?1:0;
+    $has_picture = $has_picture ? 1 : 0;
     if ($profile) {
         $query = " response1 = '".BoincDb::escape_string($response1)."',"
             ." response2 = '".BoincDb::escape_string($response2)."',"
@@ -311,7 +311,7 @@ 
     page_tail();
 }
 
-function show_profile_form($profile, $warning=null) {
+function show_profile_form($profile, $warning = null) {
     if ($profile) {
         page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra());
     } else {

html/user/forum_reply.php

Doc Comments +3 added lines

@@ -178,6 +178,9 @@
     row2($x1, $x2, false, "20%");
 }
 
+/**
+ * @param string $text
+ */
 function quote_text($text) {
     $text = "[quote]" . $text . "[/quote]";
     return $text;

Braces +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     $parent_post_id = 0;
 }
 
-if ($filter != "false"){
+if ($filter != "false") {
     $filter = true;
 } else {
     $filter = false;
@@ -65,10 +65,10 @@ 
 }
 
 $warning = null;
-if ($content && (!$preview)){
-    if (post_str('add_signature',true)=="add_it"){
+if ($content && (!$preview)) {
+    if (post_str('add_signature',true)=="add_it") {
         $add_signature=true;    // set a flag and concatenate later
-    }  else {
+    } else {
         $add_signature=false;
     }
     check_tokens($logged_in_user->authenticator);

Spacing +13 added lines, -13 removed lines

@@ -50,7 +50,7 @@ 
     $parent_post_id = 0;
 }
 
-if ($filter != "false"){
+if ($filter != "false") {
     $filter = true;
 } else {
     $filter = false;
@@ -65,11 +65,11 @@ 
 }
 
 $warning = null;
-if ($content && (!$preview)){
-    if (post_str('add_signature',true)=="add_it"){
-        $add_signature=true;    // set a flag and concatenate later
-    }  else {
-        $add_signature=false;
+if ($content && (!$preview)) {
+    if (post_str('add_signature', true) == "add_it") {
+        $add_signature = true; // set a flag and concatenate later
+    } else {
+        $add_signature = false;
     }
     check_tokens($logged_in_user->authenticator);
     if (!akismet_check($logged_in_user, $content)) {
@@ -88,7 +88,7 @@ 
     }
 }
 
-page_head(tra("Post to thread"),'','','', $bbcode_js);
+page_head(tra("Post to thread"), '', '', '', $bbcode_js);
 
 show_forum_header($logged_in_user);
 
@@ -142,7 +142,7 @@ 
     $x1 = tra("Message:").bbcode_info().post_warning();
     $x2 = "";
     if ($parent_post) {
-        $x2 .=" ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>");
+        $x2 .= " ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>");
     }
     $x2 .= "<form action=forum_reply.php?thread=".$thread->id;
 
@@ -153,7 +153,7 @@ 
     $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n";
     $x2 .= form_tokens($logged_in_user->authenticator);
     $x2 .= start_table_str().$bbcode_html.end_table_str()."<textarea class=\"form-control\" name=\"content\" rows=\"18\">";
-    $no_quote = get_int("no_quote", true)==1;
+    $no_quote = get_int("no_quote", true) == 1;
     if ($preview) {
         $x2 .= htmlspecialchars($content);
     } else if (!$no_quote) {
@@ -162,9 +162,9 @@ 
         }
     }
     if (!$logged_in_user->prefs->no_signature_by_default) {
-        $enable_signature="checked=\"true\"";
+        $enable_signature = "checked=\"true\"";
     } else {
-        $enable_signature="";
+        $enable_signature = "";
     }
     $x2 .= "</textarea><p> </p>
         <input class=\"btn btn-primary btn-sm \" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\">
@@ -179,9 +179,9 @@ 
 }
 
 function quote_text($text) {
-    $text = "[quote]" . $text . "[/quote]";
+    $text = "[quote]".$text."[/quote]";
     return $text;
 }
 
-$cvs_version_tracker[]="\$Id$";
+$cvs_version_tracker[] = "\$Id$";
 ?>

html/user/gpu_list.php

Doc Comments +10 added lines

@@ -29,6 +29,9 @@ 
 // take a host.serialnum field (which may encode several GPUs)
 // and extract the model name for the given vendor
 //
+/**
+ * @param string $vendor
+ */
 function get_gpu_model($x, $vendor) {
     $descs = explode("]", $x);
     array_pop($descs);
@@ -60,6 +63,10 @@ 
 // $x->linux
 // $x->mac
 //
+/**
+ * @param string $vendor
+ * @param string $alt_vendor
+ */
 function get_gpu_list($vendor, $alt_vendor=null) {
     $clause = "plan_class like '%$vendor%'";
     if ($alt_vendor) {
@@ -144,6 +151,9 @@ 
     return $x1->avg_time > $x2->avg_time;
 }
 
+/**
+ * @param string $name
+ */
 function show_list($models, $name) {
     echo "<td><h2>$name</h2>\n";
     if (!count($models)) {

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 // $x->linux
 // $x->mac
 //
-function get_gpu_list($vendor, $alt_vendor=null) {
+function get_gpu_list($vendor, $alt_vendor = null) {
     $clause = "plan_class like '%$vendor%'";
     if ($alt_vendor) {
         $clause .= " or plan_class like '%$alt_vendor%'";
@@ -73,7 +73,7 @@ 
     }
 
     $av_ids = "";
-    foreach($avs as $av) {
+    foreach ($avs as $av) {
         $av_ids .= "$av->id, ";
     }
     if ($vendor == "cuda") {
@@ -176,14 +176,14 @@ 
         echo tra("No GPU tasks reported");
         return;
     }
-    $have_win = count($x->win)>0;
-    $have_mac = count($x->mac)>0;
-    $have_linux = count($x->linux)>0;
+    $have_win = count($x->win) > 0;
+    $have_mac = count($x->mac) > 0;
+    $have_linux = count($x->linux) > 0;
     $n = 0;
     if ($have_win) $n++;
     if ($have_mac) $n++;
     if ($have_linux) $n++;
-    $show_total = $n>1;
+    $show_total = $n > 1;
     start_table();
     echo "<tr>";
     if ($show_total) {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 }
 
 $d = get_cached_data(86400);
-$data = FALSE;
+$data = false;
 if ($d) {
     $data = unserialize($d);
 }

html/user/host_app_versions.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
 
 require_once("../inc/util.inc");
 
+/**
+ * @param integer $t
+ */
 function rsc_name($t) {
     switch ($t) {
     case 2: return tra("CPU");

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         if (!$show_dep && $app->deprecated) {
             return null;
         }
-        $rsc_type = $gavid % 1000000;
+        $rsc_type = $gavid%1000000;
         $r = rsc_name($rsc_type);
         return "$app->user_friendly_name (".tra("anonymous platform").", $r)";
     } else {
@@ -60,7 +60,7 @@ 
         }
         $platform = BoincPlatform::lookup_id($av->platformid);
         if (!$platform) return tra("Missing platform");
-        $pc = (strlen($av->plan_class))?"($av->plan_class)":"";
+        $pc = (strlen($av->plan_class)) ? "($av->plan_class)" : "";
         $v = number_format($av->version_num/100, 2);
         return "$app->user_friendly_name $v $platform->name $pc";
     }

html/user/host_edit_action.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 require_once("../inc/util.inc");
 require_once("../inc/host.inc");
 
+/**
+ * @param string $msg
+ */
 function fail($msg) {
     echo "Error: $msg";
     page_tail();

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 $nhosts = get_int("nhosts");
 $hostid = get_int("id_0");
 $latest_host = get_host($hostid, $user);
-for ($i=1; $i<$nhosts; $i++) {
+for ($i = 1; $i < $nhosts; $i++) {
     $var = "id_$i";
     $hostid = get_int($var, true);
     if (!$hostid) continue;

html/user/lammps.php

Doc Comments +26 added lines

@@ -30,6 +30,9 @@ 
 //
 // output: success flag, CPU time per step, est. disk usage per job
 //
+/**
+ * @param resource $p
+ */
 function terminate_job($p) {
     $pstatus=proc_get_status($p);
     $ppid=$pstatus['pid'];
@@ -86,6 +89,9 @@ 
     return array($test_result, $total_cpu, $disk_space);
 }
 
+/**
+ * @param string $cmd_file
+ */
 function get_total_steps($cmd_file) {
     $fd = fopen($cmd_file,"r");
     if (!$fd) {
@@ -116,6 +122,9 @@ 
     return $total_steps;
 }
 
+/**
+ * @param string $filename
+ */
 function calc_step_cpu($filename) {
     $fd = fopen("$filename", "r");
     $start_line = "Step CPU ";
@@ -169,6 +178,11 @@ 
     return array($avg_cpu,$test_steps);
 }
 
+/**
+ * @param string $lammps_script
+ * @param string $structure_file
+ * @param string $cmd_file
+ */
 function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){
     $dump_types = 0;
     $fd = fopen($lammps_script,"r");
@@ -280,6 +294,11 @@ 
 
 // verify that an input file exists in sandbox, and return its physical path
 //
+/**
+ * @param string $name
+ *
+ * @return string
+ */
 function get_file_path($user, $name) {
     $fname = get_str($name);
 
@@ -308,6 +327,10 @@ 
 //
 // Note: these are both extremely optimistic estimates
 //
+/**
+ * @param integer $njobs
+ * @param double $flops_per_job
+ */
 function estimated_makespan($njobs, $flops_per_job) {
     $nhosts = BoincHost::count("expavg_credit > 1");
     if ($nhosts < 10) {
@@ -416,6 +439,9 @@ 
     page_tail();
 }
 
+/**
+ * @param integer $i
+ */
 function submit_job($app, $batch_id, $info, $cmdline, $i) {
     $client_disk=$info->rsc_disk_bound*2;
     if($client_disk<500000000) $client_disk=500000000;

Indentation +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
     $ppid=$pstatus['pid'];
     $ret=`ps -o pid --no-heading --ppid $ppid`;
     //echo "parent pid is $ppid\nterninate it\n";
-     proc_terminate($p);
+        proc_terminate($p);
     // echo "child process is $ret\n";
     $pids=preg_split('/\s+/',$ret);
     foreach($pids as $pid){
@@ -61,9 +61,9 @@ 
     while (1) {
         $ctime=time();
         if($ctime-$stime >=2 and ! file_exists("log.1")){
-           if($GLOBALS["debug"]) echo "time out "."<br>";
-           terminate_job($p);
-           break;
+            if($GLOBALS["debug"]) echo "time out "."<br>";
+            terminate_job($p);
+            break;
         } 
         if (file_exists("log.1")) {
             list($avg_cpu, $test_steps) = calc_step_cpu("log.1");
@@ -112,7 +112,7 @@ 
     }
     fclose($fd);
     //$total_steps = $loopno*$looprun;
-     if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
+        if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
     return $total_steps;
 }
 
@@ -147,12 +147,12 @@ 
         $cpu = (float)$arr[2];
         //echo "step=".$step." cpu=".$cpu."\n";
         if ($cpu==0) {
-           $count=0;
-           $start_step = $step;
+            $count=0;
+            $start_step = $step;
         } else {
             $count+=1;
             if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
-           if($count >= 10) {
+            if($count >= 10) {
                 $end_step = $step;
                 $steps = $end_step-$start_step;
                 $avg_cpu = $cpu/$steps;
@@ -183,7 +183,7 @@ 
         
         if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches))
         {        
-             if($GLOBALS["debug"]){print "matches=";print_r($matches);}
+                if($GLOBALS["debug"]){print "matches=";print_r($matches);}
 
             $dump_types=(int)$matches[1];
             break;
@@ -198,7 +198,7 @@ 
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
-     if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
+        if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
    
     $loopno=1;
     $looprun=1;
@@ -216,8 +216,8 @@ 
     }
     fclose($fd);
     if($GLOBALS["debug"]){
-         print "max loopno(number of loops to run)=".$loopno."<br>";
-         print "max looprun(steps for each loop)=".$looprun."<br>";
+            print "max loopno(number of loops to run)=".$loopno."<br>";
+            print "max looprun(steps for each loop)=".$looprun."<br>";
     }
     //$est_size = $loopno*$structure_file_size*0.8*$dump_types;
     $test_log_size = filesize("log.1");
@@ -368,7 +368,7 @@ 
             <br>Please refer to the following Error Message:<br><p>
         ";
         foreach($err_msgs as $line){
-             $err=$err.$line."<br>";
+                $err=$err.$line."<br>";
         }
         $err=$err." <p>
             <a href=sandbox.php><strong> File_Sandbox </strong></a>
@@ -393,7 +393,7 @@ 
     //
     $njobs = count(file($cmdline_file_path));
     $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est);
-     if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
+        if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
     //assume the server's flops is 1.5G and the average client's flops is 1G
     $hrs_est = number_format($secs_est*1.5/60, 2);
     //$hrs_est = number_format($secs_est, 2);

Spacing +73 added lines, -73 removed lines

@@ -18,7 +18,7 @@ 
 require_once("../inc/util.inc");
 require_once("../inc/submit_db.inc");
 require_once("../inc/sandbox.inc");
-$debug=0;
+$debug = 0;
 
 // test a LAMMPS job
 //
@@ -31,17 +31,17 @@ 
 // output: success flag, CPU time per step, est. disk usage per job
 //
 function terminate_job($p) {
-    $pstatus=proc_get_status($p);
-    $ppid=$pstatus['pid'];
-    $ret=`ps -o pid --no-heading --ppid $ppid`;
+    $pstatus = proc_get_status($p);
+    $ppid = $pstatus['pid'];
+    $ret = `ps -o pid --no-heading --ppid $ppid`;
     //echo "parent pid is $ppid\nterninate it\n";
      proc_terminate($p);
     // echo "child process is $ret\n";
-    $pids=preg_split('/\s+/',$ret);
-    foreach($pids as $pid){
-        if(is_numeric($pid)){
-            if($GLOBALS["debug"])echo "killing child process $pid\n";
-            posix_kill($pid,9);
+    $pids = preg_split('/\s+/', $ret);
+    foreach ($pids as $pid) {
+        if (is_numeric($pid)) {
+            if ($GLOBALS["debug"])echo "killing child process $pid\n";
+            posix_kill($pid, 9);
         }
     }
 }
@@ -52,23 +52,23 @@ 
     $descs = array();
     $pipes = array();
     $options = file("cmd_variables");
-    $options[0] = chop($options[0],"\n");
+    $options[0] = chop($options[0], "\n");
     $cmd = "../lmp_linux ".$options[0]."&>output";
     if ($GLOBALS["debug"]) echo $cmd."<br>";
     system("unzip pot_files >/dev/null");
     $stime = time();
     $p = proc_open("$cmd", $descs, $pipes);
     while (1) {
-        $ctime=time();
-        if($ctime-$stime >=2 and ! file_exists("log.1")){
-           if($GLOBALS["debug"]) echo "time out "."<br>";
+        $ctime = time();
+        if ($ctime - $stime >= 2 and !file_exists("log.1")) {
+           if ($GLOBALS["debug"]) echo "time out "."<br>";
            terminate_job($p);
            break;
         } 
         if (file_exists("log.1")) {
             list($avg_cpu, $test_steps) = calc_step_cpu("log.1");
             if ($avg_cpu != 0) {
-                if($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>";
+                if ($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>";
                 terminate_job($p);
                 $test_result = 1;
                 break;
@@ -87,32 +87,32 @@ 
 }
 
 function get_total_steps($cmd_file) {
-    $fd = fopen($cmd_file,"r");
+    $fd = fopen($cmd_file, "r");
     if (!$fd) {
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
     $this_loopno = 1;
     $this_looprun = 1;
-    $total_steps=1;
+    $total_steps = 1;
     while (!feof($fd)) {
-        $line = fgets($fd,4096);
+        $line = fgets($fd, 4096);
         if (preg_match("/loopnumber\s+\d+/", $line, $matches)
             && preg_match("/\d+/", $matches[0], $no)
         ) {
-            $this_loopno=$no[0];
+            $this_loopno = $no[0];
         }
         if (preg_match("/looprun\s+\d+/", $line, $matches)
             and preg_match("/\d+/", $matches[0], $no)
         ) {
-            $this_looprun=$no[0];
-            if($this_loopno*$this_looprun>$total_steps)$total_steps=$this_loopno*$this_looprun;
+            $this_looprun = $no[0];
+            if ($this_loopno*$this_looprun > $total_steps)$total_steps = $this_loopno*$this_looprun;
         }
 
     }
     fclose($fd);
     //$total_steps = $loopno*$looprun;
-     if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
+     if ($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
     return $total_steps;
 }
 
@@ -130,8 +130,8 @@ 
     }
     $count = 0;
     while (!feof($fd)) {
-        $line = fgets($fd,4096);
-        if (preg_match('/^Step\s+CPU/',$line)) {
+        $line = fgets($fd, 4096);
+        if (preg_match('/^Step\s+CPU/', $line)) {
             //echo $line."\n";
             $start = 1;
             continue;
@@ -140,24 +140,24 @@ 
         $arr = preg_split("/\s+/", $line);
         //print_r($arr);
 
-        if (count($arr) <=6 || !is_numeric($arr[1])) {
+        if (count($arr) <= 6 || !is_numeric($arr[1])) {
             continue;
         }
         $step = (int)$arr[1];
         $cpu = (float)$arr[2];
         //echo "step=".$step." cpu=".$cpu."\n";
-        if ($cpu==0) {
-           $count=0;
+        if ($cpu == 0) {
+           $count = 0;
            $start_step = $step;
         } else {
-            $count+=1;
-            if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
-           if($count >= 10) {
+            $count += 1;
+            if ($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
+           if ($count >= 10) {
                 $end_step = $step;
-                $steps = $end_step-$start_step;
+                $steps = $end_step - $start_step;
                 $avg_cpu = $cpu/$steps;
                 #$avg_cpu = $cpu/$count;
-                if ($GLOBALS["debug"]){
+                if ($GLOBALS["debug"]) {
                     echo "test steps is ".$steps."<br>";
                     echo "avg_cpu is ".$avg_cpu."<br>";
                 }
@@ -166,56 +166,56 @@ 
             }
         }
     }
-    return array($avg_cpu,$test_steps);
+    return array($avg_cpu, $test_steps);
 }
 
-function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){
+function calc_est_size($lammps_script, $structure_file, $cmd_file, $test_steps) {
     $dump_types = 0;
-    $fd = fopen($lammps_script,"r");
-    if (!$fd){
+    $fd = fopen($lammps_script, "r");
+    if (!$fd) {
         echo "can not open file $lammps_script\n";
         exit(-1);
     }
-    while (!feof($fd)){
+    while (!feof($fd)) {
         $line = fgets($fd, 4096);
         //if (preg_match("/^\s*dump/", $line)
         //    and preg_match_all("/dump\S+\.\w{3}/", $line, $matches, PREG_PATTERN_ORDER))
         
-        if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches))
+        if (preg_match("/^\s*dump\s+(\d)\s+/", $line, $matches))
         {        
-             if($GLOBALS["debug"]){print "matches=";print_r($matches);}
+             if ($GLOBALS["debug"]) {print "matches="; print_r($matches); }
 
-            $dump_types=(int)$matches[1];
+            $dump_types = (int)$matches[1];
             break;
         }
     }
     fclose($fd);
-    if($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>";
+    if ($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>";
 
     $structure_file_size = filesize($structure_file);
-    $fd = fopen($cmd_file,"r");
-    if (!$fd){
+    $fd = fopen($cmd_file, "r");
+    if (!$fd) {
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
-     if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
+     if ($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
    
-    $loopno=1;
-    $looprun=1;
-    while (!feof($fd)){
-        $line = fgets($fd,4096);
-        if(preg_match("/loopnumber\s+\d+/", $line, $matches)){
-            if(preg_match("/\d+/", $matches[0], $no)){
+    $loopno = 1;
+    $looprun = 1;
+    while (!feof($fd)) {
+        $line = fgets($fd, 4096);
+        if (preg_match("/loopnumber\s+\d+/", $line, $matches)) {
+            if (preg_match("/\d+/", $matches[0], $no)) {
                 //$loopno=$no[0];
-                if($no[0]>$loopno)$loopno=$no[0];
+                if ($no[0] > $loopno)$loopno = $no[0];
             }
         }
         if (preg_match("/looprun\s+\d+/", $line, $matches) and preg_match("/\d+/", $matches[0], $no)) {
-            if($no[0]>$looprun)$looprun=$no[0];
+            if ($no[0] > $looprun)$looprun = $no[0];
         }
     }
     fclose($fd);
-    if($GLOBALS["debug"]){
+    if ($GLOBALS["debug"]) {
          print "max loopno(number of loops to run)=".$loopno."<br>";
          print "max looprun(steps for each loop)=".$looprun."<br>";
     }
@@ -226,12 +226,12 @@ 
     $dump_files = glob("dump1*");
     $test_dump_file = $dump_files[0];
     $test_dump_size = filesize($test_dump_file);
-    $dump_size1 = $test_dump_size+0.5*$test_dump_size*ceil(($looprun-$test_steps)/$test_steps);
+    $dump_size1 = $test_dump_size + 0.5*$test_dump_size*ceil(($looprun - $test_steps)/$test_steps);
     $dump_size = $loopno*$dump_size1*$dump_types;
     $app_fixed_size = 5e7;
-    $est_size = $log_size+$dump_size+$app_fixed_size;
+    $est_size = $log_size + $dump_size + $app_fixed_size;
     
-    if($GLOBALS["debug"]){
+    if ($GLOBALS["debug"]) {
         print "test_steps=".$test_steps."<br>";
         print "test_log_size=".$test_log_size."<br>";
         print "log_size1=".$log_size1."<br>";
@@ -322,7 +322,7 @@ 
     if ($njobs < $nhosts) {
         return $flops_per_job/$median_flops;
     } else {
-        $k = (int)(($njobs+$nhosts-1)/$nhosts);
+        $k = (int)(($njobs + $nhosts - 1)/$nhosts);
         return $k*$flops_per_job/$median_flops;
     }
 }
@@ -362,27 +362,27 @@ 
     if ($GLOBALS["debug"]) {
         print "est_cpu_time is ".$est_cpu_time."<br>";
     }
-    if ($error==0) {
-        $err_msgs=file("output");
-        $err="Your test job <strong>failed</strong>
+    if ($error == 0) {
+        $err_msgs = file("output");
+        $err = "Your test job <strong>failed</strong>
             <br>Please refer to the following Error Message:<br><p>
         ";
-        foreach($err_msgs as $line){
-             $err=$err.$line."<br>";
+        foreach ($err_msgs as $line) {
+             $err = $err.$line."<br>";
         }
-        $err=$err." <p>
+        $err = $err." <p>
             <a href=sandbox.php><strong> File_Sandbox </strong></a>
         ";
         error_page($err);
     }
 
     system("rm *");
-    $info->rsc_fpops_est = $est_cpu_time * 1.5e9;
-    $info->rsc_fpops_bound = $info->rsc_fpops_est * 20;
+    $info->rsc_fpops_est = $est_cpu_time*1.5e9;
+    $info->rsc_fpops_bound = $info->rsc_fpops_est*20;
     
-    if ($disk==0){
-        $info->rsc_disk_bound=1000000;
-    } else{
+    if ($disk == 0) {
+        $info->rsc_disk_bound = 1000000;
+    } else {
         $info->rsc_disk_bound = $disk;
     }
 
@@ -393,7 +393,7 @@ 
     //
     $njobs = count(file($cmdline_file_path));
     $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est);
-     if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
+     if ($GLOBALS["debug"])echo "secs_est is $secs_est\n";
     //assume the server's flops is 1.5G and the average client's flops is 1G
     $hrs_est = number_format($secs_est*1.5/60, 2);
     //$hrs_est = number_format($secs_est, 2);
@@ -417,8 +417,8 @@ 
 }
 
 function submit_job($app, $batch_id, $info, $cmdline, $i) {
-    $client_disk=$info->rsc_disk_bound*2;
-    if($client_disk<500000000) $client_disk=500000000;
+    $client_disk = $info->rsc_disk_bound*2;
+    if ($client_disk < 500000000) $client_disk = 500000000;
     $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";
     if ($cmdline) {
         $cmd .= " --command_line \"$cmdline\"";
@@ -442,9 +442,9 @@ 
     $x = file_get_contents("$tmpfile");
     $info = unserialize($x);
 
-    $njobs=0;
+    $njobs = 0;
     $cmdlines = file($info->cmdline_file_path);
-    foreach ($cmdlines as $cmdline){
+    foreach ($cmdlines as $cmdline) {
         if (preg_match("/^\s*-var/", $cmdline)) {
             $njobs++;
         }
@@ -460,7 +460,7 @@ 
 
     $i = 0;
     foreach ($cmdlines as $cmdline) {
-        if (preg_match("/^\s*-var/", $cmdline)){
+        if (preg_match("/^\s*-var/", $cmdline)) {
             submit_job($app, $batch_id, $info, $cmdline, $i);
             $i++;
         }

Braces +19 added lines, -20 removed lines

@@ -38,8 +38,8 @@ 
      proc_terminate($p);
     // echo "child process is $ret\n";
     $pids=preg_split('/\s+/',$ret);
-    foreach($pids as $pid){
-        if(is_numeric($pid)){
+    foreach($pids as $pid) {
+        if(is_numeric($pid)) {
             if($GLOBALS["debug"])echo "killing child process $pid\n";
             posix_kill($pid,9);
         }
@@ -60,7 +60,7 @@ 
     $p = proc_open("$cmd", $descs, $pipes);
     while (1) {
         $ctime=time();
-        if($ctime-$stime >=2 and ! file_exists("log.1")){
+        if($ctime-$stime >=2 and ! file_exists("log.1")) {
            if($GLOBALS["debug"]) echo "time out "."<br>";
            terminate_job($p);
            break;
@@ -157,7 +157,7 @@ 
                 $steps = $end_step-$start_step;
                 $avg_cpu = $cpu/$steps;
                 #$avg_cpu = $cpu/$count;
-                if ($GLOBALS["debug"]){
+                if ($GLOBALS["debug"]) {
                     echo "test steps is ".$steps."<br>";
                     echo "avg_cpu is ".$avg_cpu."<br>";
                 }
@@ -169,20 +169,19 @@ 
     return array($avg_cpu,$test_steps);
 }
 
-function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){
+function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps) {
     $dump_types = 0;
     $fd = fopen($lammps_script,"r");
-    if (!$fd){
+    if (!$fd) {
         echo "can not open file $lammps_script\n";
         exit(-1);
     }
-    while (!feof($fd)){
+    while (!feof($fd)) {
         $line = fgets($fd, 4096);
         //if (preg_match("/^\s*dump/", $line)
         //    and preg_match_all("/dump\S+\.\w{3}/", $line, $matches, PREG_PATTERN_ORDER))
         
-        if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches))
-        {        
+        if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches)) {
              if($GLOBALS["debug"]){print "matches=";print_r($matches);}
 
             $dump_types=(int)$matches[1];
@@ -194,7 +193,7 @@ 
 
     $structure_file_size = filesize($structure_file);
     $fd = fopen($cmd_file,"r");
-    if (!$fd){
+    if (!$fd) {
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
@@ -202,10 +201,10 @@ 
    
     $loopno=1;
     $looprun=1;
-    while (!feof($fd)){
+    while (!feof($fd)) {
         $line = fgets($fd,4096);
-        if(preg_match("/loopnumber\s+\d+/", $line, $matches)){
-            if(preg_match("/\d+/", $matches[0], $no)){
+        if(preg_match("/loopnumber\s+\d+/", $line, $matches)) {
+            if(preg_match("/\d+/", $matches[0], $no)) {
                 //$loopno=$no[0];
                 if($no[0]>$loopno)$loopno=$no[0];
             }
@@ -215,7 +214,7 @@ 
         }
     }
     fclose($fd);
-    if($GLOBALS["debug"]){
+    if($GLOBALS["debug"]) {
          print "max loopno(number of loops to run)=".$loopno."<br>";
          print "max looprun(steps for each loop)=".$looprun."<br>";
     }
@@ -231,7 +230,7 @@ 
     $app_fixed_size = 5e7;
     $est_size = $log_size+$dump_size+$app_fixed_size;
     
-    if($GLOBALS["debug"]){
+    if($GLOBALS["debug"]) {
         print "test_steps=".$test_steps."<br>";
         print "test_log_size=".$test_log_size."<br>";
         print "log_size1=".$log_size1."<br>";
@@ -367,7 +366,7 @@ 
         $err="Your test job <strong>failed</strong>
             <br>Please refer to the following Error Message:<br><p>
         ";
-        foreach($err_msgs as $line){
+        foreach($err_msgs as $line) {
              $err=$err.$line."<br>";
         }
         $err=$err." <p>
@@ -380,9 +379,9 @@ 
     $info->rsc_fpops_est = $est_cpu_time * 1.5e9;
     $info->rsc_fpops_bound = $info->rsc_fpops_est * 20;
     
-    if ($disk==0){
+    if ($disk==0) {
         $info->rsc_disk_bound=1000000;
-    } else{
+    } else {
         $info->rsc_disk_bound = $disk;
     }
 
@@ -444,7 +443,7 @@ 
 
     $njobs=0;
     $cmdlines = file($info->cmdline_file_path);
-    foreach ($cmdlines as $cmdline){
+    foreach ($cmdlines as $cmdline) {
         if (preg_match("/^\s*-var/", $cmdline)) {
             $njobs++;
         }
@@ -460,7 +459,7 @@ 
 
     $i = 0;
     foreach ($cmdlines as $cmdline) {
-        if (preg_match("/^\s*-var/", $cmdline)){
+        if (preg_match("/^\s*-var/", $cmdline)) {
             submit_job($app, $batch_id, $info, $cmdline, $i);
             $i++;
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -430,7 +430,7 @@
     //echo "<br> $cmd\n"; 
 
     system($cmd, $ret);
-    if ($ret === FALSE) {
+    if ($ret === false) {
         error_page("can't create job");
     } else {
         header('Location: submit.php');

html/user/openid.php

Doc Comments +11 added lines, -1 removed lines

@@ -315,6 +315,11 @@ 
     /**
      * Helper function used to scan for <meta>/<link> tags and extract information
      * from them
+     * @param string $tag
+     * @param string $attrName
+     * @param string $attrValue
+     * @param string $valueName
+     * @return string
      */
     protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
     {
@@ -531,6 +536,9 @@ 
         return $params;
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v1($immediate)
     {
 	$returnUrl = $this->returnUrl;
@@ -552,6 +560,9 @@ 
                                , array('query' => http_build_query($params, '', '&')));
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v2($immediate)
     {
         $params = array(
@@ -587,7 +598,6 @@ 
     /**
      * Returns authentication url. Usually, you want to redirect your user to it.
      * @return String The authentication url.
-     * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
      * @throws ErrorException
      */
     function authUrl($immediate = false)

Indentation +19 added lines, -19 removed lines

@@ -47,11 +47,11 @@ 
 class LightOpenID
 {
     public $returnUrl
-         , $required = array()
-         , $optional = array()
-         , $verify_peer = null
-         , $capath = null
-         , $cainfo = null;
+            , $required = array()
+            , $optional = array()
+            , $verify_peer = null
+            , $capath = null
+            , $cainfo = null;
     private $identity, $claimed_id;
     protected $server, $version, $trustRoot, $aliases, $identifier_select = false
             , $ax = false, $sreg = false, $data, $setup_url = null;
@@ -261,8 +261,8 @@ 
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
                         $this->claimed_id = $parsed_url['scheme'] . '://'
-                                          . $parsed_url['host']
-                                          . $headers[$name];
+                                            . $parsed_url['host']
+                                            . $headers[$name];
                     }
                 }
             }
@@ -301,14 +301,14 @@ 
 
         $url = $parts + $url;
         $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
+                . (empty($url['username'])?''
                  :(empty($url['password'])? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
-             . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+                . $url['host']
+                . (empty($url['port'])?'':":{$url['port']}")
+                . (empty($url['path'])?'':$url['path'])
+                . (empty($url['query'])?'':"?{$url['query']}")
+                . (empty($url['fragment'])?'':"#{$url['fragment']}");
         return $url;
     }
 
@@ -533,7 +533,7 @@ 
 
     protected function authUrl_v1($immediate)
     {
-	$returnUrl = $this->returnUrl;
+    $returnUrl = $this->returnUrl;
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
@@ -549,7 +549,7 @@ 
             ) + $this->sregParams();
 
         return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
+                                , array('query' => http_build_query($params, '', '&')));
     }
 
     protected function authUrl_v2($immediate)
@@ -574,14 +574,14 @@ 
 
         if ($this->identifier_select) {
             $params['openid.identity'] = $params['openid.claimed_id']
-                 = 'http://specs.openid.net/auth/2.0/identifier_select';
+                    = 'http://specs.openid.net/auth/2.0/identifier_select';
         } else {
             $params['openid.identity'] = $this->identity;
             $params['openid.claimed_id'] = $this->claimed_id;
         }
 
         return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
+                                , array('query' => http_build_query($params, '', '&')));
     }
 
     /**
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                                .  'openid.claimed_id=' . $this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -707,7 +707,7 @@ 
                 continue;
             }
             $key = substr($this->data['openid_' . $alias . '_type_' . $key],
-                          strlen('http://axschema.org/'));
+                            strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }
         return $attributes;

Braces +24 added lines, -42 removed lines

@@ -44,8 +44,7 @@ 
  * @copyright Copyright (c) 2010, Mewp
  * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
-class LightOpenID
-{
+class LightOpenID {
     public $returnUrl
          , $required = array()
          , $optional = array()
@@ -67,8 +66,7 @@ 
         'pref/timezone'           => 'timezone',
         );
 
-    function __construct()
-    {
+    function __construct() {
         $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
         $this->returnUrl = $this->trustRoot . $uri;
@@ -80,8 +78,7 @@ 
         }
     }
 
-    function __set($name, $value)
-    {
+    function __set($name, $value) {
         switch ($name) {
         case 'identity':
             if (strlen($value = trim((String) $value))) {
@@ -102,8 +99,7 @@ 
         }
     }
 
-    function __get($name)
-    {
+    function __get($name) {
         switch ($name) {
         case 'identity':
             # We return claimed_id instead of identity,
@@ -124,8 +120,7 @@ 
      * @param $url url to check
      * @return true, if the server exists; false otherwise
      */
-    function hostExists($url)
-    {
+    function hostExists($url) {
         if (strpos($url, '/') === false) {
             $server = $url;
         } else {
@@ -139,8 +134,7 @@ 
         return !!gethostbynamel($server);
     }
 
-    protected function request_curl($url, $method='GET', $params=array())
-    {
+    protected function request_curl($url, $method='GET', $params=array()) {
         $params = http_build_query($params, '', '&');
         $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -195,8 +189,7 @@ 
         return $response;
     }
 
-    protected function request_streams($url, $method='GET', $params=array())
-    {
+    protected function request_streams($url, $method='GET', $params=array()) {
         if(!$this->hostExists($url)) {
             throw new ErrorException('Invalid request.');
         }
@@ -285,16 +278,14 @@ 
         return file_get_contents($url, false, $context);
     }
 
-    protected function request($url, $method='GET', $params=array())
-    {
+    protected function request($url, $method='GET', $params=array()) {
         if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
     }
 
-    protected function build_url($url, $parts)
-    {
+    protected function build_url($url, $parts) {
         if (isset($url['query'], $parts['query'])) {
             $parts['query'] = $url['query'] . '&' . $parts['query'];
         }
@@ -316,8 +307,7 @@ 
      * Helper function used to scan for <meta>/<link> tags and extract information
      * from them
      */
-    protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
-    {
+    protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName) {
         preg_match_all("#<{$tag}[^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*$valueName=['\"](.+?)['\"][^>]*/?>#i", $content, $matches1);
         preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
 
@@ -331,8 +321,7 @@ 
      * @return String OP Endpoint (i.e. OpenID provider address).
      * @throws ErrorException
      */
-    function discover($url)
-    {
+    function discover($url) {
         if (!$url) throw new ErrorException('No identity supplied.');
         # Use xri.net proxy to resolve i-name identities
         if (!preg_match('#^https?:#', $url)) {
@@ -465,8 +454,7 @@ 
         throw new ErrorException('Endless redirection!');
     }
 
-    protected function sregParams()
-    {
+    protected function sregParams() {
         $params = array();
         # We always use SREG 1.1, even if the server is advertising only support for 1.0.
         # That's because it's fully backwards compatibile with 1.0, and some providers
@@ -492,8 +480,7 @@ 
         return $params;
     }
 
-    protected function axParams()
-    {
+    protected function axParams() {
         $params = array();
         if ($this->required || $this->optional) {
             $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
@@ -531,8 +518,7 @@ 
         return $params;
     }
 
-    protected function authUrl_v1($immediate)
-    {
+    protected function authUrl_v1($immediate) {
 	$returnUrl = $this->returnUrl;
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
@@ -552,8 +538,7 @@ 
                                , array('query' => http_build_query($params, '', '&')));
     }
 
-    protected function authUrl_v2($immediate)
-    {
+    protected function authUrl_v2($immediate) {
         $params = array(
             'openid.ns'          => 'http://specs.openid.net/auth/2.0',
             'openid.mode'        => $immediate ? 'checkid_immediate' : 'checkid_setup',
@@ -590,8 +575,7 @@ 
      * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
      * @throws ErrorException
      */
-    function authUrl($immediate = false)
-    {
+    function authUrl($immediate = false) {
         if ($this->setup_url && !$immediate) return $this->setup_url;
         if (!$this->server) $this->discover($this->identity);
 
@@ -606,8 +590,7 @@ 
      * @return Bool Whether the verification was successful.
      * @throws ErrorException
      */
-    function validate()
-    {
+    function validate() {
         # If the request was using immediate mode, a failure may be reported
         # by presenting user_setup_url (for 1.1) or reporting
         # mode 'setup_needed' (for 2.0). Also catching all modes other than
@@ -668,12 +651,12 @@ 
         return preg_match('/is_valid\s*:\s*true/i', $response);
     }
 
-    protected function getAxAttributes()
-    {
+    protected function getAxAttributes() {
         $alias = null;
         if (isset($this->data['openid_ns_ax'])
             && $this->data['openid_ns_ax'] != 'http://openid.net/srv/ax/1.0'
-        ) { # It's the most likely case, so we'll check it before
+        ) {
+# It's the most likely case, so we'll check it before
             $alias = 'ax';
         } else {
             # 'ax' prefix is either undefined, or points to another extension,
@@ -713,8 +696,7 @@ 
         return $attributes;
     }
 
-    protected function getSregAttributes()
-    {
+    protected function getSregAttributes() {
         $attributes = array();
         $sreg_to_ax = array_flip(self::$ax_to_sreg);
         foreach ($this->data as $key => $value) {
@@ -741,11 +723,11 @@ 
      *     * @return Array Array of attributes with keys being the AX schema names, e.g. 'contact/email'
      * @see http://www.axschema.org/types/
      */
-    function getAttributes()
-    {
+    function getAttributes() {
         if (isset($this->data['openid_ns'])
             && $this->data['openid_ns'] == 'http://specs.openid.net/auth/2.0'
-        ) { # OpenID 2.0
+        ) {
+# OpenID 2.0
             # We search for both AX and SREG attributes, with AX taking precedence.
             return $this->getAxAttributes() + $this->getSregAttributes();
         }

Spacing +64 added lines, -64 removed lines

@@ -69,13 +69,13 @@ 
 
     function __construct()
     {
-        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
-        $this->returnUrl = $this->trustRoot . $uri;
+        $this->returnUrl = $this->trustRoot.$uri;
 
         $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
 
-        if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
+        if (!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
             throw new ErrorException('You must have either https wrappers or curl enabled.');
         }
     }
@@ -84,7 +84,7 @@ 
     {
         switch ($name) {
         case 'identity':
-            if (strlen($value = trim((String) $value))) {
+            if (strlen($value = trim((String)$value))) {
                 if (preg_match('#^xri:/*#i', $value, $m)) {
                     $value = substr($value, strlen($m[0]));
                 } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
@@ -139,23 +139,23 @@ 
         return !!gethostbynamel($server);
     }
 
-    protected function request_curl($url, $method='GET', $params=array())
+    protected function request_curl($url, $method = 'GET', $params = array())
     {
         $params = http_build_query($params, '', '&');
-        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
+        $curl = curl_init($url.($method == 'GET' && $params ? '?'.$params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
 
-        if($this->verify_peer !== null) {
+        if ($this->verify_peer !== null) {
             curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
-            if($this->capath) {
+            if ($this->capath) {
                 curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
             }
 
-            if($this->cainfo) {
+            if ($this->cainfo) {
                 curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
             }
         }
@@ -171,17 +171,17 @@ 
         }
         $response = curl_exec($curl);
 
-        if($method == 'HEAD') {
+        if ($method == 'HEAD') {
             $headers = array();
-            foreach(explode("\n", $response) as $header) {
-                $pos = strpos($header,':');
+            foreach (explode("\n", $response) as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
             }
 
             # Updating claimed_id in case of redirections.
             $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-            if($effective_url != $url) {
+            if ($effective_url != $url) {
                 $this->identity = $this->claimed_id = $effective_url;
             }
 
@@ -195,14 +195,14 @@ 
         return $response;
     }
 
-    protected function request_streams($url, $method='GET', $params=array())
+    protected function request_streams($url, $method = 'GET', $params = array())
     {
-        if(!$this->hostExists($url)) {
+        if (!$this->hostExists($url)) {
             throw new ErrorException('Invalid request.');
         }
 
         $params = http_build_query($params, '', '&');
-        switch($method) {
+        switch ($method) {
         case 'GET':
             $opts = array(
                 'http' => array(
@@ -211,7 +211,7 @@ 
                     'ignore_errors' => true,
                 )
             );
-            $url = $url . ($params ? '?' . $params : '');
+            $url = $url.($params ? '?'.$params : '');
             break;
         case 'POST':
             $opts = array(
@@ -236,31 +236,31 @@ 
                 ))
             );
 
-            $url = $url . ($params ? '?' . $params : '');
-            $headers_tmp = get_headers ($url);
-            if(!$headers_tmp) {
+            $url = $url.($params ? '?'.$params : '');
+            $headers_tmp = get_headers($url);
+            if (!$headers_tmp) {
                 return array();
             }
 
             # Parsing headers.
             $headers = array();
-            foreach($headers_tmp as $header) {
-                $pos = strpos($header,':');
+            foreach ($headers_tmp as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
 
                 # Following possible redirections. The point is just to have
                 # claimed_id change with them, because get_headers() will
                 # follow redirections automatically.
                 # We ignore redirections with relative paths.
                 # If any known provider uses them, file a bug report.
-                if($name == 'location') {
-                    if(strpos($headers[$name], 'http') === 0) {
+                if ($name == 'location') {
+                    if (strpos($headers[$name], 'http') === 0) {
                         $this->identity = $this->claimed_id = $headers[$name];
-                    } elseif($headers[$name][0] == '/') {
+                    } elseif ($headers[$name][0] == '/') {
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
-                        $this->claimed_id = $parsed_url['scheme'] . '://'
+                        $this->claimed_id = $parsed_url['scheme'].'://'
                                           . $parsed_url['host']
                                           . $headers[$name];
                     }
@@ -272,7 +272,7 @@ 
             return $headers;
         }
 
-        if($this->verify_peer) {
+        if ($this->verify_peer) {
             $opts += array('ssl' => array(
                 'verify_peer' => true,
                 'capath'      => $this->capath,
@@ -280,14 +280,14 @@ 
             ));
         }
 
-        $context = stream_context_create ($opts);
+        $context = stream_context_create($opts);
 
         return file_get_contents($url, false, $context);
     }
 
-    protected function request($url, $method='GET', $params=array())
+    protected function request($url, $method = 'GET', $params = array())
     {
-        if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
+        if (function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
@@ -296,19 +296,19 @@ 
     protected function build_url($url, $parts)
     {
         if (isset($url['query'], $parts['query'])) {
-            $parts['query'] = $url['query'] . '&' . $parts['query'];
+            $parts['query'] = $url['query'].'&'.$parts['query'];
         }
 
         $url = $parts + $url;
-        $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
-                 :(empty($url['password'])? "{$url['username']}@"
+        $url = $url['scheme'].'://'
+             . (empty($url['username']) ? ''
+                 :(empty($url['password']) ? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
              . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+             . (empty($url['port']) ? '' : ":{$url['port']}")
+             . (empty($url['path']) ? '' : $url['path'])
+             . (empty($url['query']) ? '' : "?{$url['query']}")
+             . (empty($url['fragment']) ? '' : "#{$url['fragment']}");
         return $url;
     }
 
@@ -322,7 +322,7 @@ 
         preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
 
         $result = array_merge($matches1[1], $matches2[1]);
-        return empty($result)?false:$result[0];
+        return empty($result) ?false:$result[0];
     }
 
     /**
@@ -348,7 +348,7 @@ 
         $yadis = true;
 
         # We'll jump a maximum of 5 times, to avoid endless redirections.
-        for ($i = 0; $i < 5; $i ++) {
+        for ($i = 0; $i < 5; $i++) {
             if ($yadis) {
                 $headers = $this->request($url, 'HEAD');
 
@@ -370,12 +370,12 @@ 
                     $content = $this->request($url, 'GET');
 
                     preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
-                    foreach($m[1] as $content) {
-                        $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+                    foreach ($m[1] as $content) {
+                        $content = ' '.$content; # The space is added, so that strpos doesn't return 0.
 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/');
-                        if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
+                        if (preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
                             if ($type[1] == 'server') $this->identifier_select = true;
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
@@ -384,7 +384,7 @@ 
                                 return false;
                             }
                             # Does the server advertise support for either AX or SREG?
-                            $this->ax   = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
+                            $this->ax   = (bool)strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
                             $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
@@ -498,33 +498,33 @@ 
         if ($this->required || $this->optional) {
             $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
             $params['openid.ax.mode'] = 'fetch_request';
-            $this->aliases  = array();
+            $this->aliases = array();
             $counts   = array();
             $required = array();
             $optional = array();
-            foreach (array('required','optional') as $type) {
+            foreach (array('required', 'optional') as $type) {
                 foreach ($this->$type as $alias => $field) {
                     if (is_int($alias)) $alias = strtr($field, '/', '_');
-                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
+                    $this->aliases[$alias] = 'http://axschema.org/'.$field;
                     if (empty($counts[$alias])) $counts[$alias] = 0;
                     $counts[$alias] += 1;
                     ${$type}[] = $alias;
                 }
             }
             foreach ($this->aliases as $alias => $ns) {
-                $params['openid.ax.type.' . $alias] = $ns;
+                $params['openid.ax.type.'.$alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
                 if ($count == 1) continue;
-                $params['openid.ax.count.' . $alias] = $count;
+                $params['openid.ax.count.'.$alias] = $count;
             }
 
             # Don't send empty ax.requied and ax.if_available.
             # Google and possibly other providers refuse to support ax when one of these is empty.
-            if($required) {
+            if ($required) {
                 $params['openid.ax.required'] = implode(',', $required);
             }
-            if($optional) {
+            if ($optional) {
                 $params['openid.ax.if_available'] = implode(',', $optional);
             }
         }
@@ -537,8 +537,8 @@ 
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
-        if($this->identity != $this->claimed_id) {
-            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
+        if ($this->identity != $this->claimed_id) {
+            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?').'openid.claimed_id='.$this->claimed_id;
         }
 
         $params = array(
@@ -612,15 +612,15 @@ 
         # by presenting user_setup_url (for 1.1) or reporting
         # mode 'setup_needed' (for 2.0). Also catching all modes other than
         # id_res, in order to avoid throwing errors.
-        if(isset($this->data['openid_user_setup_url'])) {
+        if (isset($this->data['openid_user_setup_url'])) {
             $this->setup_url = $this->data['openid_user_setup_url'];
             return false;
         }
-        if($this->mode != 'id_res') {
+        if ($this->mode != 'id_res') {
             return false;
         }
 
-        $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
+        $this->claimed_id = isset($this->data['openid_claimed_id']) ? $this->data['openid_claimed_id'] : $this->data['openid_identity'];
         $params = array(
             'openid.assoc_handle' => $this->data['openid_assoc_handle'],
             'openid.signed'       => $this->data['openid_signed'],
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                             .  'openid.claimed_id='.$this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -656,8 +656,8 @@ 
             # In such case, validation would fail, since we'd send different data than OP
             # wants to verify. stripslashes() should solve that problem, but we can't
             # use it when magic_quotes is off.
-            $value = $this->data['openid_' . str_replace('.','_',$item)];
-            $params['openid.' . $item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
+            $value = $this->data['openid_'.str_replace('.', '_', $item)];
+            $params['openid.'.$item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
 
         }
 
@@ -695,18 +695,18 @@ 
 
         $attributes = array();
         foreach ($this->data as $key => $value) {
-            $keyMatch = 'openid_' . $alias . '_value_';
+            $keyMatch = 'openid_'.$alias.'_value_';
             if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
                 continue;
             }
             $key = substr($key, strlen($keyMatch));
-            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
+            if (!isset($this->data['openid_'.$alias.'_type_'.$key])) {
                 # OP is breaking the spec by returning a field without
                 # associated ns. This shouldn't happen, but it's better
                 # to check, than cause an E_NOTICE.
                 continue;
             }
-            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
+            $key = substr($this->data['openid_'.$alias.'_type_'.$key],
                           strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }

html/user/server_status.php

Doc Comments +17 added lines

@@ -88,17 +88,26 @@ 
 ";
 }
 
+/**
+ * @param string $name
+ */
 function item_xml($name, $val) {
     if (!$val) $val = 0;
     echo "   <$name>$val</$name>\n";
 }
 
+/**
+ * @param string $name
+ */
 function item_html($name, $val) {
     $name = tra($name);
     echo "<tr><td>$name</td><td>$val</td></tr>\n";
     //echo "<tr><td align=right>$name</td><td align=right>$val</td></tr>\n";
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_html($x) {
     page_head(tra("Project status"));
     $j = $x->jobs;
@@ -190,6 +199,9 @@ 
     page_tail();
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_xml($x) {
     xml_header();
     echo "<server_status>\n<daemon_status>\n";
@@ -239,6 +251,11 @@ 
 ";
 }
 
+/**
+ * @param string $cmd
+ * @param string $pidname
+ * @param string $host
+ */
 function local_daemon_running($cmd, $pidname, $host) {
     if (!$pidname) {
         $cmd = trim($cmd);

Spacing +9 added lines, -9 removed lines

@@ -171,7 +171,7 @@ 
         $avg = round($app->info->avg, 2);
         $min = round($app->info->min, 2);
         $max = round($app->info->max, 2);
-        $x = $max?"$avg ($min - $max)":"---";
+        $x = $max ? "$avg ($min - $max)" : "---";
         $u = $app->info->users;
         echo "<tr>
             <td>$app->user_friendly_name</td>
@@ -244,7 +244,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -285,12 +285,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -300,7 +300,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -312,14 +312,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -331,7 +331,7 @@ 
         $y = new StdClass;
         $y->cmd = "Scheduler";
         $y->host = $sched_host;
-        $y->status = !file_exists("../../stop_sched");;
+        $y->status = !file_exists("../../stop_sched"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -347,7 +347,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
         $pid = file_get_contents($path);
         if ($pid) {
             $pid = trim($pid);
-            $out = Array();
+            $out = array();
             exec("ps -ww $pid", $out);
             foreach ($out as $y) {
                 if (strstr($y, (string)$pid)) return 1;

html/user/show_coproc.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
 check_get_args(array("mode"));
 
+/**
+ * @param string $mode
+ */
 function filename($mode) {
     switch ($mode) {
     case 'host': return "cuda_hosts.dat";

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         echo $x;
         break;
     }
-    echo "</td><td align=right>".format_credit_large($y->credit),"</td><td align=right>$y->nresults</td></tr>\n";
+    echo "</td><td align=right>".format_credit_large($y->credit), "</td><td align=right>$y->nresults</td></tr>\n";
 }
 
 $mode = get_str('mode', true);