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

- moved function to admin users and groups in LetoDMS_DMS

Browse Source
This commit is contained in:
steinm 2010-11-15 12:01:21 +00:00
parent 7a750de5b4
commit 4678218f1a
115 changed files with 247 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.Authentication.php
View File

@ -49,13 +49,15 @@ $queryStr = "UPDATE tblSessions SET lastAccess = " . mktime() . " WHERE id = '"
if (!$db->getResult($queryStr))
die ("Error while updating tblSessions: " . $db->getErrorMsg());
$user = getUser($resArr["userID"]);
$user = $dms->getUser($resArr["userID"]);
if (!is_object($user)) {
setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
exit;
}
$dms->setUser($user);
$theme = $resArr["theme"];
include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";

164
inc/inc.ClassDMS.php
View File

@ -28,6 +28,8 @@
require_once("inc.ClassFolder.php");
require_once("inc.ClassDocument.php");
require_once("inc.ClassGroup.php");
require_once("inc.ClassUser.php");
/**
* Class to represent the complete document management
@ -45,6 +47,12 @@ class LetoDMS_DMS {
*/
protected $db;
/**
* @var object $user reference to currently logged in user
* @access public
*/
public $user;
/**
* @var string $contentDir location in file system where all the
* data stores are located.
@ -60,12 +68,54 @@ class LetoDMS_DMS {
*/
public $contentOffsetDir;
/**
* @var integer $guestID ID of user treated as a guest with limited
* access rights
* @access public
*/
public $guestID;
/**
* @var integer $adminID ID of user treated as an administrator with full
* access rights
* @access public
*/
public $adminID;
function __construct($db, $contentDir, $contentOffsetDir) { /* {{{ */
$this->db = $db;
$this->contentDir = $contentDir;
$this->contentOffsetDir = $contentOffsetDir;
} /* }}} */
/**
* Login as a user
*
* Checks if the given credentials are valid returns a user object.
* It also sets the property $user for later access on the currently
* logged in user
*
* @param string $username login name of user
* @param string $password password of user
*
* @return object instance of class LetoDMS_User or false
*/
function login($username, $password) { /* {{{ */
} /* }}} */
/**
* Set the logged in user
*
* If user authentication was externally done, this function can
* be used to tell the dms who is currently logged in.
*
* @param object $user
*
*/
function setUser($user) { /* {{{ */
$this->user = $user;
} /* }}} */
/**
* Return a document by its id
*
@ -297,5 +347,119 @@ class LetoDMS_DMS {
$folder->setDMS($this);
return $folder;
} /* }}} */
/**
* Return a user by its id
*
* This function retrieves a user from the database by its id.
*
* @param integer $id internal id of user
* @return object instance of LetoDMS_User or false
*/
function getUser($id) { /* {{{ */
if (!is_numeric($id))
return false;
$queryStr = "SELECT * FROM tblUsers WHERE id = " . $id;
$resArr = $this->db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false) return false;
if (count($resArr) != 1) return false;
$resArr = $resArr[0];
return new LetoDMS_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["isAdmin"], $resArr["hidden"]);
} /* }}} */
/**
* Return a user by its login
*
* This function retrieves a user from the database by its login.
*
* @param integer $login internal login of user
* @return object instance of LetoDMS_User or false
*/
function getUserByLogin($login) { /* {{{ */
$queryStr = "SELECT * FROM tblUsers WHERE login = '".$login."'";
$resArr = $this->db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false) return false;
if (count($resArr) != 1) return false;
$resArr = $resArr[0];
return new LetoDMS_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["isAdmin"], $resArr["hidden"]);
} /* }}} */
function getAllUsers() { /* {{{ */
$queryStr = "SELECT * FROM tblUsers ORDER BY login";
$resArr = $this->db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
$users = array();
for ($i = 0; $i < count($resArr); $i++)
$users[$i] = new LetoDMS_User($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr["language"])?$resArr["language"]:NULL), (isset($resArr["theme"])?$resArr["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["isAdmin"], $resArr[$i]["hidden"]);
return $users;
} /* }}} */
function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $isAdmin=0, $isHidden=0) { /* {{{ */
if (is_object($this->getUserByLogin($login))) {
return false;
}
$queryStr = "INSERT INTO tblUsers (login, pwd, fullName, email, language, theme, comment, isAdmin, hidden) VALUES ('".$login."', '".$pwd."', '".$fullName."', '".$email."', '".$language."', '".$theme."', '".$comment."', '".$isAdmin."', '".$isHidden."')";
$res = $this->db->getResult($queryStr);
if (!$res)
return false;
return $this->getUser($this->db->getInsertID());
} /* }}} */
function getGroup($id) { /* {{{ */
if (!is_numeric($id))
die ("invalid groupid");
$queryStr = "SELECT * FROM tblGroups WHERE id = " . $id;
$resArr = $this->db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
else if (count($resArr) != 1) //wenn, dann wohl eher 0 als > 1 ;-)
return false;
$resArr = $resArr[0];
return new LetoDMS_Group($resArr["id"], $resArr["name"], $resArr["comment"]);
} /* }}} */
function getGroupByName($name) { /* {{{ */
$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` WHERE `tblGroups`.`name` = '".$name."'";
$resArr = $this->db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
else if (count($resArr) != 1) //wenn, dann wohl eher 0 als > 1 ;-)
return false;
$resArr = $resArr[0];
return new LetoDMS_Group($resArr["id"], $resArr["name"], $resArr["comment"]);
} /* }}} */
function addGroup($name, $comment) { /* {{{ */
if (is_object($this->getGroupByName($name))) {
return false;
}
$queryStr = "INSERT INTO tblGroups (name, comment) VALUES ('".$name."', '" . $comment . "')";
if (!$this->db->getResult($queryStr))
return false;
return $this->getGroup($this->db->getInsertID());
} /* }}} */
}
?>

28
inc/inc.ClassDocument.php
View File

@ -435,7 +435,7 @@ class LetoDMS_Document { /* {{{ */
function getOwner() {
if (!isset($this->_owner))
$this->_owner = getUser($this->_ownerID);
$this->_owner = $this->_dms->getUser($this->_ownerID);
return $this->_owner;
}
@ -687,7 +687,7 @@ class LetoDMS_Document { /* {{{ */
return false;
if (!isset($this->_lockingUser))
$this->_lockingUser = getUser($this->_locked);
$this->_lockingUser = $this->_dms->getUser($this->_locked);
return $this->_lockingUser;
}
@ -807,7 +807,7 @@ class LetoDMS_Document { /* {{{ */
unset($this->_accessList);
// Update the notify list, if necessary.
$mode = ($isUser ? $this->getAccessMode(getUser($userOrGroupID)) : $this->getGroupAccessMode(getGroup($userOrGroupID)));
$mode = ($isUser ? $this->getAccessMode($this->_dms->getUser($userOrGroupID)) : $this->getGroupAccessMode($this->_dms->getGroup($userOrGroupID)));
if ($mode == M_NONE) {
$this->removeNotify($userOrGroupID, $isUser);
}
@ -913,9 +913,9 @@ class LetoDMS_Document { /* {{{ */
foreach ($resArr as $row)
{
if ($row["userID"] != -1)
array_push($this->_notifyList["users"], getUser($row["userID"]) );
array_push($this->_notifyList["users"], $this->_dms->getUser($row["userID"]) );
else //if ($row["groupID"] != -1)
array_push($this->_notifyList["groups"], getGroup($row["groupID"]) );
array_push($this->_notifyList["groups"], $this->_dms->getGroup($row["groupID"]) );
}
}
return $this->_notifyList;
@ -937,7 +937,7 @@ class LetoDMS_Document { /* {{{ */
//
// Verify that user / group exists.
//
$obj = ($isUser ? getUser($userOrGroupID) : getGroup($userOrGroupID));
$obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID));
if (!is_object($obj)) {
return -1;
}
@ -1071,7 +1071,7 @@ class LetoDMS_Document { /* {{{ */
//
// Verify that user / group exists.
//
$obj = ($isUser ? getUser($userOrGroupID) : getGroup($userOrGroupID));
$obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID));
if (!is_object($obj)) {
return -1;
}
@ -1200,7 +1200,7 @@ class LetoDMS_Document { /* {{{ */
foreach (array("i", "g") as $i){
if (isset($reviewers[$i])) {
foreach ($reviewers[$i] as $reviewerID) {
$reviewer=($i=="i" ?getUser($reviewerID) : getGroup($reviewerID));
$reviewer=($i=="i" ?$this->_dms->getUser($reviewerID) : $this->_dms->getGroup($reviewerID));
$res = ($i=="i" ? $docResultSet->_content->addIndReviewer($reviewer, $user, true) : $docResultSet->_content->addGrpReviewer($reviewer, $user, true));
$docResultSet->addReviewer($reviewer, $i, $res);
// If no error is returned, or if the error is just due to email
@ -1218,7 +1218,7 @@ class LetoDMS_Document { /* {{{ */
foreach (array("i", "g") as $i){
if (isset($approvers[$i])) {
foreach ($approvers[$i] as $approverID) {
$approver=($i=="i" ? getUser($approverID) : getGroup($approverID));
$approver=($i=="i" ? $this->_dms->getUser($approverID) : $this->_dms->getGroup($approverID));
$res=($i=="i" ? $docResultSet->_content->addIndApprover($approver, $user, !$pendingReview) : $docResultSet->_content->addGrpApprover($approver, $user, !$pendingReview));
$docResultSet->addApprover($approver, $i, $res);
if ($res==0 || $res=-3 || $res=-4) {
@ -1782,7 +1782,7 @@ class LetoDMS_DocumentContent { /* {{{ */
function getUser()
{
if (!isset($this->_user))
$this->_user = getUser($this->_userID);
$this->_user = $this->_document->_dms->getUser($this->_userID);
return $this->_user;
}
function getPath() { return $this->_dir . $this->_version . $this->_fileType; }
@ -1951,7 +1951,7 @@ class LetoDMS_DocumentContent { /* {{{ */
$recipients = array();
foreach ($emailList as $eID) {
$eU = getUser($eID);
$eU = $this->_document->_dms->getUser($eID);
$recipients[] = $eU;
}
$subject = "###SITENAME###: ".$this->_document->getName().", v.".$this->_version." - ".getMLText("version_deleted_email");
@ -2042,7 +2042,7 @@ class LetoDMS_DocumentContent { /* {{{ */
getMLText("comment").": ".$this->_document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$this->_document->getID()."&version=".$this->_version."\r\n";
$uu = (is_null($updateUser) ? getUser($settings->_adminID) : $updateUser);
$uu = (is_null($updateUser) ? $this->_document->_dms->getUser($settings->_adminID) : $updateUser);
$subject=mydmsDecodeString($subject);
$message=mydmsDecodeString($message);
@ -2647,7 +2647,7 @@ class LetoDMS_DocumentLink { /* {{{ */
function getUser()
{
if (!isset($this->_user))
$this->_user = LetoDMS_User::getUser($this->_userID);
$this->_user = $this->_document->_dms->getUser($this->_userID);
return $this->_user;
}
@ -2707,7 +2707,7 @@ class LetoDMS_DocumentFile { /* {{{ */
function getUser()
{
if (!isset($this->_user))
$this->_user = getUser($this->_userID);
$this->_user = $this->_dms->getUser($this->_userID);
return $this->_user;
}

12
inc/inc.ClassFolder.php
View File

@ -230,7 +230,7 @@ class LetoDMS_Folder
function getOwner()
{
if (!isset($this->_owner))
$this->_owner = getUser($this->_ownerID);
$this->_owner = $this->_dms->getUser($this->_ownerID);
return $this->_owner;
}
@ -756,7 +756,7 @@ class LetoDMS_Folder
unset($this->_accessList);
// Update the notify list, if necessary.
$mode = ($isUser ? $this->getAccessMode(getUser($userOrGroupID)) : $this->getGroupAccessMode(getGroup($userOrGroupID)));
$mode = ($isUser ? $this->getAccessMode($this->_dms->getUser($userOrGroupID)) : $this->getGroupAccessMode($this->_dms->getGroup($userOrGroupID)));
if ($mode == M_NONE) {
$this->removeNotify($userOrGroupID, $isUser);
}
@ -864,9 +864,9 @@ class LetoDMS_Folder
foreach ($resArr as $row)
{
if ($row["userID"] != -1)
array_push($this->_notifyList["users"], getUser($row["userID"]) );
array_push($this->_notifyList["users"], $this->_dms->getUser($row["userID"]) );
else //if ($row["groupID"] != -1)
array_push($this->_notifyList["groups"], getGroup($row["groupID"]) );
array_push($this->_notifyList["groups"], $this->_dms->getGroup($row["groupID"]) );
}
}
return $this->_notifyList;
@ -888,7 +888,7 @@ class LetoDMS_Folder
//
// Verify that user / group exists.
//
$obj = ($isUser ? getUser($userOrGroupID) : getGroup($userOrGroupID));
$obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID));
if (!is_object($obj)) {
return -1;
}
@ -1021,7 +1021,7 @@ class LetoDMS_Folder
//
// Verify that user / group exists.
//
$obj = ($isUser ? getUser($userOrGroupID) : getGroup($userOrGroupID));
$obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID));
if (!is_object($obj)) {
return -1;
}

59
inc/inc.ClassGroup.php
View File

@ -22,14 +22,6 @@
\**********************************************************************/
function getGroup($id) {
return LetoDMS_Group::getGroup($id);
}
function getGroupByName($name) {
return LetoDMS_Group::getGroupByName($name);
}
function getAllGroups() {
return LetoDMS_Group::getAllGroups();
}
@ -55,42 +47,6 @@ class LetoDMS_Group
$this->_comment = $comment;
}
function getGroup($id)
{
global $db;
if (!is_numeric($id))
die ("invalid groupid");
$queryStr = "SELECT * FROM tblGroups WHERE id = " . $id;
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
else if (count($resArr) != 1) //wenn, dann wohl eher 0 als > 1 ;-)
return false;
$resArr = $resArr[0];
return new LetoDMS_Group($resArr["id"], $resArr["name"], $resArr["comment"]);
}
function getGroupByName($name) {
global $db;
$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` WHERE `tblGroups`.`name` = '".$name."'";
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
else if (count($resArr) != 1) //wenn, dann wohl eher 0 als > 1 ;-)
return false;
$resArr = $resArr[0];
return new LetoDMS_Group($resArr["id"], $resArr["name"], $resArr["comment"]);
}
function getAllGroups()
{
global $db;
@ -110,21 +66,6 @@ class LetoDMS_Group
}
function addGroup($name, $comment)
{
global $db;
if (is_object(getGroupByName($name))) {
return false;
}
$queryStr = "INSERT INTO tblGroups (name, comment) VALUES ('".$name."', '" . $comment . "')";
if (!$db->getResult($queryStr))
return false;
return self::getGroup($db->getInsertID());
}
function getID() { return $this->_id; }
function getName() { return $this->_name; }

