gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- do not use global variable settings->_guestID anymore. Use

Browse Source 
LetoDMS_User::isGuest() instead
This commit is contained in:
steinm 2010-12-03 07:22:56 +00:00
parent 201cefc84f
commit a32a2e7237
26 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
op/op.AddEvent.php
View File

@ -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"));
}

2
op/op.EditEvent.php
View File

@ -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"));
}

2
op/op.EditUserData.php
View File

@ -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"));
}

2
op/op.ManageNotify.php
View File

@ -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"));
}

2
op/op.UserDefaultKeywords.php
View File

@ -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"));
}

10
op/op.UsrMgr.php
View File

@ -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);

2
out/out.AddEvent.php
View File

@ -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"));
}

2
out/out.ApprovalSummary.php
View File

@ -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"));
}

4
out/out.DocumentAccess.php
View File

@ -93,7 +93,7 @@ if ($user->isAdmin()) {
<?php
$owner = $document->getOwner();
foreach ($allUsers as $currUser) {
if ($currUser->getID() == $settings->_guestID)
if ($currUser->isGuest())
continue;
print "<option value=\"".$currUser->getID()."\"";
if ($currUser->getID() == $owner->getID())
@ -192,7 +192,7 @@ if (count($accessList["users"]) != 0 || count($accessList["groups"]) != 0) {
<option value="-1"><?php printMLText("select_one");?></option>
<?php
foreach ($allUsers as $userObj) {
if ($userObj->getID() == $settings->_guestID) {
if ($userObj->isGuest()) {
continue;
}
print "<option value=\"".$userObj->getID()."\">" . $userObj->getFullName() . "</option>\n";

4
out/out.DocumentNotify.php
View File

@ -119,11 +119,11 @@ print "</table>\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 "<option value=\"".$userObj->getID()."\">" . $userObj->getFullName() . "\n";
}
}
else if ($user->getID() != $settings->_guestID && !in_array($user->getID(), $userNotifyIDs)) {
elseif (!$user->isGuest() && !in_array($user->getID(), $userNotifyIDs)) {
print "<option value=\"".$user->getID()."\">" . $user->getFullName() . "\n";
}
?>

2
out/out.EditEvent.php
View File

@ -25,7 +25,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"));
}

2
out/out.EditUserData.php
View File

@ -26,7 +26,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"));
}

4
out/out.FolderAccess.php
View File

@ -91,7 +91,7 @@ if ($user->isAdmin()) {
<?php
$owner = $folder->getOwner();
foreach ($allUsers as $currUser) {
if ($currUser->getID() == $settings->_guestID)
if ($currUser->isGuest())
continue;
print "<option value=\"".$currUser->getID()."\"";
if ($currUser->getID() == $owner->getID())
@ -192,7 +192,7 @@ if ((count($accessList["users"]) != 0) || (count($accessList["groups"]) != 0)) {
<option value="-1"><?php printMLText("select_one");?>
<?php
foreach ($allUsers as $userObj) {
if ($userObj->getID() == $settings->_guestID) {
if ($userObj->isGuest()) {
continue;
}
print "<option value=\"".$userObj->getID()."\">" . $userObj->getFullName() . "\n";

4
out/out.FolderNotify.php
View File

@ -118,11 +118,11 @@ print "</table>\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 "<option value=\"".$userObj->getID()."\">" . $userObj->getFullName() . "\n";
}
}
else if ($user->getID() != $settings->_guestID && !in_array($user->getID(), $userNotifyIDs)) {
elseif (!$user->isGuest() && !in_array($user->getID(), $userNotifyIDs)) {
print "<option value=\"".$user->getID()."\">" . $user->getFullName() . "\n";
}
?>

2
out/out.GroupView.php
View File

@ -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("my_account"),getMLText("access_denied"));
}

2
out/out.ManageNotify.php
View File

@ -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("my_account"),getMLText("access_denied"));
}

2
out/out.MyAccount.php
View File

@ -26,7 +26,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_account"),getMLText("access_denied"));
}

2
out/out.MyDocuments.php
View File

@ -26,7 +26,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"));
}

8
out/out.RemoveUser.php
View File

@ -35,14 +35,12 @@ if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["use
}
$userid = $_GET["userid"];
$currUser = $dms->getUser($userid);
if (($userid==$settings->_adminID)||($userid==$settings->_guestID)) {
if (($userid==$settings->_adminID) || $currUser->isGuest()) {
UI::exitError(getMLText("rm_user"),getMLText("access_denied"));
}
$currUser = $dms->getUser($userid);
if (!is_object($currUser)) {
UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
}
@ -69,7 +67,7 @@ UI::contentContainerStart();
<?php
$users = $dms->getAllUsers();
foreach ($users as $currUser) {
if (($currUser->getID() == $settings->_adminID) || ($currUser->getID() == $settings->_guestID) || ($currUser->getID() == $userid) )
if (($currUser->getID() == $settings->_adminID) || $currUser->isGuest() || ($currUser->getID() == $userid) )
continue;
if (isset($_GET["userid"]) && $currUser->getID()==$_GET["userid"]) $selected=$count;

2
out/out.ReviewSummary.php
View File

@ -26,7 +26,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"));
}

2
out/out.SearchForm.php
View File

@ -112,7 +112,7 @@ UI::contentContainerStart();
$allUsers = getAllUsers();
foreach ($allUsers as $userObj)
{
if ($userObj->getID() == $settings->_guestID)
if ($userObj->isGuest())
continue;
print "<option value=\"".$userObj->getID()."\">" . $userObj->getFullName() . "\n";
}

2
out/out.UserDefaultKeywords.php
View File

@ -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"));
}

