From a32a2e7237842e1844b285519b5653f08f90b886 Mon Sep 17 00:00:00 2001 From: steinm Date: Fri, 3 Dec 2010 07:22:56 +0000 Subject: [PATCH] - do not use global variable settings->_guestID anymore. Use LetoDMS_User::isGuest() instead --- op/op.AddEvent.php | 2 +- op/op.EditEvent.php | 2 +- op/op.EditUserData.php | 2 +- op/op.ManageNotify.php | 2 +- op/op.UserDefaultKeywords.php | 2 +- op/op.UsrMgr.php | 10 +++++++--- out/out.AddEvent.php | 2 +- out/out.ApprovalSummary.php | 2 +- out/out.DocumentAccess.php | 4 ++-- out/out.DocumentNotify.php | 4 ++-- out/out.EditEvent.php | 2 +- out/out.EditUserData.php | 2 +- out/out.FolderAccess.php | 4 ++-- out/out.FolderNotify.php | 4 ++-- out/out.GroupView.php | 2 +- out/out.ManageNotify.php | 2 +- out/out.MyAccount.php | 2 +- out/out.MyDocuments.php | 2 +- out/out.RemoveUser.php | 8 +++----- out/out.ReviewSummary.php | 2 +- out/out.SearchForm.php | 2 +- out/out.UserDefaultKeywords.php | 2 +- out/out.UserList.php | 2 +- out/out.UsrMgr.php | 16 ++++++++++------ out/out.UsrView.php | 4 ++-- out/out.ViewDocument.php | 2 +- 26 files changed, 48 insertions(+), 42 deletions(-) diff --git a/op/op.AddEvent.php b/op/op.AddEvent.php index 8bc9444b1..1d2311656 100644 --- a/op/op.AddEvent.php +++ b/op/op.AddEvent.php @@ -29,7 +29,7 @@ include("../inc/inc.ClassUI.php"); include("../inc/inc.Calendar.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("edit_event"),getMLText("access_denied")); } diff --git a/op/op.EditEvent.php b/op/op.EditEvent.php index 7e1ff207f..217091571 100644 --- a/op/op.EditEvent.php +++ b/op/op.EditEvent.php @@ -29,7 +29,7 @@ include("../inc/inc.ClassUI.php"); include("../inc/inc.Calendar.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("edit_event"),getMLText("access_denied")); } diff --git a/op/op.EditUserData.php b/op/op.EditUserData.php index 94ba9cbb0..804b5b647 100644 --- a/op/op.EditUserData.php +++ b/op/op.EditUserData.php @@ -25,7 +25,7 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("edit_user_details"),getMLText("access_denied")); } diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index 7c956f927..e1aa92ab5 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -25,7 +25,7 @@ include("../inc/inc.ClassUI.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("my_account"),getMLText("access_denied")); } diff --git a/op/op.UserDefaultKeywords.php b/op/op.UserDefaultKeywords.php index 88198dbac..02eeb7799 100644 --- a/op/op.UserDefaultKeywords.php +++ b/op/op.UserDefaultKeywords.php @@ -25,7 +25,7 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("edit_default_keywords"),getMLText("access_denied")); } diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index 6732a5a39..bb1517f24 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -43,13 +43,14 @@ if ($action == "adduser") { $email = sanitizeString($_POST["email"]); $comment = sanitizeString($_POST["comment"]); $isAdmin = (isset($_POST["isadmin"]) && $_POST["isadmin"]==1 ? 1 : 0); + $isGuest = (isset($_POST["isguest"]) && $_POST["isguest"]==1 ? 1 : 0); $isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0); if (is_object($dms->getUserByLogin($login))) { UI::exitError(getMLText("admin_tools"),getMLText("user_exists")); } - $newUser = $dms->addUser($login, md5($_POST["pwd"]), $name, $email, $settings->_language, $settings->_theme, $comment, $isAdmin, $isHidden); + $newUser = $dms->addUser($login, md5($_POST["pwd"]), $name, $email, $settings->_language, $settings->_theme, $comment, $isAdmin, $isGuest, $isHidden); if ($newUser) { if (isset($_FILES["userfile"]) && is_uploaded_file($_FILES["userfile"]["tmp_name"]) && $_FILES["userfile"]["size"] > 0 && $_FILES['userfile']['error']==0) @@ -106,7 +107,7 @@ else if ($action == "removeuser") { $userid = $_GET["userid"]; } - if (($userid==$settings->_adminID)||($userid==$settings->_guestID)) { + if ($userid==$settings->_adminID) { UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_admin")); } if (!isset($userid) || !is_numeric($userid) || intval($userid)<1) { @@ -114,7 +115,7 @@ else if ($action == "removeuser") { } $userToRemove = $dms->getUser($userid); - if (!is_object($userToRemove) || ($userToRemove->getID() == $settings->_adminID) || ($userToRemove->getID() == $settings->_guestID)) { + if (!is_object($userToRemove) || ($userToRemove->getID() == $settings->_adminID)) { UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id")); } @@ -148,6 +149,7 @@ else if ($action == "edituser") { $email = sanitizeString($_POST["email"]); $comment = sanitizeString($_POST["comment"]); $isAdmin = (isset($_POST["isadmin"]) && $_POST["isadmin"]==1 ? 1 : 0); + $isGuest = (isset($_POST["isguest"]) && $_POST["isguest"]==1 ? 1 : 0); $isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0); if ($editedUser->getLogin() != $login) @@ -162,6 +164,8 @@ else if ($action == "edituser") { $editedUser->setComment($comment); if ($editedUser->isAdmin() != $isAdmin) $editedUser->setAdmin($isAdmin); + if ($editedUser->isGuest() != $isGuest) + $editedUser->setGuest($isGuest); if ($editedUser->isHidden() != $isHidden) $editedUser->setHidden($isHidden); diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php index 259fa149c..a7b67a581 100644 --- a/out/out.AddEvent.php +++ b/out/out.AddEvent.php @@ -24,7 +24,7 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("edit_event"),getMLText("access_denied")); } diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index 08ed4900c..c2da3e371 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -27,7 +27,7 @@ include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); -if ($user->getID() == $settings->_guestID) { +if ($user->isGuest()) { UI::exitError(getMLText("my_documents"),getMLText("access_denied")); } diff --git a/out/out.DocumentAccess.php b/out/out.DocumentAccess.php index c3b0e50dd..73ec10153 100644 --- a/out/out.DocumentAccess.php +++ b/out/out.DocumentAccess.php @@ -93,7 +93,7 @@ if ($user->isAdmin()) { getOwner(); foreach ($allUsers as $currUser) { - if ($currUser->getID() == $settings->_guestID) + if ($currUser->isGuest()) continue; print " getID() == $settings->_guestID) { + if ($userObj->isGuest()) { continue; } print "\n"; diff --git a/out/out.DocumentNotify.php b/out/out.DocumentNotify.php index d49de6bc7..149d2f640 100644 --- a/out/out.DocumentNotify.php +++ b/out/out.DocumentNotify.php @@ -119,11 +119,11 @@ print "\n"; if ($user->isAdmin()) { $allUsers = $dms->getAllUsers(); foreach ($allUsers as $userObj) { - if ($userObj->getID() != $settings->_guestID && !in_array($userObj->getID(), $userNotifyIDs)) + if (!$userObj->isGuest() && !in_array($userObj->getID(), $userNotifyIDs)) print "