91
inc/inc.ClassUser.php
View File

@ -17,53 +17,12 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
/**********************************************************************\
| statische, User-bezogene Funktionen |
\**********************************************************************/
function getUser($id)
{
return LetoDMS_User::getUser($id);
}
function getUserByLogin($login)
{
return LetoDMS_User::getUserByLogin($login);
}
function getAllUsers()
{
global $db;
$queryStr = "SELECT * FROM tblUsers ORDER BY login";
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;
$users = array();
for ($i = 0; $i < count($resArr); $i++)
$users[$i] = new LetoDMS_User($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr["language"])?$resArr["language"]:NULL), (isset($resArr["theme"])?$resArr["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["isAdmin"], $resArr[$i]["hidden"]);
return $users;
}
function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $isAdmin=0, $isHidden=0) {
return LetoDMS_User::addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $isAdmin, $isHidden);
}
/**********************************************************************\
| User-Klasse |
\**********************************************************************/
class LetoDMS_User
{
class LetoDMS_User {
var $_id;
var $_login;
var $_pwd;
@ -88,52 +47,6 @@ class LetoDMS_User
$this->_isAdmin = $isAdmin;
$this->_isHidden = $isHidden;
}
function getUser($id) {
GLOBAL $db;
if (!is_numeric($id))
return false;
$queryStr = "SELECT * FROM tblUsers WHERE id = " . $id;
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false) return false;
if (count($resArr) != 1) return false;
$resArr = $resArr[0];
return new LetoDMS_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["isAdmin"], $resArr["hidden"]);
}
function getUserByLogin($login)
{
global $db;
$queryStr = "SELECT * FROM tblUsers WHERE login = '".$login."'";
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false) return false;
if (count($resArr) != 1) return false;
$resArr = $resArr[0];
return new LetoDMS_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["isAdmin"], $resArr["hidden"]);
}
function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $isAdmin=0, $isHidden=0) {
global $db;
if (is_object(self::getUserByLogin($login))) {
return false;
}
$queryStr = "INSERT INTO tblUsers (login, pwd, fullName, email, language, theme, comment, isAdmin, hidden) VALUES ('".$login."', '".$pwd."', '".$fullName."', '".$email."', '".$language."', '".$theme."', '".$comment."', '".$isAdmin."', '".$isHidden."')";
$res = $db->getResult($queryStr);
if (!$res)
return false;
return self::getUser($db->getInsertID());
}
function getID() { return $this->_id; }

