From f2d042c4c35ef7dfdc7797a950edd3055016042e Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 6 Mar 2007 10:45:49 +0000
Subject: [PATCH] MDL-8765 user preference usage cleanup

---
 blocks/admin_bookmarks/block_admin_bookmarks.php | 4 ++--
 blocks/admin_bookmarks/create.php                | 8 ++++----
 blocks/admin_bookmarks/delete.php                | 8 ++++----
 login/change_password.php                        | 2 +-
 login/change_password_form.php                   | 6 +++---
 mod/forum/discuss.php                            | 6 +-----
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php
index e177b7c1dd..ee427de847 100644
--- a/blocks/admin_bookmarks/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -36,8 +36,8 @@ class block_admin_bookmarks extends block_base {
 
         $this->content = new stdClass;
         $this->content->text = '';
-        if (isset($USER->preference['admin_bookmarks'])) {
-            $bookmarks = explode(',',$USER->preference['admin_bookmarks']);
+        if (get_user_preferences('admin_bookmarks')) {
+            $bookmarks = explode(',',get_user_preferences('admin_bookmarks'));
             // hmm... just a liiitle (potentially) processor-intensive
             // (recall that $adminroot->locate is a huge recursive call... and we're calling it repeatedly here
 
diff --git a/blocks/admin_bookmarks/create.php b/blocks/admin_bookmarks/create.php
index 1f365cea43..cf44ab0f89 100644
--- a/blocks/admin_bookmarks/create.php
+++ b/blocks/admin_bookmarks/create.php
@@ -8,8 +8,8 @@ require_login();
 
 if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey()) {
 
-    if (isset($USER->preference['admin_bookmarks'])) {
-        $bookmarks = explode(',',$USER->preference['admin_bookmarks']);
+    if (get_user_preferences('admin_bookmarks')) {
+        $bookmarks = explode(',',get_user_preferences('admin_bookmarks'));
 
         if (in_array($section, $bookmarks)) {
             error(get_string('bookmarkalreadyexists','admin'));
@@ -39,11 +39,11 @@ if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey
 
     if (is_a($temp, 'admin_settingpage')) {
 
-        redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, get_string('bookmarkadded','admin'), 1);
+        redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section);
 
     } elseif (is_a($temp, 'admin_externalpage')) {
 
-        redirect($temp->url, get_string('bookmarkadded','admin'), 1);
+        redirect($temp->url);
 
     }
 
diff --git a/blocks/admin_bookmarks/delete.php b/blocks/admin_bookmarks/delete.php
index 63875bff0f..a73a39aee1 100644
--- a/blocks/admin_bookmarks/delete.php
+++ b/blocks/admin_bookmarks/delete.php
@@ -8,9 +8,9 @@ require_login();
 
 if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey()) {
 
-    if (isset($USER->preference['admin_bookmarks'])) {
+    if (get_user_preferences('admin_bookmarks')) {
 
-        $bookmarks = explode(',', $USER->preference['admin_bookmarks']);
+        $bookmarks = explode(',', get_user_preferences('admin_bookmarks'));
 
         $key = array_search($section, $bookmarks);
 
@@ -28,9 +28,9 @@ if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey
         if (is_a($temp, 'admin_externalpage')) {
             redirect($temp->url, get_string('bookmarkdeleted','admin'));
         } elseif (is_a($temp, 'admin_settingpage')) {
-            redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section, get_string('bookmarkdeleted','admin'), 1);
+            redirect($CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=' . $section);
         } else {
-            redirect($CFG->wwwroot, get_string('bookmarkdeleted', 'admin'),1);
+            redirect($CFG->wwwroot);
         }
         die;
 
diff --git a/login/change_password.php b/login/change_password.php
index e7f78e6a58..7bf7c6b597 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -110,7 +110,7 @@
 
 
     print_header($strchangepassword, $strchangepassword, $navstr);
-    if (!empty($USER->preference['auth_forcepasswordchange'])) {
+    if (get_user_preferences('auth_forcepasswordchange')) {
         notify(get_string('forcepasswordchangenotice'));
     }
     $mform->display();
diff --git a/login/change_password_form.php b/login/change_password_form.php
index db04a154f2..92952f1136 100644
--- a/login/change_password_form.php
+++ b/login/change_password_form.php
@@ -45,10 +45,10 @@ class login_change_password_form extends moodleform {
         $mform->setType('id', PARAM_INT);
 
         // buttons
-        if (empty($USER->preference['auth_forcepasswordchange'])) {
-            $this->add_action_buttons(true);
-        } else {
+        if (get_user_preferences('auth_forcepasswordchange')) {
             $this->add_action_buttons(false);
+        } else {
+            $this->add_action_buttons(true);
         }
     }
 
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 209c41735e..369a5c0b92 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -98,11 +98,7 @@
     unset($SESSION->fromdiscussion);
 
     if ($mode) {
-        if (isguest()) {
-            $USER->preference['forum_displaymode'] = $mode;  // don't save it in database
-        } else {
-            set_user_preference('forum_displaymode', $mode);
-        }
+        set_user_preference('forum_displaymode', $mode);
     }
 
     $displaymode = get_user_preferences('forum_displaymode', $CFG->forum_displaymode);
-- 
2.39.5