- fixed "you-have-to-logout-and-login-before-permissions-change" bug

  (reported by UnConeD)
- added "add node" link to book selection box and made it display the
  current location
- removed tabs and whitespaces from themes - done automatically

4 files changed, 8 insertions, 10 deletions

diff --git a/modules/account.module b/modules/account.module
index 236993140..71671cbd3 100644
--- a/modules/account.module
+++ b/modules/account.module
@@ -116,12 +116,12 @@ function account_edit($name) {
     $output .= "<B>Username:</B><BR>". check_output($account->userid) ."<P>\n";
     $output .= "<B>Status:</B><BR><SELECT NAME=\"edit[status]\">\n$stat</SELECT><P>\n";
     $output .= "<B>Administrator access:</B><BR><SELECT NAME=\"edit[access][]\" MULTIPLE=\"true\" SIZE=\"10\">$access</SELECT><P>\n";
-    $output .= "<B>Real name:</B><BR><INPUT NAME=\"edit[name]\" SIZE=\"55\" VALUE=\"$account->name\"><P>\n";
-    $output .= "<B>Real e-mail address:</B><BR><INPUT NAME=\"edit[real_email]\" SIZE=\"55\" VALUE=\"$account->real_email\"><P>\n";
-    $output .= "<B>Fake e-mail address:</B><BR><INPUT NAME=\"edit[fake_email]\" SIZE=\"55\" VALUE=\"$account->fake_email\"><P>\n";
-    $output .= "<B>URL of homepage:</B><BR><INPUT NAME=\"edit[url]\" SIZE=\"55\" VALUE=\"$account->url\"><P>\n";
-    $output .= "<B>Bio information:</B><BR><TEXTAREA NAME=\"edit[bio]\" COLS=\"35\" ROWS=\"5\" WRAP=\"virtual\">$account->bio</TEXTAREA><P>\n";
-    $output .= "<B>Signature:</B><BR><TEXTAREA NAME=\"edit[signature]\" COLS=\"35\" ROWS=\"5\" WRAP=\"virtual\">$account->signature</TEXTAREA><P>\n";
+    $output .= "<B>Real name:</B><BR><INPUT NAME=\"edit[name]\" SIZE=\"55\" VALUE=\"". check_textfield($account->name). "\"><P>\n";
+    $output .= "<B>Real e-mail address:</B><BR><INPUT NAME=\"edit[real_email]\" SIZE=\"55\" VALUE=\"". check_textfield($account->real_email) ."\"><P>\n";
+    $output .= "<B>Fake e-mail address:</B><BR><INPUT NAME=\"edit[fake_email]\" SIZE=\"55\" VALUE=\"". check_textfield($account->fake_email) ."\"><P>\n";
+    $output .= "<B>URL of homepage:</B><BR><INPUT NAME=\"edit[url]\" SIZE=\"55\" VALUE=\"". check_textfield($account->url) ."\"><P>\n";
+    $output .= "<B>Bio information:</B><BR><TEXTAREA NAME=\"edit[bio]\" COLS=\"35\" ROWS=\"5\" WRAP=\"virtual\">". check_textarea($account->bio) ."</TEXTAREA><P>\n";
+    $output .= "<B>Signature:</B><BR><TEXTAREA NAME=\"edit[signature]\" COLS=\"35\" ROWS=\"5\" WRAP=\"virtual\">". check_textarea($account->signature) ."</TEXTAREA><P>\n";
     $output .= "<INPUT TYPE=\"hidden\" NAME=\"name\" VALUE=\"$account->userid\">\n";
     $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"View account\">\n";
     $output .= "<INPUT TYPE=\"submit\" NAME=\"op\" VALUE=\"Save account\">\n";
diff --git a/modules/book.module b/modules/book.module
index 8009ae27e..59c1b35d4 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -80,7 +80,7 @@ function book_toc($parent = 0, $offset = 0, $toc = array()) {
   $result = db_query("SELECT n.*, b.* FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.type = 'book' AND n.status = '$status[posted]' AND b.parent = '$parent' ORDER BY b.weight");
   while ($node = db_fetch_object($result)) {
     $toc[$node->nid] = ($offset ? $offset : "") ."". ++$number .". $node->title";
-    $toc = book_toc($node->nid, ($offset ? "$offset." : "") ."$number.", $toc);
+    $toc = book_toc($node->nid, ($offset ? $offset : "") ."$number.", $toc);
   }
   return $toc;
 }
diff --git a/modules/book/book.module b/modules/book/book.module
index 8009ae27e..59c1b35d4 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -80,7 +80,7 @@ function book_toc($parent = 0, $offset = 0, $toc = array()) {
   $result = db_query("SELECT n.*, b.* FROM node n LEFT JOIN book b ON n.nid = b.nid AND n.lid = b.lid WHERE n.type = 'book' AND n.status = '$status[posted]' AND b.parent = '$parent' ORDER BY b.weight");
   while ($node = db_fetch_object($result)) {
     $toc[$node->nid] = ($offset ? $offset : "") ."". ++$number .". $node->title";
-    $toc = book_toc($node->nid, ($offset ? "$offset." : "") ."$number.", $toc);
+    $toc = book_toc($node->nid, ($offset ? $offset : "") ."$number.", $toc);
   }
   return $toc;
 }
diff --git a/modules/moderation.module b/modules/moderation.module
index 4df29e080..1faf9542d 100644
--- a/modules/moderation.module
+++ b/modules/moderation.module
@@ -99,8 +99,6 @@ function moderation_page() {
   global $id, $op, $user, $vote;
 
   if ($user->id) {
-    $user = user_load($user->userid);
-
     switch($op) {
       case "Vote";
         moderation_vote(check_input($id), check_input($vote));