8
inc/inc.Utils.php
View File

@ -144,12 +144,12 @@ function createVersionigFile($document)
switch ($r["type"]) {
case 0: // Reviewer is an individual.
$required = getUser($r["required"]);
$required = $dms->getUser($r["required"]);
if (!is_object($required)) $reqName = getMLText("unknown_user")." = ".$r["required"];
else $reqName = getMLText("user")." = ".$required->getFullName();
break;
case 1: // Reviewer is a group.
$required = getGroup($r["required"]);
$required = $dms->getGroup($r["required"]);
if (!is_object($required)) $reqName = getMLText("unknown_group")." = ".$r["required"];
else $reqName = getMLText("group")." = ".$required->getName();
break;
@ -178,12 +178,12 @@ function createVersionigFile($document)
switch ($r["type"]) {
case 0: // Reviewer is an individual.
$required = getUser($r["required"]);
$required = $dms->getUser($r["required"]);
if (!is_object($required)) $reqName = getMLText("unknown_user")." = ".$r["required"];
else $reqName = getMLText("user")." = ".$required->getFullName();
break;
case 1: // Reviewer is a group.
$required = getGroup($r["required"]);
$required = $dms->getGroup($r["required"]);
if (!is_object($required)) $reqName = getMLText("unknown_group")." = ".$r["required"];
else $reqName = getMLText("group")." = ".$required->getName();
break;

2
op/op.AddDocument.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.AddDocumentLink.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.AddEvent.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.AddFile.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.AddSubFolder.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

4
op/op.ApproveDocument.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -158,7 +156,7 @@ else if ($_POST["approvalType"] == "grp") {
}
else {
// Send an email notification to the document updater.
$grp = getGroup($grpStatus["required"]);
$grp = $dms->getGroup($grpStatus["required"]);
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
$message = getMLText("approval_submit_email")."\r\n";

2
op/op.CreateDump.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.CreateFolderArchive.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.CreateStatusIndex.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.CreateSubFolderIndex.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");

2
op/op.CreateVersioningFiles.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.DefaultKeywords.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassKeywords.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

8
op/op.DocumentAccess.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -84,7 +82,7 @@ if (isset($_GET["userid"])) {
$userid = -1;
}
else {
if (!is_object(getUser($_GET["userid"]))) {
if (!is_object($dms->getUser($_GET["userid"]))) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));
}
$userid = $_GET["userid"];
@ -99,7 +97,7 @@ if (isset($_GET["groupid"])) {
$groupid = -1;
}
else {
if (!is_object(getGroup($_GET["groupid"]))) {
if (!is_object($dms->getGroup($_GET["groupid"]))) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
}
$groupid = $_GET["groupid"];
@ -115,7 +113,7 @@ if ($action == "setowner") {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));
}
$newOwner = getUser($_GET["ownerid"]);
$newOwner = $dms->getUser($_GET["ownerid"]);
if (!is_object($newOwner)) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));

