BOINC / boinc

html/inc/forum.inc

Spacing +78 added lines, -78 removed lines

@@ -54,12 +54,12 @@ 
 define('THREAD_SOLVED', 1);
 
 define('AVATAR_WIDTH', 100);
-define('AVATAR_HEIGHT',100);
+define('AVATAR_HEIGHT', 100);
 
 define('ST_NEW_TIME', 1209600); //3600*24*14 - 14 days
 define('ST_NEW', 'New member');
 
-define('MAXIMUM_EDIT_TIME',3600);
+define('MAXIMUM_EDIT_TIME', 3600);
     // allow edits of forums posts up till one hour after posting.
 
 define('MAX_FORUM_LOGGING_TIME', 2419200); //3600*24*28 - 28 days
@@ -77,24 +77,24 @@ 
 define('IMAGE_HIDDEN', 'img/hidden.png');
 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
 define('IMAGE_POST', 'img/post.png');
-define('NEW_IMAGE_HEIGHT','15');
+define('NEW_IMAGE_HEIGHT', '15');
 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
-define('EMPHASIZE_IMAGE_HEIGHT','15');
+define('EMPHASIZE_IMAGE_HEIGHT', '15');
 define('FILTER_IMAGE', 'img/filtered_post.png');
-define('FILTER_IMAGE_HEIGHT','15');
+define('FILTER_IMAGE_HEIGHT', '15');
 define('RATE_POSITIVE_IMAGE', 'img/rate_positive.png');
-define('RATE_POSITIVE_IMAGE_HEIGHT','9');
+define('RATE_POSITIVE_IMAGE_HEIGHT', '9');
 define('RATE_NEGATIVE_IMAGE', 'img/rate_negative.png');
-define('RATE_NEGATIVE_IMAGE_HEIGHT','9');
+define('RATE_NEGATIVE_IMAGE_HEIGHT', '9');
 define('REPORT_POST_IMAGE', 'img/report_post.png');
-define('REPORT_POST_IMAGE_HEIGHT','9');
+define('REPORT_POST_IMAGE_HEIGHT', '9');
 
 define('SOLUTION', tra('This answered my question'));
 define('SUFFERER', tra('I also have this question'));
 define('OFF_TOPIC', tra('Off-topic'));
 
-define ('DEFAULT_LOW_RATING_THRESHOLD', -25);
-define ('DEFAULT_HIGH_RATING_THRESHOLD', 5);
+define('DEFAULT_LOW_RATING_THRESHOLD', -25);
+define('DEFAULT_HIGH_RATING_THRESHOLD', 5);
 
 // special user attributes
 //
@@ -164,15 +164,15 @@ 
 
 // Output the forum/thread title.
 //
-function show_forum_title($category, $forum, $thread, $link_thread=false) {
+function show_forum_title($category, $forum, $thread, $link_thread = false) {
     if ($category) {
         $is_helpdesk = $category->is_helpdesk;
     } else {
         $is_helpdesk = false;
     }
 
-    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
-    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
+    $where = $is_helpdesk ?tra("Questions and Answers") : tra("Message boards");
+    $top_url = $is_helpdesk ? "forum_help_desk.php" : "forum_index.php";
 
     if (!$forum && !$thread) {
         echo "<span class=\"title\">$where</span>\n";
@@ -200,7 +200,7 @@ 
     }
 }
 
-function show_team_forum_title($forum, $thread=null, $link_thread=false) {
+function show_team_forum_title($forum, $thread = null, $link_thread = false) {
     $team = BoincTeam::lookup_id($forum->category);
     echo "<span class=title>
         <a href=\"forum_index.php\">".tra("Message boards")."</a> :
@@ -233,12 +233,12 @@ 
 }
 
 function page_link($url, $page_num, $items_per_page, $text) {
-    return " <a href=\"$url&amp;start=" . $page_num*$items_per_page . "\">$text</a> ";
+    return " <a href=\"$url&amp;start=".$page_num*$items_per_page."\">$text</a> ";
 }
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -246,14 +246,14 @@ 
     $x = "";
     
     if ($nitems <= $items_per_page) return "";
-    $npages = ceil($nitems / $items_per_page);
-    $curpage = ceil($start / $items_per_page);
+    $npages = ceil($nitems/$items_per_page);
+    $curpage = ceil($start/$items_per_page);
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
-            $url, $curpage-1, $items_per_page,
+            $url, $curpage - 1, $items_per_page,
             tra("Previous")." &middot; "
         );
     }
