From: samhemelryk <samhemelryk>
Date: Wed, 30 Sep 2009 06:54:07 +0000 (+0000)
Subject: blocks MDL-19791 Upgrade deprecated function calls
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4cdb8d70ae0b061901647425943952b7649939fe;p=moodle.git

blocks MDL-19791 Upgrade deprecated function calls
---

diff --git a/blocks/blog_menu/block_blog_menu.php b/blocks/blog_menu/block_blog_menu.php
index 9d5e823e44..e0ffa01f66 100755
--- a/blocks/blog_menu/block_blog_menu.php
+++ b/blocks/blog_menu/block_blog_menu.php
@@ -62,7 +62,7 @@ class block_blog_menu extends block_base {
         }
 
         // don't display menu block if block is set at site level, and user is not logged in
-        if ($CFG->bloglevel < BLOG_GLOBAL_LEVEL && !(isloggedin() && !isguest())) {
+        if ($CFG->bloglevel < BLOG_GLOBAL_LEVEL && !(isloggedin() && !isguestuser())) {
             $this->content->text = get_string('blogdisable', 'blog');
             return $this->content;
         }
diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index 1099800cff..940199dce7 100644
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -37,7 +37,7 @@ class block_course_list extends block_list {
         if (empty($CFG->disablemycourses) and 
             !empty($USER->id) and 
             !(has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM)) and $adminseesall) and
-            !isguest()) {    // Just print My Courses
+            !isguestuser()) {    // Just print My Courses
             if ($courses = get_my_courses($USER->id, 'visible DESC, fullname ASC')) {
                 foreach ($courses as $course) {
                     if ($course->id == SITEID) {
@@ -119,7 +119,7 @@ class block_course_list extends block_list {
         $icon  = '<img src="'.$OUTPUT->old_icon_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
 
         // only for logged in users!
-        if (!isloggedin() || isguest()) {
+        if (!isloggedin() || isguestuser()) {
             return false;
         }
 
diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php
index 807a17df1e..1b79ae66ca 100644
--- a/blocks/global_navigation_tree/block_global_navigation_tree.php
+++ b/blocks/global_navigation_tree/block_global_navigation_tree.php
@@ -227,7 +227,7 @@ class block_global_navigation_tree extends block_tree {
         $cache = new navigation_cache('navigationhistory', 60*60);
 
         // If the user isn't logged in or is a guest we don't want to display anything
-        if (!isloggedin() || isguest()) {
+        if (!isloggedin() || isguestuser()) {
             return false;
         }
 
@@ -340,7 +340,7 @@ class block_global_navigation_tree extends block_tree {
         $cache = new navigation_cache('navigation');
 
         // If the user isn't logged in or is a guest we don't want to display anything
-        if (!isloggedin() || isguest()) {
+        if (!isloggedin() || isguestuser()) {
             return false;
         }
 
diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php
index b9c4b6dbdf..3172a10773 100644
--- a/blocks/messages/block_messages.php
+++ b/blocks/messages/block_messages.php
@@ -21,7 +21,7 @@ class block_messages extends block_base {
         $this->content->text = '';
         $this->content->footer = '';
 
-        if (empty($this->instance) or empty($USER->id) or isguest() or empty($CFG->messaging)) {
+        if (empty($this->instance) or empty($USER->id) or isguestuser() or empty($CFG->messaging)) {
             return $this->content;
         }
 
diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index 884e7a42e6..8d7bc23e88 100644
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -22,7 +22,7 @@ class block_mnet_hosts extends block_list {
         global $CFG, $USER, $DB, $OUTPUT;
 
         // only for logged in users!
-        if (!isloggedin() || isguest()) {
+        if (!isloggedin() || isguestuser()) {
             return false;
         }
 
diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php
index b130e41592..97a939ecfa 100644
--- a/blocks/online_users/block_online_users.php
+++ b/blocks/online_users/block_online_users.php
@@ -132,7 +132,7 @@ class block_online_users extends block_base {
             //Accessibility: Converted <div> to <ul>, inherit existing classes & styles.
             $this->content->text .= "<ul class='list'>\n";
             if (!empty($USER->id) && has_capability('moodle/site:sendmessage', $this->page->context)
-                           && !empty($CFG->messaging) && !isguest()) {
+                           && !empty($CFG->messaging) && !isguestuser()) {
                 $canshowicon = true;
             } else {
                 $canshowicon = false;
diff --git a/blocks/rss_client/viewfeed.php b/blocks/rss_client/viewfeed.php
index 133d46b503..1e121b0a7e 100644
--- a/blocks/rss_client/viewfeed.php
+++ b/blocks/rss_client/viewfeed.php
@@ -27,7 +27,7 @@ require_once(dirname(__FILE__) . '/../../config.php');
 require_once($CFG->libdir .'/simplepie/moodle_simplepie.php');
 
 require_login();
-if (isguest()) {
+if (isguestuser()) {
     echo_error('guestsarenotallowed');
 }