Merge pull request #6626 from BOINC/dpa_web30

web: minor changes

Author: AenBleidd

html/inc/forum_db.inc

@@ -155,22 +155,20 @@ class BoincForumPrefs {
         } else {
             $prefs = self::lookup_userid($user->id);
             if (!$prefs) {
-                $db = BoincDb::get();
-                // is DB readonly? (shouldn't ever happen)
-                if ($db->dbnum) {
-                    return;
-                }
-                self::insert("(userid, last_post, forum_sorting, thread_sorting, rated_posts, ignorelist, pm_notification) values ($user->id, 0, 0, 8, '', '', 0)");
+                self::insert(
+                    sprintf(
+                        "(userid, last_post, forum_sorting, thread_sorting, rated_posts, ignorelist, pm_notification) values (%d, 0, 0, %d, '', '', 0)",
+                        $user->id, CREATE_TIME_OLD
+                    )
+                );
                 $prefs = self::lookup_userid($user->id);
-                $prefs->userid = $user->id;
-                $prefs->thread_sorting = 6;
             }
             self::$cache[$user->id] = $prefs;
         }
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+         return (substr($this->special_user, $specialbit, 1) == '1');
     }
     function update($clause) {
         $db = BoincDb::get();

html/inc/util.inc

@@ -916,11 +916,11 @@ function button_style($color='green', $font_size=null) {
     if ($font_size) {
         $fs = sprintf('; font-size:%dpx', $font_size);
     }
-    $c = 'seagreen';
-    if ($color == 'blue') $c = 'steelblue';
+    if ($color == 'green') $color = 'seagreen';
+    if ($color == 'blue') $color = 'steelblue';
     return sprintf(
         'style="background-color:%s; color:white; text-decoration:none%s"',
-        $c, $fs
+        $color, $fs
     );
 }
 // Show a link formatted to look like a button.

html/user/download_software.php

@@ -127,8 +127,8 @@ function download_button($v, $project_id, $token, $user) {
         <input type=hidden name=token value="%s">
         <input type=hidden name=user_id value="%d">
         <input type=hidden name=filename value="%s">
-        <button class="btn" %s>
-        <font size=+1><u>Download BOINC</u></font>
+        <button %s class="btn">
+        <font size=2><u>Download BOINC</u></font>
         <br>for %s (%s MB)
         <br>BOINC %s</button>
         </form>
@@ -137,7 +137,7 @@ function download_button($v, $project_id, $token, $user) {
         $token,
         $user->id,
         (string)$v->filename,
-        button_style('green', 14),
+        button_style(),
         (string)$v->platform,
         (string)$v->size_mb,
         (string)$v->version_num

html/user/edit_forum_preferences_form.php

@@ -196,12 +196,21 @@
 row1(tra("Update"));
 row2(
     tra("Click here to update preferences"),
-    "<input class=\"btn btn-success\" type=submit value=\"".tra("Update")."\">"
+    sprintf('<input %s class="btn" type=submit value="%s">',
+        button_style(),
+        tra("Update")
+    )
 );
 echo "</form>\n";
 row1(tra("Reset"));
 row2(tra("Or click here to reset preferences to the defaults"),
-    "<form method=\"post\" action=\"edit_forum_preferences_action.php\"><input class=\"btn btn-warning\" type=\"submit\" value=\"".tra("Reset")."\"><input type=\"hidden\" name=\"action\" value=\"reset_confirm\"></form>"
+    sprintf('<form method="post" action="edit_forum_preferences_action.php">
+        <input %s class="btn" type="submit" value="%s">
+        <input type="hidden" name="action" value="reset_confirm">
+        </form>',
+        button_style('darkgoldenrod'),
+        tra("Reset")
+    )
 );
 end_table();
 page_tail();