@@ -268,8 +268,8 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
-        $page_str = (string)($i+1);
+    for ($i = $curpage - $preshow; $i <= $curpage + $postshow; $i++) {
+        $page_str = (string)($i + 1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
 
@@ -278,20 +278,20 @@ 
         } else {
             $x .= page_link($url, $i, $items_per_page, $page_str);
         }
-        if ($i == $npages-1) break;
-        if ($i == $curpage+$postshow) break;
+        if ($i == $npages - 1) break;
+        if ($i == $curpage + $postshow) break;
         $x .= " &middot; ";
     }
 
-    if ($curpage + $postshow < $npages-1) {
+    if ($curpage + $postshow < $npages - 1) {
         $x .= " . . . ";
-        $x .= page_link($url, $npages-1, $items_per_page, $npages);
+        $x .= page_link($url, $npages - 1, $items_per_page, $npages);
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages - 1) {
         $x .= page_link(
-            $url, $curpage+1, $items_per_page,
+            $url, $curpage + 1, $items_per_page,
             " &middot; ".tra("Next")
         );
     }
@@ -312,7 +312,7 @@ 
 function cleanup_title($title) {
     $x = sanitize_tags(bb2html($title));
     $x = trim($x);
-    if (strlen($x)==0) return "(no title)";
+    if (strlen($x) == 0) return "(no title)";
     else return $x;
 }
 
@@ -374,7 +374,7 @@ 
             $i = 0;
             foreach ($posts as $post) {
                 if ($post->id == $postid) {
-                    $start = $i - ($i % $num_to_show);
+                    $start = $i - ($i%$num_to_show);
                     $jump_to_post = $post;
                     break;
                 }
@@ -401,7 +401,7 @@ 
             // if jump to post, figure out what page to show
             //
             if ($jump_to_post) {
-                $start = $ibest - ($ibest % $num_to_show);
+                $start = $ibest - ($ibest%$num_to_show);
             } else {
                 $start = $default_start;
             }
@@ -509,8 +509,8 @@ 
 // Generates a table row with two cells: author and message
 //
 function show_post(
-    $post, $thread, $forum, $logged_in_user, $start=0,
-    $latest_viewed=0, $controls=FORUM_CONTROLS, $filter=true
+    $post, $thread, $forum, $logged_in_user, $start = 0,
+    $latest_viewed = 0, $controls = FORUM_CONTROLS, $filter = true
 ) {
     global $country_to_iso3166_2;
 
@@ -518,7 +518,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -539,9 +539,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -555,8 +555,8 @@ 
             if (is_moderator($logged_in_user, $forum)) {
                 $can_edit = true;
             } else if (can_reply($thread, $forum, $logged_in_user)) {
-                $time_limit = $post->timestamp+MAXIMUM_EDIT_TIME;
-                $can_edit = time()<$time_limit;
+                $time_limit = $post->timestamp + MAXIMUM_EDIT_TIME;
+                $can_edit = time() < $time_limit;
             } else {
                 $can_edit = false;
             }
@@ -566,24 +566,24 @@ 
     // Print the special user lines, if any
     //
     global $special_user_bitfield;
-    $fstatus="";
+    $fstatus = "";
     $keys = array_keys($special_user_bitfield);
     $is_posted_by_special = false;
-    for ($i=0; $i<sizeof($special_user_bitfield);$i++) {
+    for ($i = 0; $i < sizeof($special_user_bitfield); $i++) {
         if ($user->prefs && $user->prefs->privilege($keys[$i])) {
-            $fstatus.="<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
+            $fstatus .= "<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
             $is_posted_by_special = true;
         }
     }
     
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
     }
-    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
+    $class = $highlight ? ' style="border-left: 5px solid LightGreen" ' : '';
 
     // row and start of author col
     //
@@ -595,12 +595,12 @@ 
 
     echo user_links($user, 0, 30);
     echo "<br>";
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
+    if ($user->create_time > time() - ST_NEW_TIME) $fstatus .= ST_NEW."<br>";
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
-        if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
+    if (!$filter || !$ignore_poster) {
+        if ($user->prefs && $user->prefs->avatar != "" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars == false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
     }
@@ -608,14 +608,14 @@ 
     
     $url = "pm.php?action=new&amp;userid=".$user->id;
     $name = $user->name;
-    show_button_small($url, tra("Send message"), tra("Send %1 a private message",$name));
+    show_button_small($url, tra("Send message"), tra("Send %1 a private message", $name));
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
 
     if (!isset($user->nposts)) {
         $user->nposts = BoincPost::count("user=$user->id");
     }
     
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -624,8 +624,8 @@ 
         //
         //echo "ID: ".$user->id."<br>";
         if (!NO_COMPUTING) {
-            echo tra("Credit: %1", number_format($user->total_credit)) ."<br>";
-            echo tra("RAC: %1",    number_format($user->expavg_credit))."<br>";
+            echo tra("Credit: %1", number_format($user->total_credit))."<br>";
+            echo tra("RAC: %1", number_format($user->expavg_credit))."<br>";
         }
 
         // to use this feature:
@@ -654,7 +654,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -674,8 +674,8 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
-        echo "<br>" .tra(
+    if ($ignore_poster && $filter) {
+        echo "<br>".tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
             "</a>"
@@ -688,7 +688,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -730,10 +730,10 @@ 
         }
         if (($controls == FORUM_CONTROLS) && (can_reply($thread, $forum, $logged_in_user))) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;";
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "&amp;no_quote=1#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."&amp;no_quote=1#input";
             // "Reply" is used as a verb
             show_button($url, tra("Reply"), tra("Post a reply to this message"));
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."#input";
             // "Quote" is used as a verb
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
         }
@@ -755,7 +755,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -810,9 +810,9 @@ 
 
 function post_rules() {
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+      $project_rules = project_forum_post_rules();
     } else {
-      $project_rules="";
+      $project_rules = "";
     }
     return sprintf("
         <ul>
@@ -841,7 +841,7 @@ 
     );
 }
 
-function post_warning($forum=null) {
+function post_warning($forum = null) {
     $x = "<br><br>
         <table><tr><td align=left>
     ";
@@ -901,7 +901,7 @@ 
     $content = substr($content, 0, 64000);
     $content = BoincDb::escape_string($content);
     $now = time();
-    $sig = $signature?1:0;
+    $sig = $signature ? 1 : 0;
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
     if (!$id) {
         $forum_error = "Failed to add post to DB.";
@@ -921,7 +921,7 @@ 
 //
 function update_thread_timestamp($thread) {
     $posts = BoincPost::enum("thread=$thread->id and hidden=0 order by timestamp desc limit 1");
-    if (count($posts)>0) {
+    if (count($posts) > 0) {
         $post = $posts[0];
         $thread->update("timestamp=$post->timestamp");
     }
@@ -929,7 +929,7 @@ 
 
 function update_forum_timestamp($forum) {
     $threads = BoincThread::enum("forum=$forum->id and hidden=0 order by timestamp desc limit 1");
-    if (count($threads)>0) {
+    if (count($threads) > 0) {
         $thread = $threads[0];
         $forum->update("timestamp=$thread->timestamp");
     }
@@ -952,7 +952,7 @@ 
     if (is_news_forum($forum) && !$export) {
         $status = 1;
     }
-    $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
+    $id = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
     if (!$id) {
         $forum_error = "Failed to add thread to DB.";
         return null;
@@ -1080,22 +1080,22 @@ 
 // $sticky - bool (not directly passed to SQL)
 //
 function get_forum_threads(
-    $forumID, $start=-1, $nRec=-1, $sort_style=MODIFIED_NEW,
+    $forumID, $start = -1, $nRec = -1, $sort_style = MODIFIED_NEW,
     $show_hidden = 0, $sticky = 1
 ) {
     //if (! (is_numeric($forumID) && is_numeric($min) && is_numeric($nRec))) {
     //    return NULL;  // Something is wrong here.
     //}
         
-    $sql = 'forum = ' . $forumID ;
+    $sql = 'forum = '.$forumID;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $sql .= ' ORDER BY '.$stickysql.'timestamp DESC';
         break;
@@ -1148,7 +1148,7 @@ 
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case CREATE_TIME_NEW:
         $sql .= ' ORDER BY timestamp desc';
         break;
@@ -1170,7 +1170,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban"); 
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 
@@ -1257,14 +1257,14 @@ 
     // We do not tell the (ab)user how much this is -
     // no need to make it easy for them to break the system.
     //
-    if ($user->total_credit<$forum->post_min_total_credit || $user->expavg_credit<$forum->post_min_expavg_credit) {
+    if ($user->total_credit < $forum->post_min_total_credit || $user->expavg_credit < $forum->post_min_expavg_credit) {
         error_page(tra("To create a new thread in %1 you must have a certain level of average credit. This is to protect against abuse of the system.", $forum->title));
     }
 
     // If the user is posting faster than forum regulations allow
     // Tell the user to wait a while before creating any more posts
     //
-    if (time()-$user->prefs->last_post <$forum->post_min_interval) {
+    if (time() - $user->prefs->last_post < $forum->post_min_interval) {
         error_page(tra("You cannot create threads right now. Please wait before trying again. This is to protect against abuse of the system."));
     }
 }
@@ -1292,7 +1292,7 @@ 
 
 function is_moderator($user, $forum) {
     if (!$user) return false;
-    $type = $forum?$forum->parent_type:0;
+    $type = $forum ? $forum->parent_type : 0;
     switch ($type) {
     case 0:
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1330,7 +1330,7 @@ 
     $owner = BoincUser::lookup_id($thread->owner);
     if (!$owner) return;
     echo "<tr><td>\n";
-    switch($thread_forum->parent_type) {
+    switch ($thread_forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($thread_forum->category);
         show_forum_title($category, $thread_forum, $thread, true);
@@ -1340,7 +1340,7 @@ 
         break;
     }
     echo '
-        </td><td class="numbers">'.($thread->replies+1).'</td>
+        </td><td class="numbers">'.($thread->replies + 1).'</td>
         <td>'.user_links($owner).'</td>
         <td class="numbers">'.$thread->views.'</td>
         <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
@@ -1374,13 +1374,13 @@ 
 
 function subscribed_post_web_line($notify) {
     $thread = BoincThread::lookup_id($notify->opaque);
-    return tra("New posts in the thread %1","<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
+    return tra("New posts in the thread %1", "<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
 }
 
 function subscribe_rss($notify, &$title, &$msg, &$url) {
     $thread = BoincThread::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed thread");
-    $msg = tra("There are new posts in the thread '%1'",$thread->title);
+    $msg = tra("There are new posts in the thread '%1'", $thread->title);
     $url = secure_url_base()."forum_thread.php?id=$thread->id";
 }
 

html/user/submit_test.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     $f->mode = "local_staged";
     $f->source = "input";
 
-    for ($i=10; $i<20; $i++) {
+    for ($i = 10; $i < 20; $i++) {
         $job = new StdClass;
         $job->input_files = array($f);
         $job->rsc_fpops_est = $i*1e9;

html/user/submit_rpc_handler.php

Spacing +31 added lines, -31 removed lines

@@ -61,7 +61,7 @@ 
     if ($template) {
         $t = (double)$template->workunit->rsc_fpops_est;
     }
-    foreach($r->batch->job as $job) {
+    foreach ($r->batch->job as $job) {
         $y = (double)$job->rsc_fpops_est;
         if ($y) {
             $x += $y;
@@ -87,7 +87,7 @@ 
 function est_elapsed_time($r, $template) {
     // crude estimate: batch FLOPs / project FLOPS
     //
-    return batch_flop_count($r, $template) / project_flops();
+    return batch_flop_count($r, $template)/project_flops();
 }
 
 // if batch-level input template filename was given, read it;
@@ -97,9 +97,9 @@ 
 //
 function read_input_template($app, $r) {
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
     } else {
-        $path = project_dir() . "/templates/$app->name"."_in";
+        $path = project_dir()."/templates/$app->name"."_in";
     }
     if (file_exists($path)) {
         $x = simplexml_load_file($path);
@@ -144,7 +144,7 @@ 
 function validate_batch($jobs, $template) {
     $i = 0;
     $n = count($template->file_info);
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         $m = count($job->input_files);
         if ($n != $m) {
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -205,7 +205,7 @@ 
 // stage all the files
 //
 function stage_files(&$jobs) {
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         foreach ($job->input_files as $file) {
             if ($file->mode != "remote") {
                 $file->name = stage_file($file);
@@ -218,7 +218,7 @@ 
 //
 function submit_jobs(
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
-    $input_template_filename,        // batch-level; can also specify per job
+    $input_template_filename, // batch-level; can also specify per job
     $output_template_filename
 ) {
     global $input_templates, $output_templates;
@@ -227,7 +227,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -262,8 +262,8 @@ 
         $x .= "\n";
     }
 
-    $errfile = "/tmp/create_work_" . getmypid() . ".err";
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
+    $errfile = "/tmp/create_work_".getmypid().".err";
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
     if ($priority !== null) {
         $cmd .= " --priority $priority";
     }
@@ -363,7 +363,7 @@ 
 //
 function xml_get_jobs($r) {
     $jobs = array();
-    foreach($r->batch->job as $j) {
+    foreach ($r->batch->job as $j) {
         $job = new StdClass;
         $job->input_files = array();
         $job->command_line = (string)$j->command_line;
@@ -414,16 +414,16 @@ 
 //
 function logical_end_time($r, $jobs, $user, $app) {
     $total_flops = 0;
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         //print_r($job);
         if ($job->rsc_fpops_est) {
             $total_flops += $job->rsc_fpops_est;
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
         } else if ($r->batch->job_params->rsc_fpops_est) {
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
         } else {
-            $x = (double) $template->workunit->rsc_fpops_est;
+            $x = (double)$template->workunit->rsc_fpops_est;
             if ($x) {
                 $total_flops += $x;
             } else {
@@ -431,7 +431,7 @@ 
             }
         }
     }
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
     $x = exec($cmd);
     if (!is_numeric($x) || (double)$x == 0) {
         xml_error(-1, "$cmd returned $x");
@@ -508,15 +508,15 @@ 
     }
     
     $job_params = new StdClass;
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
         // could add quorum-related stuff
 
-    $input_template_filename = (string) $r->batch->input_template_filename;
-    $output_template_filename = (string) $r->batch->output_template_filename;
+    $input_template_filename = (string)$r->batch->input_template_filename;
+    $output_template_filename = (string)$r->batch->output_template_filename;
         // possibly empty
     
     submit_jobs(
@@ -604,7 +604,7 @@ 
 }
 
 function n_outfiles($wu) {
-    $path = project_dir() . "/$wu->output_template_filename";
+    $path = project_dir()."/$wu->output_template_filename";
     $r = simplexml_load_file($path);
     return count($r->file_info);
 }
@@ -811,7 +811,7 @@ 
 ";
         if ($result->server_state == 5) {   // over?
             $paths = get_outfile_paths($result);
-            foreach($paths as $path) {
+            foreach ($paths as $path) {
                 if (is_file($path)) {
                     $size = filesize($path);
                     echo "        <outfile>
@@ -855,7 +855,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -970,8 +970,8 @@ 
     }
 
     list($user, $user_submit) = authenticate_user($r, $app);
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
     if ($in === false || $out === false) {
         log_write("template file missing");
         xml_error(-1, "template file missing");
@@ -983,7 +983,7 @@ 
 
 function ping($r) {
     xml_start_tag("ping");
-    BoincDb::get();     // errors out if DB down or web disabled
+    BoincDb::get(); // errors out if DB down or web disabled
     echo "<success>1</success>
         </ping>
     ";
@@ -1050,9 +1050,9 @@ 
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
 if ($request_log) {
     $log_dir = parse_config(get_config(), "<log_dir>");
-    $request_log = $log_dir . "/" . $request_log;
+    $request_log = $log_dir."/".$request_log;
     if ($file = fopen($request_log, "a")) {
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n");
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n");
         fclose($file);
     }
 }

html/inc/keywords.inc

Spacing +60 added lines, -60 removed lines

@@ -24,71 +24,71 @@
 define('KW_CATEGORY_SCIENCE', 0);
 define('KW_CATEGORY_LOC', 1);
 
-define('KW_ASTRONOMY',      1);
-define('KW_SETI',           2);
-define('KW_PULSARS',        3);
-define('KW_GW',             4);
-define('KW_COSMOLOGY',      5);
-define('KW_PHYSICS',        6);
+define('KW_ASTRONOMY', 1);
+define('KW_SETI', 2);
+define('KW_PULSARS', 3);
+define('KW_GW', 4);
+define('KW_COSMOLOGY', 5);
+define('KW_PHYSICS', 6);
 define('KW_PARTICLE_PHYSICS', 7);
-define('KW_NANOSCIENCE',    8);
-define('KW_BIOMED',         9);
+define('KW_NANOSCIENCE', 8);
+define('KW_BIOMED', 9);
 define('KW_DRUG_DISCOVERY', 10);
-define('KW_PROTEINS',       11);
-define('KW_GENETICS',       12);
-define('KW_DISEASE',        13);
-define('KW_CANCER',         14);
-define('KW_MATH_CS',        15);
-define('KW_AI',             16);
-define('KW_OCEANIA',        17);
-define('KW_AUSTRALIA',      18);
+define('KW_PROTEINS', 11);
+define('KW_GENETICS', 12);
+define('KW_DISEASE', 13);
+define('KW_CANCER', 14);
+define('KW_MATH_CS', 15);
+define('KW_AI', 16);
+define('KW_OCEANIA', 17);
+define('KW_AUSTRALIA', 18);
 
-define('KW_EUROPE',         20);
-define('KW_GERMANY',        21);
-define('KW_ASIA',           22);
-define('KW_AMERICAS',       23);
-define('KW_US',             24);
-define('KW_UCB',            25);
-define('KW_AEI',            26);
-define('KW_CERN',           27);
-define('KW_UW',             28);
-define('KW_EARTH_SCI',      29);
-define('KW_SPAIN',          30);
-define('KW_SAN_JORGE',      31);
-define('KW_NUMBER_THEORY',  32);
-define('KW_CRYPTO',         33);
-define('KW_ENV_RESEARCH',   34);
-define('KW_CLIMATE',        35);
-define('KW_CZECH',          36);
+define('KW_EUROPE', 20);
+define('KW_GERMANY', 21);
+define('KW_ASIA', 22);
+define('KW_AMERICAS', 23);
+define('KW_US', 24);
+define('KW_UCB', 25);
+define('KW_AEI', 26);
+define('KW_CERN', 27);
+define('KW_UW', 28);
+define('KW_EARTH_SCI', 29);
+define('KW_SPAIN', 30);
+define('KW_SAN_JORGE', 31);
+define('KW_NUMBER_THEORY', 32);
+define('KW_CRYPTO', 33);
+define('KW_ENV_RESEARCH', 34);
+define('KW_CLIMATE', 35);
+define('KW_CZECH', 36);
 define('KW_CHARLES_PRAGUE', 37);
-define('KW_RECHENKRAFT',    38);
-define('KW_RHEINMAIN',      39);
-define('KW_HUNGARY',        40);
-define('KW_IRELAND',        41);
-define('KW_UC_DUBLIN',      42);
-define('KW_POLAND',         43);
-define('KW_RUSSIA',         44);
+define('KW_RECHENKRAFT', 38);
+define('KW_RHEINMAIN', 39);
+define('KW_HUNGARY', 40);
+define('KW_IRELAND', 41);
+define('KW_UC_DUBLIN', 42);
+define('KW_POLAND', 43);
+define('KW_RUSSIA', 44);
 define('KW_SW_STATE_RUSSIA', 45);
-define('KW_RAS',            46);
-define('KW_PRBB',           47);
-define('KW_UK',             48);
-define('KW_OXFORD',         49);
-define('KW_CHINA',          50);
-define('KW_U_DAYTON',       51);
-define('KW_WRIGHT_STATE',   52);
-define('KW_USC',            53);
-define('KW_FULLERTON',      54);
-define('KW_ARIZONA_STATE',  55);
-define('KW_U_ILLINOIS',     56);
-define('KW_U_WARSAW',       57);
-define('KW_RPI',            58);
-define('KW_INTERNATIONAL',  59);
-define('KW_UND',            60);
-define('KW_HOLLAND',        61);
-define('KW_CHEMISTRY',      62);
-define('KW_GAMES',          63);
-define('KW_VIRUS',          64);
-define('KW_FRANCE',         65);
+define('KW_RAS', 46);
+define('KW_PRBB', 47);
+define('KW_UK', 48);
+define('KW_OXFORD', 49);
+define('KW_CHINA', 50);
+define('KW_U_DAYTON', 51);
+define('KW_WRIGHT_STATE', 52);
+define('KW_USC', 53);
+define('KW_FULLERTON', 54);
+define('KW_ARIZONA_STATE', 55);
+define('KW_U_ILLINOIS', 56);
+define('KW_U_WARSAW', 57);
+define('KW_RPI', 58);
+define('KW_INTERNATIONAL', 59);
+define('KW_UND', 60);
+define('KW_HOLLAND', 61);
+define('KW_CHEMISTRY', 62);
+define('KW_GAMES', 63);
+define('KW_VIRUS', 64);
+define('KW_FRANCE', 65);
 
 $job_keywords = array();
 

html/inc/language_names.inc

Spacing +3 added lines, -3 removed lines

@@ -63,13 +63,13 @@ 
     global $language_names;
     $supported_languages = get_supported_languages();
     $supported_languages[] = "en";
-    $sel = $cur_lang_name?"":"selected";
+    $sel = $cur_lang_name ? "" : "selected";
     echo "
         <option $sel value=auto>Language: default
     ";
     foreach ($language_names as $lang) {
         if (!in_array($lang[0], $supported_languages)) continue;
-        $sel = ($cur_lang_name == $lang[0])?"selected":"";
+        $sel = ($cur_lang_name == $lang[0]) ? "selected" : "";
         if ($lang[0] == "en") {
             echo "<option $sel value=".$lang[0].">".$lang[1];
         } else {
@@ -81,7 +81,7 @@ 
 
 // show a menu of supported languages
 //
-function language_form($cur_lang_name=null) {
+function language_form($cur_lang_name = null) {
     echo '
         <form name="language" method="get" action="set_language.php">
         <select class="selectbox form-control" name="lang" onchange="javascript: submit()">

html/inc/bootstrap.inc

Spacing +15 added lines, -15 removed lines

@@ -141,12 +141,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     global $master_url;
@@ -214,7 +214,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary", $body_class="") {
+function panel($title, $content_func, $class = "panel-primary", $body_class = "") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -240,7 +240,7 @@ 
 // are functions that generate the top, left, and right content
 // $left_width is the width of left column in 1/12 units.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6) {
+function grid($top_func, $left_func, $right_func, $left_width = 6) {
     echo '
         <div class="container-fluid">
     ';
@@ -255,7 +255,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -273,7 +273,7 @@ 
     ';
 }
 
-function form_start($action, $method='get') {
+function form_start($action, $method = 'get') {
     echo sprintf(
         '<div class="container">
         <form class="form-horizontal" method="%s" action="%s">'
@@ -297,7 +297,7 @@ 
 define('FORM_LEFT_OFFSET', 'col-sm-offset-4');
 define('FORM_RIGHT_CLASS', 'col-sm-8');
 
-function form_input_text($label, $name, $value='', $type='text', $attrs='', $extra='') {
+function form_input_text($label, $name, $value = '', $type = 'text', $attrs = '', $extra = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -324,7 +324,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='') {
+function form_input_textarea($label, $name, $value = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s" for="%s">%s</label>
@@ -373,7 +373,7 @@ 
     );
     $n = 0;
     foreach ($items as $i) {
-        $s = ($flags && $flags[$n])?'selected':'';
+        $s = ($flags && $flags[$n]) ? 'selected' : '';
         echo '<option '.$s.' value="'.$i[0].'">'.$i[1].'</option>
         ';
         $n++;
@@ -383,7 +383,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label class="control-label %s">%s</label>
@@ -400,7 +400,7 @@ 
         }
         echo sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     echo '</div>
@@ -419,7 +419,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br>
             ',
             $name, $i[0], $checked, $i[1]
@@ -452,7 +452,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf('<button %s type="submit" class="btn btn-success">%s</button>',
@@ -461,11 +461,11 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <input type="checkbox" name="%s" %s> &nbsp; <span class="lead">%s</span>
         </div>
-        ', $name, $checked?"checked":"", $label
+        ', $name, $checked ? "checked" : "", $label
     );
 }

html/user/openid.php

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] = (version_compare(PHP_VERSION, '5.4.0') < 0 && get_magic_quotes_gpc()) ? stripslashes($value) : $value;
+            $value = $this->data['openid_'.str_replace('.', '_', $item)];
+            $params['openid.'.$item] = (version_compare(PHP_VERSION, '5.4.0') < 0 && 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;
         }