X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/8ed5cf0132d45b10a72923502677333626a359e5..e346f2b32932ef80fbb98b20d786ee52091f8728:/lib/security.lib.php

diff --git a/lib/security.lib.php b/lib/security.lib.php
index 86676fb..d345e61 100644
--- a/lib/security.lib.php
+++ b/lib/security.lib.php
@@ -3,8 +3,8 @@
 require_once('mitsql.lib.php');
 
 class Login {
-	var $id, $u, $p;
-    var $info;
+	private $id, $u, $p;
+    private $info;
     function Login($u, $p=null) {
 		if (empty($u)) return;
    		$this->u = $u;
@@ -82,9 +82,9 @@ class Login {
 }
 
 class User {
-	var $userId;
-	var $info;
-	var $dblist;
+	private $userId;
+	private $info;
+	private $dblist;
     function User($userId) {
 		$this->userId = $userId;
         $sql = sprintf("SELECT User.UserId, Username, Password, Name, Email, UL, bEnabled, nBytesSoft, nBytesHard, nBytes, nDatabases, nDatabasesHard, IF(nBytes>nBytesHard,1,0) AS bOverQuota
@@ -222,7 +222,7 @@ function isLoggedIn($aLogin=null) {
         global $Login;
         $aLogin = $Login;
     }
-    return !empty($aLogin) && is_a($aLogin, 'Login') && $aLogin->canLogin();
+    return !empty($aLogin) && ($aLogin instanceof Login) && $aLogin->canLogin();
 }
 
 function isAdmin($aLogin=null) {
@@ -230,7 +230,7 @@ function isAdmin($aLogin=null) {
         global $Login;
         $aLogin = $Login;
     }
-    return !empty($aLogin) && is_a($aLogin, 'Login') && $aLogin->getUL()>=100;
+    return !empty($aLogin) && ($aLogin instanceof Login) && $aLogin->getUL()>=100;
 }
 
 function isImpersonating() {