4
op/op.DocumentNotify.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -61,7 +59,7 @@ if (isset($_GET["groupid"]) && (!is_numeric($_GET["groupid"]) || $_GET["groupid"
$groupid = $_GET["groupid"];
if (isset($_GET["groupid"])&&$_GET["groupid"]!=-1){
$group=getGroup($groupid);
$group=$dms->getGroup($groupid);
if (!$group->isMember($user,true) && !$user->isAdmin())
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
}

2
op/op.Download.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");

2
op/op.EditComment.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.EditDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.EditEvent.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.EditFolder.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.EditUserData.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

6
op/op.FolderAccess.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -83,7 +81,7 @@ if (isset($_GET["userid"])) {
$userid = -1;
}
else {
if (!is_object(getUser($_GET["userid"]))) {
if (!is_object($dms->getUser($_GET["userid"]))) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
}
$userid = $_GET["userid"];
@ -114,7 +112,7 @@ if ($action == "setowner") {
if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
}
$newOwner = getUser($_GET["ownerid"]);
$newOwner = $dms->getUser($_GET["ownerid"]);
if (!is_object($newOwner)) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("unknown_user"));
}

4
op/op.FolderNotify.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -58,7 +56,7 @@ if (isset($_GET["groupid"]) && (!is_numeric($_GET["groupid"]) || $_GET["groupid"
$groupid = $_GET["groupid"];
if (isset($_GET["groupid"])&&$_GET["groupid"]!=-1){
$group=getGroup($groupid);
$group=$dms->getGroup($groupid);
if (!$group->isMember($user,true) && !$user->isAdmin())
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
}

20
op/op.GroupMgr.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -46,7 +44,7 @@ if ($action == "addgroup") {
$name = sanitizeString($_GET["name"]);
$comment = sanitizeString($_GET["comment"]);
if (is_object(getGroupByName($name))) {
if (is_object($dms->getGroupByName($name))) {
UI::exitError(getMLText("admin_tools"),getMLText("group_exists"));
}
@ -67,7 +65,7 @@ else if ($action == "removegroup") {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
}
$group = getGroup($_POST["groupid"]);
$group = $dms->getGroup($_POST["groupid"]);
if (!is_object($group)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
}
@ -87,7 +85,7 @@ else if ($action == "editgroup") {
}
$groupid=$_GET["groupid"];
$group = getGroup($groupid);
$group = $dms->getGroup($groupid);
if (!is_object($group)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
@ -112,7 +110,7 @@ else if ($action == "addmember") {
}
$groupid=$_POST["groupid"];
$group = getGroup($groupid);
$group = $dms->getGroup($groupid);
if (!is_object($group)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
@ -122,7 +120,7 @@ else if ($action == "addmember") {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
$newMember = getUser($_POST["userid"]);
$newMember = $dms->getUser($_POST["userid"]);
if (!is_object($newMember)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
@ -143,7 +141,7 @@ else if ($action == "rmmember") {
}
$groupid=$_GET["groupid"];
$group = getGroup($groupid);
$group = $dms->getGroup($groupid);
if (!is_object($group)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
@ -153,7 +151,7 @@ else if ($action == "rmmember") {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
$oldMember = getUser($_GET["userid"]);
$oldMember = $dms->getUser($_GET["userid"]);
if (!is_object($oldMember)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
@ -171,7 +169,7 @@ else if ($action == "tmanager") {
}
$groupid=$_GET["groupid"];
$group = getGroup($groupid);
$group = $dms->getGroup($groupid);
if (!is_object($group)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
@ -181,7 +179,7 @@ else if ($action == "tmanager") {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
$usertoedit = getUser($_GET["userid"]);
$usertoedit = $dms->getUser($_GET["userid"]);
if (!is_object($usertoedit)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}

2
op/op.LockDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

8
op/op.Login.php
View File

@ -20,10 +20,10 @@
include("../inc/inc.Settings.php");
include("../inc/inc.Utils.php");
include("../inc/inc.Language.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
function _printMessage($heading, $message) {
@ -56,7 +56,7 @@ if (get_magic_quotes_gpc()) {
$pwd = stripslashes($pwd);
}
$guestUser = getUser($settings->_guestID);
$guestUser = $dms->getUser($settings->_guestID);
if ((!isset($pwd) || strlen($pwd)==0) && ($login != $guestUser->getLogin())) {
_printMessage(getMLText("login_error_title"), "<p>".getMLText("login_error_text")."</p>\n".
"<p><a href='".$settings->_httpRoot."op/op.Logout.php'>".getMLText("back")."</a></p>\n");
@ -138,7 +138,7 @@ if (isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
if ($bind) {
// Successfully authenticated. Now check to see if the user exists within
// the database. If not, add them in, but do not add their password.
$user = getUserByLogin($login);
$user = $dms->getUserByLogin($login);
if (is_bool($user) && !$settings->_restricted) {
// Retrieve the user's LDAP information.
@ -210,7 +210,7 @@ if (is_bool($user)) {
}
$userid = $resArr["id"];
$user = getUser($userid);
$user = $dms->getUser($userid);
}

4
op/op.ManageNotify.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -43,7 +41,7 @@ function add_folder_notify($folder,$userid,$recursefolder,$recursedoc)
// include all folder's document
$documents = $folder->getDocuments();
$documents = filterAccess($documents, getUser($userid), M_READ);
$documents = filterAccess($documents, $dms->getUser($userid), M_READ);
foreach($documents as $document)
$document->addNotify($userid, true);

2
op/op.MoveDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.MoveFolder.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.OverrideContentStatus.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveArchive.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveDocument.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveDocumentFile.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveDocumentLink.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveDump.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveEvent.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.RemoveFolder.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveFolderFiles.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveLog.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.RemoveVersion.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

8
op/op.ReviewDocument.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -152,7 +150,7 @@ else if ($_POST["reviewType"] == "grp") {
}
else {
// Send an email notification to the document updater.
$grp = getGroup($grpStatus["required"]);
$grp = $dms->getGroup($grpStatus["required"]);
$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
$message = getMLText("review_submit_email")."\r\n";
@ -251,12 +249,12 @@ if ($_POST["reviewStatus"]==-1){
if ($dastat["status"] == 0) {
if ($dastat["type"] == 0) {
$approver = getUser($dastat["required"]);
$approver = $dms->getUser($dastat["required"]);
LetoDMS_Email::toIndividual($document->getOwner(), $approver, $subject, $message);
}
else if ($dastat["type"] == 1) {
$group = getGroup($dastat["required"]);
$group = $dms->getGroup($dastat["required"]);
LetoDMS_Email::toGroup($document->getOwner(), $group, $subject, $message);
}
}

4
op/op.Search.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");
@ -162,7 +160,7 @@ UI::contentHeading(getMLText("search_results"));
// document owner.
$owner = null;
if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) {
$owner = LetoDMS_getUser($_GET["ownerid"]);
$owner = $dms->getUser($_GET["ownerid"]);
if (!is_object($owner)) {
UI::contentContainer(getMLText("unknown_owner"));
UI::htmlEndPage();

2
op/op.SetExpires.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.SetReviewersApprovers.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.UnlockDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
op/op.UpdateDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassEmail.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
op/op.UserDefaultKeywords.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassKeywords.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

10
op/op.UsrMgr.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.Utils.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -50,11 +48,11 @@ if ($action == "adduser") {
$isAdmin = (isset($_POST["isadmin"]) && $_POST["isadmin"]==1 ? 1 : 0);
$isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0);
if (is_object(getUserByLogin($login))) {
if (is_object($dms->getUserByLogin($login))) {
UI::exitError(getMLText("admin_tools"),getMLText("user_exists"));
}
$newUser = 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, $isHidden);
if ($newUser) {
if (isset($_FILES["userfile"]) && is_uploaded_file($_FILES["userfile"]["tmp_name"]) && $_FILES["userfile"]["size"] > 0 && $_FILES['userfile']['error']==0)
@ -118,7 +116,7 @@ else if ($action == "removeuser") {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
$userToRemove = getUser($userid);
$userToRemove = $dms->getUser($userid);
if (!is_object($userToRemove)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
@ -140,7 +138,7 @@ else if ($action == "edituser") {
}
$userid=$_POST["userid"];
$editedUser = getUser($userid);
$editedUser = $dms->getUser($userid);
if (!is_object($editedUser)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));

2
op/op.ViewOnline.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");

2
out/out.AddDocument.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.AddEvent.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.AddFile.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.AddSubFolder.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.AdminTools.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.ApprovalSummary.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDocument.php");
include("../inc/inc.ClassFolder.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");

8
out/out.ApproveDocument.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -147,7 +145,7 @@ if ($indApprover) {
printApprovalStatusText($approvalStatus["indstatus"][0]["status"]);
print "</td>";
print "<td>".$approvalStatus["indstatus"][0]["comment"]."</td>";
$indUser = getUser($approvalStatus["indstatus"][0]["userID"]);
$indUser = $dms->getUser($approvalStatus["indstatus"][0]["userID"]);
print "<td>".$approvalStatus["indstatus"][0]["date"]." - ". $indUser->getFullname() ."</td>";
print "</tr></tbody></table><br>\n";
}
@ -185,7 +183,7 @@ else if ($grpApprover) {
printApprovalStatusText($approvalStatus["grpstatus"][0]["status"]);
print "</td>";
print "<td>".$approvalStatus["grpstatus"][0]["comment"]."</td>";
$indUser = getUser($approvalStatus["grpstatus"][0]["userID"]);
$indUser = $dms->getUser($approvalStatus["grpstatus"][0]["userID"]);
print "<td>".$approvalStatus["grpstatus"][0]["date"]." - ". $indUser->getFullname() ."</td>";
print "</tr></tbody></table><br>\n";
}
@ -194,7 +192,7 @@ else if ($grpApprover) {
foreach ($approvalStatus["grpstatus"] as $grp) {
if ($grp["status"]!=-2) {
$g=getGroup($grpStatus["required"]);
$g=$dms->getGroup($grpStatus["required"]);
if ($grp["status"] != -2) {
$grpSelectBox .= (strlen($grpSelectBox)==0 ? "": "<option value=''></option>").

2
out/out.BackupTools.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.Calendar.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.Calendar.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
out/out.DefaultKeywords.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassKeywords.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
out/out.DocumentAccess.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.DocumentChooser.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
out/out.DocumentNotify.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

14
out/out.DocumentVersionDetail.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -195,7 +193,7 @@ if (is_array($reviewStatus) && count($reviewStatus)>0) {
$required = null;
switch ($r["type"]) {
case 0: // Reviewer is an individual.
$required = getUser($r["required"]);
$required = $dms->getUser($r["required"]);
if (!is_object($required)) {
$reqName = getMLText("unknown_user")." '".$r["required"]."'";
}
@ -204,7 +202,7 @@ if (is_array($reviewStatus) && count($reviewStatus)>0) {
}
break;
case 1: // Reviewer is a group.
$required = getGroup($r["required"]);
$required = $dms->getGroup($r["required"]);
if (!is_object($required)) {
$reqName = getMLText("unknown_group")." '".$r["required"]."'";
}
@ -216,7 +214,7 @@ if (is_array($reviewStatus) && count($reviewStatus)>0) {
print "<tr>\n";
print "<td>".$reqName."</td>\n";
print "<td><ul class=\"documentDetail\"><li>".$r["date"]."</li>";
$updateUser = getUser($r["userID"]);
$updateUser = $dms->getUser($r["userID"]);
print "<li>".(is_object($updateUser) ? $updateUser->getFullName() : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
print "<td>".$r["comment"]."</td>\n";
print "<td>".getReviewStatusText($r["status"])."</td>\n";
@ -241,7 +239,7 @@ if (is_array($approvalStatus) && count($approvalStatus)>0) {
$required = null;
switch ($a["type"]) {
case 0: // Approver is an individual.
$required = getUser($a["required"]);
$required = $dms->getUser($a["required"]);
if (!is_object($required)) {
$reqName = getMLText("unknown_user")." '".$r["required"]."'";
}
@ -250,7 +248,7 @@ if (is_array($approvalStatus) && count($approvalStatus)>0) {
}
break;
case 1: // Approver is a group.
$required = getGroup($a["required"]);
$required = $dms->getGroup($a["required"]);
if (!is_object($required)) {
$reqName = getMLText("unknown_group")." '".$r["required"]."'";
}
@ -262,7 +260,7 @@ if (is_array($approvalStatus) && count($approvalStatus)>0) {
print "<tr>\n";
print "<td>".$reqName."</td>\n";
print "<td><ul class=\"documentDetail\"><li>".$a["date"]."</li>";
$updateUser = getUser($a["userID"]);
$updateUser = $dms->getUser($a["userID"]);
print "<li>".(is_object($updateUser) ? $updateUser->getFullName() : "unknown user id '".$a["userID"]."'")."</li></ul></td>";
print "<td>".$a["comment"]."</td>\n";
print "<td>".getApprovalStatusText($a["status"])."</td>\n";

2
out/out.EditComment.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.EditDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.EditEvent.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.EditFolder.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.EditUserData.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.FolderAccess.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.FolderChooser.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
out/out.FolderNotify.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.GroupMgr.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.GroupView.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.Help.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.Info.php
View File

@ -23,8 +23,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.KeywordChooser.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.ClassKeywords.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");

2
out/out.LogManagement.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.ManageNotify.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.MoveDocument.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.MoveFolder.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.MyAccount.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");

2
out/out.MyDocuments.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.Language.php");

2
out/out.OverrideContentStatus.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveArchive.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveDocument.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveDocumentFile.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveDump.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveEvent.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveFolder.php
View File

@ -21,8 +21,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

2
out/out.RemoveFolderFiles.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

4
out/out.RemoveGroup.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -39,7 +37,7 @@ if (!isset($_GET["groupid"]) || !is_numeric($_GET["groupid"]) || intval($_GET["g
UI::exitError(getMLText("rm_group"),getMLText("invalid_user_id"));
}
$groupid = $_GET["groupid"];
$currGroup = getGroup($groupid);
$currGroup = $dms->getGroup($groupid);
if (!is_object($currGroup)) {
UI::exitError(getMLText("rm_group"),getMLText("invalid_group_id"));

2
out/out.RemoveLog.php
View File

@ -20,8 +20,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

6
out/out.RemoveUser.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");
@ -46,7 +44,7 @@ if (($userid==$settings->_adminID)||($userid==$settings->_guestID)) {
UI::exitError(getMLText("rm_user"),getMLText("access_denied"));
}
$currUser = getUser($userid);
$currUser = $dms->getUser($userid);
if (!is_object($currUser)) {
UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
@ -72,7 +70,7 @@ UI::contentContainerStart();
<option value="<?php print $settings->_adminID; ?>"><?php echo getMLText("admin")?>
<?php
$users = getAllUsers();
$users = $dms->getAllUsers();
foreach ($users as $currUser) {
if (($currUser->getID() == $settings->_adminID) || ($currUser->getID() == $settings->_guestID) || ($currUser->getID() == $userid) )
continue;

2
out/out.RemoveVersion.php
View File

@ -22,8 +22,6 @@ include("../inc/inc.Settings.php");
include("../inc/inc.AccessUtils.php");
include("../inc/inc.ClassAccess.php");
include("../inc/inc.ClassDMS.php");
include("../inc/inc.ClassGroup.php");
include("../inc/inc.ClassUser.php");
include("../inc/inc.DBAccess.php");
include("../inc/inc.DBInit.php");
include("../inc/inc.FileUtils.php");

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