Ticket #258: 080227_check_banned_user.diff

a/lib/elgglib.php

@@ -3406 +3406 @@
-            }
-            
-            /*** TODO: Create Proper Abstraction Interface - don't use file binding -- ugh ***/
-user_flag_get("banned",$USER->ident
+check_banned(
-                $USER = init_user_var($USER);
-                return true;
-            } else {
-                global $CFG;
-
-                // Seek and destroy user data!!!
-                $_SESSION = array();
-                session_destroy();
-
-                // Destroy cookie! yummie yummie
-                setcookie(session_name(), '', time()-84600, $CFG->cookiepath);
-
-                // Clear magic code
-                setcookie(AUTH_COOKIE, '', time()-84600, $CFG->cookiepath);
-
-                // Now becomes into guest
-                $USER = fill_legacy_user_session();
-
-                // For human deception... :D
-                $_SESSION['messages'][] = __gettext('You have been banned from the system!');
-            }
-        }
-    }
+}
+
+/**
+ * Check if current user is banned
+ */
+function check_banned() {
+    global $CFG, $USER;
+
+    static $banned;
+
+    if (!isset($banned) && user_flag_get("banned",$USER->ident)) {
+        // Seek and destroy user data!!!
+        $_SESSION = array();
+        session_destroy();
+
+        // Destroy cookie! yummie yummie
+        setcookie(session_name(), '', time()-84600, $CFG->cookiepath);
+
+        // Clear magic code
+        setcookie(AUTH_COOKIE, '', time()-84600, $CFG->cookiepath);
+
+        // Now becomes into guest
+        $USER = fill_legacy_user_session();
+
+        // For human deception... :D
+        $_SESSION['messages'][] = __gettext('You have been banned from the system!');
+
+        $banned = true;
+    }
+
+    return $banned;
-}
-
-/**
@@ -3549 +3562 @@
-    if (empty($USER->ident) && empty($USER->loggedin)) {
-        cookied_login();
-    }
-
+
+
+
+
+
+
+
+
-}
-
-/**