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

- filterAccess() and filterUsersByAccess() are now static functions in

Browse Source 
LetoDMS_DMS and inc.AccessUtils.php is included in inc.ClassDMS.php
This commit is contained in:
steinm 2010-11-22 20:42:19 +00:00
parent 10aadee937
commit a029cd22c2
109 changed files with 80 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
inc/inc.ClassDMS.php
View File

@ -16,6 +16,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
require_once("inc.AccessUtils.php");
require_once("inc.ClassFolder.php");
require_once("inc.ClassDocument.php");
require_once("inc.ClassGroup.php");
@ -96,6 +97,44 @@ class LetoDMS_DMS {
*/
public $convertFileTypes;
/**
* Filter objects out which are not accessible in a given mode by a user.
*
* @param array $objArr list of objects (either documents or folders)
* @param object $user user for which access is checked
* @param integer $minMode minimum access mode required
* @return array filtered list of objects
*/
static function filterAccess($objArr, $user, $minMode) { /* {{{ */
if (!is_array($objArr)) {
return array();
}
$newArr = array();
foreach ($objArr as $obj) {
if ($obj->getAccessMode($user) >= $minMode)
array_push($newArr, $obj);
}
return $newArr;
} /* }}} */
/**
* Filter users out which cannot access an object in a given mode.
*
* @param object $obj object that shall be accessed
* @param array $users list of users which are to check for sufficient
* access rights
* @param integer $minMode minimum access right on the object for each user
* @return array filtered list of users
*/
static function filterUsersByAccess($obj, $users, $minMode) { /* {{{ */
$newArr = array();
foreach ($users as $currUser) {
if ($obj->getAccessMode($currUser) >= $minMode)
array_push($newArr, $currUser);
}
return $newArr;
} /* }}} */
function __construct($db, $contentDir, $contentOffsetDir) { /* {{{ */
$this->db = $db;
$this->contentDir = $contentDir;

1
op/op.AddDocument.php
View File

@ -20,7 +20,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.AddDocumentLink.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.AddEvent.php
View File

@ -20,7 +20,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.AddFile.php
View File

@ -18,7 +18,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.AddSubFolder.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.ApproveDocument.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.CreateDump.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.CreateFolderArchive.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.CreateStatusIndex.php
View File

@ -19,7 +19,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.CreateSubFolderIndex.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.CreateVersioningFiles.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.DefaultKeywords.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassKeywords.php");

1
op/op.DocumentAccess.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.DocumentNotify.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.Download.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.EditComment.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.EditDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.EditEvent.php
View File

@ -20,7 +20,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.EditFolder.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

3
op/op.EditUserData.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");
@ -32,7 +31,7 @@ if ($user->getID() == $settings->_guestID) {
UI::exitError(getMLText("edit_user_details"),getMLText("access_denied"));
}
if (($user->getID() != $settings->_adminID) && ($settings->_disableSelfEdit)) {
if (!$user->isAdmin() && ($settings->_disableSelfEdit)) {
UI::exitError(getMLText("edit_user_details"),getMLText("access_denied"));
}

1
op/op.FolderAccess.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.FolderNotify.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.GroupMgr.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.LockDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

6
op/op.Login.php
View File

@ -185,6 +185,8 @@ if (is_bool($user)) {
}
$resArr = $resArr[0];
$userid = $resArr["id"];
$user = $dms->getUser($userid);
if (($resArr["id"] == $settings->_guestID) && (!$settings->_enableGuestLogin)) {
_printMessage(getMLText("login_error_title"), "<p>".getMLText("guest_login_disabled").
@ -203,14 +205,12 @@ if (is_bool($user)) {
// control admin IP address if required
// TODO: extend control to LDAP autentication
if (($resArr["id"] == $settings->_adminID) && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){
if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){
_printMessage(getMLText("login_error_title"), "<p>".getMLText("invalid_user_id").
"</p>\n<p><a href='".$settings->_httpRoot."op/op.Logout.php'>".getMLText("back")."</a></p>\n");
exit;
}
$userid = $resArr["id"];
$user = $dms->getUser($userid);
}

5
op/op.ManageNotify.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");
@ -41,7 +40,7 @@ function add_folder_notify($folder,$userid,$recursefolder,$recursedoc)
// include all folder's document
$documents = $folder->getDocuments();
$documents = filterAccess($documents, $dms->getUser($userid), M_READ);
$documents = LetoDMS_DMS::filterAccess($documents, $dms->getUser($userid), M_READ);
foreach($documents as $document)
$document->addNotify($userid, true);
@ -52,7 +51,7 @@ function add_folder_notify($folder,$userid,$recursefolder,$recursedoc)
// recurse all folder's folders
$subFolders = $folder->getSubFolders();
$subFolders = filterAccess($subFolders, getUser($userid), M_READ);
$subFolders = LetoDMS_DMS::filterAccess($subFolders, getUser($userid), M_READ);
foreach($subFolders as $subFolder)
add_folder_notify($subFolder,$userid,$recursefolder,$recursedoc);

1
op/op.MoveDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.MoveFolder.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

7
op/op.OverrideContentStatus.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
@ -89,14 +88,12 @@ if ($overrideStatus != $overallStatus["status"]) {
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
$uu = (is_null($updateUser) ? $document->_dms->getUser($settings->_adminID) : $updateUser);
$subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message);
$notifier->toList($uu, $nl["users"], $subject, $message);
$notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($uu, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message);
}
}

1
op/op.RemoveArchive.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.RemoveDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.RemoveDocumentFile.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.RemoveDocumentLink.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.RemoveDump.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.RemoveEvent.php
View File

@ -20,7 +20,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.RemoveFolder.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.RemoveFolderFiles.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.RemoveLog.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.RemoveVersion.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

13
op/op.ReviewDocument.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
@ -197,14 +196,12 @@ if ($_POST["reviewStatus"]==-1){
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
$uu = (is_null($updateUser) ? $document->_dms->getUser($settings->_adminID) : $updateUser);
$subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message);
$notifier->toList($uu, $nl["users"], $subject, $message);
$notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($uu, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message);
}
}
@ -267,14 +264,12 @@ if ($_POST["reviewStatus"]==-1){
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
$uu = (is_null($updateUser) ? $document->_dms->getUser($settings->_adminID) : $updateUser);
$subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message);
$notifier->toList($uu, $nl["users"], $subject, $message);
$notifier->toList($user, $nl["users"], $subject, $message);
foreach ($nl["groups"] as $grp) {
$notifier->toGroup($uu, $grp, $subject, $message);
$notifier->toGroup($user, $grp, $subject, $message);
}
}