2
out/out.UserList.php
View File

@ -37,7 +37,7 @@ UI::contentContainerStart();
$users = getAllUsers();
for ($i = 0; $i < count($users); $i++) {
$currUser = $users[$i];
if ($currUser->getID() == $settings->_guestID)
if ($currUser->isGuest())
continue;
UI::contentSubHeading(getMLText("user") . ": \"" . $currUser->getFullName() . "\"");

16
out/out.UsrMgr.php
View File

@ -101,7 +101,7 @@ UI::contentContainerStart();
$selected=0;
$count=2;
foreach ($users as $currUser) {
if (($currUser->getID() == $settings->_adminID) || ($currUser->getID() == $settings->_guestID))
if (($currUser->getID() == $settings->_adminID) || $currUser->isGuest())
continue;
if (isset($_GET["userid"]) && $currUser->getID()==$_GET["userid"]) $selected=$count;
@ -168,7 +168,7 @@ UI::contentContainerStart();
<ul class="cbSelectList"><?php
foreach ($users as $usr) {
if ($usr->getID() == $settings->_guestID) continue;
if ($usr->isGuest()) continue;
print "<li class=\"cbSelectItem\"><input id='revUsr".$usr->getID()."' type='checkbox' name='usrReviewers[]' value='". $usr->getID() ."'>".$usr->getLogin();
}
@ -198,7 +198,7 @@ UI::contentContainerStart();
<?php
foreach ($users as $usr) {
if ($usr->getID() == $settings->_guestID) continue;
if ($usr->isGuest()) continue;
print "<li class=\"cbSelectItem\"><input id='appUsr".$usr->getID()."' type='checkbox' name='usrApprovers[]' value='". $usr->getID() ."'>".$usr->getLogin();
}
@ -230,7 +230,7 @@ UI::contentContainerStart();
<?php
foreach ($users as $currUser) {
if (($currUser->getID() == $settings->_adminID) || ($currUser->getID() == $settings->_guestID))
if (($currUser->getID() == $settings->_adminID) || $currUser->isGuest())
continue;
print "<td id=\"keywords".$currUser->getID()."\" style=\"display : none;\">";
@ -274,6 +274,10 @@ UI::contentContainerStart();
<td><?php printMLText("is_admin");?>:</td>
<td><input type="checkbox" name="isadmin" value="1"<?php print ($currUser->isAdmin() ? " checked='checked'" : "");?>></td>
</tr>
<tr>
<td><?php printMLText("is_guest");?>:</td>
<td><input type="checkbox" name="isguest" value="1"<?php print ($currUser->isGuest() ? " checked='checked'" : "");?>></td>
</tr>
<tr>
<td><?php printMLText("is_hidden");?>:</td>
<td><input type="checkbox" name="ishidden" value="1"<?php print ($currUser->isHidden() ? " checked='checked'" : "");?>></td>
@ -312,7 +316,7 @@ UI::contentContainerStart();
foreach ($users as $usr) {
if (($usr->getID() == $settings->_guestID) || ($usr->getID() == $currUser->getID()))
if ($usr->isGuest() || ($usr->getID() == $currUser->getID()))
continue;
$checked=false;
@ -352,7 +356,7 @@ UI::contentContainerStart();
foreach ($users as $usr) {
if (($usr->getID() == $settings->_guestID) || ($usr->getID() == $currUser->getID()))
if ($usr->isGuest() || ($usr->getID() == $currUser->getID()))
continue;
$checked=false;

4
out/out.UsrView.php
View File

@ -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("my_account"),getMLText("access_denied"));
}
@ -55,7 +55,7 @@ echo "</tr>\n</thead>\n";
foreach ($users as $currUser) {
if (($currUser->getID() == $settings->_adminID) || ($currUser->getID() == $settings->_guestID))
if (($currUser->getID() == $settings->_adminID) || $currUser->isGuest())
continue;
if ($currUser->isHidden()=="1") continue;

2
out/out.ViewDocument.php
View File

@ -491,7 +491,7 @@ if (count($links) > 0) {
}
else printMLText("empty_notify_list");
if ($user->getID() != $settings->_guestID){
if (!$user->isGuest()){
?>
<br>
<form action="../op/op.AddDocumentLink.php" name="form1">