1 files changed, 13 insertions, 35 deletions

diff --git a/includes/theme.inc b/includes/theme.inc
index 1ff536d18..6b0a97e88 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -13,9 +13,9 @@ class BaseTheme {
     global $REQUEST_URI, $user;
     $output .= "<DIV ALIGN=\"CENTER\">\n";
     $output .= "<FORM METHOD=\"post\" ACTION=\"$REQUEST_URI\">\n";
-    $output .= comment_mode(($user->id ? $user->mode : $mode));
-    $output .= comment_order(($user->id ? $user->sort : $order));
-    $output .= comment_threshold(($user->id ? $user->threshold : $threshold));
+    $output .= comment_mode(($user->uid ? $user->mode : $mode));
+    $output .= comment_order(($user->uid ? $user->sort : $order));
+    $output .= comment_threshold(($user->uid ? $user->threshold : $threshold));
     $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Update settings") ."\">\n";
     $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"". t("Add comment") ."\">\n";
     $output .= "</FORM>\n";
@@ -40,21 +40,9 @@ function theme_init() {
 function theme_account($region, $theme) {
   global $user;
 
-  if ($user->id) {
+  if ($user->uid) {
     // Display account settings:
     $content .= "<table><tr><td nowrap=\"nowrap\">\n";
-    $content .= "<a href=\"account.php?op=edit&type=information\">". t("your information") ."</a><BR>\n";
-    $content .= "<a href=\"account.php?op=edit&type=settings\">". t("your settings") ."</a><BR>\n";
-    $content .= "<a href=\"account.php?op=edit&type=blocks\">". t("your blocks") ."</a><BR>\n";
-    $content .= "<a href=\"account.php?op=view&type=comments\">". t("your comments") ."</a><BR>\n";
-    $content .= "<a href=\"account.php?op=view&type=contributions\">". t("your submissions") ."</a><BR>\n";
-    $content .= "<a href=\"account.php?op=view&type=site\">". strtr(t("your %a"), array("%a" => variable_get("site_name", "drupal"))) ."</a><BR>\n";
-    $content .= "<p />\n";
-
-    if (user_access("access administration pages")) {
-      $content .= "<a href=\"admin.php\">". strtr(t("administer %a"), array("%a" => variable_get("site_name", "drupal"))) ."</a><BR>\n";
-      $content .= "<p />\n";
-    }
 
     foreach (module_list() as $name) {
       if (module_hook($name, "link")) {
@@ -62,40 +50,30 @@ function theme_account($region, $theme) {
         foreach ($links as $link) $content .= "$link<br />\n";
       }
     }
-    if ($link) $content .= "<p />\n";
 
-    $content .= "<a href=\"account.php?op=logout\">". t("logout") ."</a>\n";
+    if (user_access("access administration pages")) {
+      $content .= "<p />\n";
+      $content .= "<a href=\"admin.php\">". strtr(t("administer %a"), array("%a" => variable_get("site_name", "drupal"))) ."</a><BR>\n";
+    }
+
     $content .= "</td></tr></table>\n";
 
     $theme->box($user->name, $content, $region);
   }
-  else {
-    $output .= "<div align=\"center\">\n";
-    $output .= " <form action=\"account.php?op=login\" method=\"post\">\n";
-    $output .= "  <b>". t("Username") .":</b><br /><input name=\"userid\" size=\"15\"><p />\n";
-    $output .= "  <b>". t("Password") .":</b><br /><input name=\"passwd\" size=\"15\" TYPE=\"password\"><br />\n";
-    $output .= "  <input type=\"submit\" value=\"". t("Login") ."\"><br />\n";
-    if (variable_get("account_register", 1)) $output .= "  <a href=\"account.php\">". t("REGISTER") ."</a>\n";
-    $output .= " </form>\n";
-    $output .= "</div>\n";
-
-    $theme->box(t("Login"), $output, $region);
-  }
 }
 
-
 function theme_blocks($region, $theme) {
   global $id, $PHP_SELF, $status, $user;
 
   switch (strrchr($PHP_SELF, "/")) {
     case "/node.php":
       if ($region != "left") {
-        if ($user->id) $node = db_fetch_object(db_query("SELECT * FROM node WHERE nid = '$id'"));
+        if ($user->uid) $node = db_fetch_object(db_query("SELECT * FROM node WHERE nid = '$id'"));
         if ($node->status == $status[queued]) theme_moderation_results($theme, $node, $region);
       }
       break;
     case "/index.php":
-      if ($user->id) $result = db_query("SELECT * FROM blocks b LEFT JOIN layout l ON b.name = l.block WHERE (b.status = 2 OR (b.status = 1 AND l.user = '$user->id'))". (($region == "left" || $region == "right") ? ($region == "left" ? " AND b.region = 0" : " AND b.region = 1") : "") ." ORDER BY weight");
+      if ($user->uid) $result = db_query("SELECT * FROM blocks b LEFT JOIN layout l ON b.name = l.block WHERE (b.status = 2 OR (b.status = 1 AND l.user = '$user->uid'))". (($region == "left" || $region == "right") ? ($region == "left" ? " AND b.region = 0" : " AND b.region = 1") : "") ." ORDER BY weight");
       else $result = db_query("SELECT * FROM blocks WHERE status = 2". (($region == "left" || $region == "right") ? ($region == "left" ? " AND region = 0" : " AND region = 1") : "") ." ORDER BY weight");
       while ($block = db_fetch_object($result)) {
         $blocks = module_invoke($block->module, "block");
@@ -109,8 +87,8 @@ function theme_moderation_results($theme, $node, $region) {
   foreach (explode(",", $node->users) as $vote) {
     if ($vote) {
       $data = explode("=", $vote);
-      $account = user_get($data[0]);
-      $output .= format_name($account->name) ." voted '$data[1]'.<br />";
+      $account = user_load(array("uid" => $data[0]));
+      $output .= format_name($account) ." voted '$data[1]'.<br />";
     }
   }