1
op/op.Search.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.SetExpires.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.SetReviewersApprovers.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.UnlockDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
op/op.UpdateDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");

1
op/op.UserDefaultKeywords.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassKeywords.php");

8
op/op.UsrMgr.php
View File

@ -20,7 +20,6 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");
@ -117,11 +116,12 @@ else if ($action == "removeuser") {
}
$userToRemove = $dms->getUser($userid);
if (!is_object($userToRemove)) {
if (!is_object($userToRemove) || ($userToRemove->getID() == $settings->_adminID) || ($userToRemove->getID() == $settings->_guestID)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
if (!$userToRemove->remove($_POST["assignTo"])) {
$userToAssign = $dms->getUser($_POST["assignTo"]);
if (!$userToRemove->remove($userToAssign)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}
@ -162,7 +162,7 @@ else if ($action == "edituser") {
$editedUser->setEmail($email);
if ($editedUser->getComment() != $comment)
$editedUser->setComment($comment);
if ($editedUser->isAdmin() != $isAdmin && $editedUser->getID()!=$settings->_adminID)
if ($editedUser->isAdmin() != $isAdmin)
$editedUser->setAdmin($isAdmin);
if ($editedUser->isHidden() != $isHidden)
$editedUser->setHidden($isHidden);

1
op/op.ViewOnline.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.AddDocument.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.AddEvent.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.AddFile.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.AddSubFolder.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.AdminTools.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.ApprovalSummary.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDocument.php");
include("../inc/inc.ClassFolder.php");

1
out/out.ApproveDocument.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.BackupTools.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.Calendar.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.Calendar.php");

1
out/out.DefaultKeywords.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassKeywords.php");

1
out/out.DocumentAccess.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

9
out/out.DocumentChooser.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassUI.php");
@ -47,8 +46,8 @@ function printTree($path, $level = 0)
GLOBAL $user, $form;
$folder = $path[$level];
$subFolders = filterAccess($folder->getSubFolders(), $user, M_READ);
$documents = filterAccess($folder->getDocuments(), $user, M_READ);
$subFolders = LetoDMS_DMS::filterAccess($folder->getSubFolders(), $user, M_READ);
$documents = LetoDMS_DMS::filterAccess($folder->getDocuments(), $user, M_READ);
if ($level+1 < count($path))
$nextFolderID = $path[$level+1]->getID();
@ -79,8 +78,8 @@ function printTree($path, $level = 0)
printTree($path, $level+1);
else {
print "<li>\n";
$subFolders_ = filterAccess($subFolders[$i]->getSubFolders(), $user, M_READ);
$documents_ = filterAccess($subFolders[$i]->getDocuments(), $user, M_READ);
$subFolders_ = LetoDMS_DMS::filterAccess($subFolders[$i]->getSubFolders(), $user, M_READ);
$documents_ = LetoDMS_DMS::filterAccess($subFolders[$i]->getDocuments(), $user, M_READ);
if (count($subFolders_) + count($documents_) > 0)
print "<a href=\"out.DocumentChooser.php?form=$form&folderid=".$subFolders[$i]->getID()."\"><img class='treeicon' src=\"".getImgPath("plus.png")."\" border=0></a>";

1
out/out.DocumentNotify.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.DocumentVersionDetail.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.EditComment.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.EditDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.EditEvent.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.EditFolder.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

3
out/out.EditUserData.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");
@ -33,7 +32,7 @@ if ($user->getID() == $settings->_guestID) {
UI::exitError(getMLText("edit_user_details"),getMLText("access_denied"));
}
if (($user->getID() != $settings->_adminID) && ($settings->_disableSelfEdit)) {
if (!$user->isAmdin() && ($settings->_disableSelfEdit)) {
UI::exitError(getMLText("edit_user_details"),getMLText("access_denied"));
}

1
out/out.FolderAccess.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.FolderChooser.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassUI.php");

1
out/out.FolderNotify.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.GroupMgr.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.GroupView.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.Help.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.Info.php
View File

@ -20,7 +20,6 @@
include("../inc/inc.Version.php");
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

11
out/out.KeywordChooser.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassKeywords.php");
@ -30,7 +29,7 @@ include("../inc/inc.Language.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
$categories = getAllKeywordCategories($user->getID());
$categories = getAllKeywordCategories(array($user->getID(), $settings->_adminID));
UI::htmlStartPage(getMLText("use_default_keywords"));
@ -118,7 +117,7 @@ UI::contentContainerStart();
<?php
foreach ($categories as $category) {
$owner = $category->getOwner();
if ($owner->getID() != $settings->_adminID)
if (!$owner->isAdmin())
continue;
print "<option value=\"".$category->getID()."\">" . $category->getName();
@ -130,7 +129,7 @@ UI::contentContainerStart();
<?php
foreach ($categories as $category) {
$owner = $category->getOwner();
if ($owner->getID() != $settings->_adminID)
if (!$owner->isAdmin())
continue;
?>
<tr id="keywords<?php echo $category->getID()?>" style="display : none;">
@ -162,7 +161,7 @@ UI::contentContainerStart();
<?php
foreach ($categories as $category) {
$owner = $category->getOwner();
if ($owner->getID() == $settings->_adminID)
if ($owner->isAdmin())
continue;
print "<option value=\"".$category->getID()."\">" . $category->getName();
@ -174,7 +173,7 @@ UI::contentContainerStart();
<?php
foreach ($categories as $category) {
$owner = $category->getOwner();
if ($owner->getID() == $settings->_adminID)
if ($owner->isAdmin())
continue;
?>
<tr id="keywords<?php echo $category->getID()?>" style="display : none;">

1
out/out.LogManagement.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.ManageNotify.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.MoveDocument.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.MoveFolder.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.MyAccount.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.MyDocuments.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.OverrideContentStatus.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveArchive.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveDocument.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveDocumentFile.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveDump.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveEvent.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveFolder.php
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveFolderFiles.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveGroup.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveLog.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveUser.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.RemoveVersion.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.ReviewDocument.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.ReviewSummary.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.SearchForm.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.SetExpires.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.SetReviewersApprovers.php
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

1
out/out.Statistic.php
View File

@ -17,7 +17,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");

Some files were not shown because too many files have changed in this diff Show More