diff --git a/CHANGELOG b/CHANGELOG index 8df024bc9..317548493 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,12 @@ --------------------------------------------------------------------------------- - Changes in version 2.0.1 +-------------------------------------------------------------------------------- + Changes in version 3.0.0 +-------------------------------------------------------------------------------- +Major reorganisation of code + +Split LetoDMS into a core module, webdav server, and the known web application + +-------------------------------------------------------------------------------- + Changes in version 2.0.1 -------------------------------------------------------------------------------- ADDED A GRAPHIC LOGO diff --git a/LetoDMS.php b/LetoDMS_Core.php similarity index 68% rename from LetoDMS.php rename to LetoDMS_Core.php index 40e4e8e1d..3b21f51b9 100644 --- a/LetoDMS.php +++ b/LetoDMS_Core.php @@ -19,56 +19,56 @@ /** * @uses LetoDMS_DatabaseAccess */ -require_once('inc/inc.DBAccess.php'); +require_once('LetoDMS_Core/inc.DBAccess.php'); /** * @uses LetoDMS_DMS */ -require_once('inc/inc.ClassDMS.php'); +require_once('LetoDMS_Core/inc.ClassDMS.php'); /** * @uses LetoDMS_Folder */ -require_once('inc/inc.ClassFolder.php'); +require_once('LetoDMS_Core/inc.ClassFolder.php'); /** * @uses LetoDMS_Document */ -require_once('inc/inc.ClassDocument.php'); +require_once('LetoDMS_Core/inc.ClassDocument.php'); /** * @uses LetoDMS_Group */ -require_once('inc/inc.ClassGroup.php'); +require_once('LetoDMS_Core/inc.ClassGroup.php'); /** * @uses LetoDMS_User */ -require_once('inc/inc.ClassUser.php'); +require_once('LetoDMS_Core/inc.ClassUser.php'); /** * @uses LetoDMS_KeywordCategory */ -require_once('inc/inc.ClassKeywords.php'); +require_once('LetoDMS_Core/inc.ClassKeywords.php'); /** * @uses LetoDMS_Notification */ -require_once('inc/inc.ClassNotification.php'); +require_once('LetoDMS_Core/inc.ClassNotification.php'); /** * @uses LetoDMS_UserAccess * @uses LetoDMS_GroupAccess */ -require_once('inc/inc.ClassAccess.php'); +require_once('LetoDMS_Core/inc.ClassAccess.php'); /** */ -require_once('inc/inc.AccessUtils.php'); +require_once('LetoDMS_Core/inc.AccessUtils.php'); /** * @uses LetoDMS_File */ -require_once('inc/inc.FileUtils.php'); +require_once('LetoDMS_Core/inc.FileUtils.php'); ?> diff --git a/inc/inc.AccessUtils.php b/LetoDMS_Core/inc.AccessUtils.php similarity index 91% rename from inc/inc.AccessUtils.php rename to LetoDMS_Core/inc.AccessUtils.php index 17be9e9f4..179751a85 100644 --- a/inc/inc.AccessUtils.php +++ b/LetoDMS_Core/inc.AccessUtils.php @@ -14,7 +14,7 @@ /** * Used to indicate that a search should return all - * results in the ACL table. See {@link LetoDMS_Folder::getAccessList()} + * results in the ACL table. See {@link LetoDMS_Core_Folder::getAccessList()} */ define("M_ANY", -1); diff --git a/inc/inc.ClassAccess.php b/LetoDMS_Core/inc.ClassAccess.php similarity index 86% rename from inc/inc.ClassAccess.php rename to LetoDMS_Core/inc.ClassAccess.php index 9b32e723b..a96bfd598 100644 --- a/inc/inc.ClassAccess.php +++ b/LetoDMS_Core/inc.ClassAccess.php @@ -23,11 +23,11 @@ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_UserAccess { /* {{{ */ +class LetoDMS_Core_UserAccess { /* {{{ */ var $_user; var $_mode; - function LetoDMS_UserAccess($user, $mode) { + function LetoDMS_Core_UserAccess($user, $mode) { $this->_user = $user; $this->_mode = $mode; } @@ -52,11 +52,11 @@ class LetoDMS_UserAccess { /* {{{ */ * @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_GroupAccess { /* {{{ */ +class LetoDMS_Core_GroupAccess { /* {{{ */ var $_group; var $_mode; - function LetoDMS_GroupAccess($group, $mode) { + function LetoDMS_Core_GroupAccess($group, $mode) { $this->_group = $group; $this->_mode = $mode; } diff --git a/inc/inc.ClassDMS.php b/LetoDMS_Core/inc.ClassDMS.php similarity index 86% rename from inc/inc.ClassDMS.php rename to LetoDMS_Core/inc.ClassDMS.php index e7057f4f6..61fab70be 100644 --- a/inc/inc.ClassDMS.php +++ b/LetoDMS_Core/inc.ClassDMS.php @@ -28,7 +28,7 @@ require_once("inc.ClassNotification.php"); /** * Class to represent the complete document management system. * This class is needed to do most of the dms operations. It needs - * an instance of {@link LetoDMS_DatabaseAccess} to access the + * an instance of {@link LetoDMS_Core_DatabaseAccess} to access the * underlying database. Many methods are factory functions which create * objects representing the entities in the dms, like folders, documents, * users, or groups. @@ -39,12 +39,12 @@ require_once("inc.ClassNotification.php"); * * This class does not enforce any access rights on documents and folders * by design. It is up to the calling application to use the methods - * {@link LetoDMS_Folder::getAccessMode} and - * {@link LetoDMS_Document::getAccessMode} and interpret them as desired. + * {@link LetoDMS_Core_Folder::getAccessMode} and + * {@link LetoDMS_Core_Document::getAccessMode} and interpret them as desired. * Though, there are two convinient functions to filter a list of * documents/folders for which users have access rights for. See - * {@link LetoDMS_DMS::filterAccess} - * and {@link LetoDMS_DMS::filterUsersByAccess} + * {@link LetoDMS_Core_DMS::filterAccess} + * and {@link LetoDMS_Core_DMS::filterUsersByAccess} * * Though, this class has two methods to set the currently logged in user * ({@link setUser} and {@link login}), none of them need to be called, because @@ -54,9 +54,9 @@ require_once("inc.ClassNotification.php"); * * connect() or die ("Could not connect to db-server"); - * $dms = new LetoDMS_DMS($db, $contentDir); + * $dms = new LetoDMS_Core_DMS($db, $contentDir); * $dms->setRootFolderID(1); * ... * ?> @@ -69,17 +69,17 @@ require_once("inc.ClassNotification.php"); * @copyright Copyright (C) 2010, Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_DMS { +class LetoDMS_Core_DMS { /** * @var object $db reference to database object. This must be an instance - * of {@link LetoDMS_DatabaseAccess}. + * of {@link LetoDMS_Core_DatabaseAccess}. * @access protected */ protected $db; /** * @var object $user reference to currently logged in user. This must be - * an instance of {@link LetoDMS_User}. This variable is currently not + * an instance of {@link LetoDMS_Core_User}. This variable is currently not * used. It is set by {@link setUser}. * @access private */ @@ -162,7 +162,7 @@ class LetoDMS_DMS { * @param object $db object to access the underlying database * @param string $contentDir path in filesystem containing the data store * all document contents is stored - * @return object instance of LetoDMS_DMS + * @return object instance of LetoDMS_Core_DMS */ function __construct($db, $contentDir) { /* {{{ */ $this->db = $db; @@ -183,7 +183,7 @@ class LetoDMS_DMS { /** * Set id of root folder * This function must be called right after creating an instance of - * LetoDMS_DMS + * LetoDMS_Core_DMS * * @param interger $id id of root folder */ @@ -228,7 +228,7 @@ class LetoDMS_DMS { * @param string $username login name of user * @param string $password password of user * - * @return object instance of class LetoDMS_User or false + * @return object instance of class LetoDMS_Core_User or false */ function login($username, $password) { /* {{{ */ } /* }}} */ @@ -252,7 +252,7 @@ class LetoDMS_DMS { * This function retrieves a document from the database by its id. * * @param integer $id internal id of document - * @return object instance of LetoDMS_Document or false + * @return object instance of LetoDMS_Core_Document or false */ function getDocument($id) { /* {{{ */ if (!is_numeric($id)) return false; @@ -277,7 +277,7 @@ class LetoDMS_DMS { $lock = $lockArr[0]["userID"]; } - $document = new LetoDMS_Document($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $lock, $resArr["keywords"], $resArr["sequence"]); + $document = new LetoDMS_Core_Document($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $lock, $resArr["keywords"], $resArr["sequence"]); $document->setDMS($this); return $document; } /* }}} */ @@ -300,7 +300,7 @@ class LetoDMS_DMS { $documents = array(); foreach ($resArr as $row) { - $document = new LetoDMS_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]); + $document = new LetoDMS_Core_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]); $document->setDMS($this); $documents[] = $document; } @@ -336,7 +336,7 @@ class LetoDMS_DMS { return false; $row = $resArr[0]; - $document = new LetoDMS_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]); + $document = new LetoDMS_Core_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]); $document->setDMS($this); return $document; } /* }}} */ @@ -499,7 +499,7 @@ class LetoDMS_DMS { foreach ($resArr as $docArr) { - $document = new LetoDMS_Document( + $document = new LetoDMS_Core_Document( $docArr["id"], $docArr["name"], $docArr["comment"], $docArr["date"], $docArr["expires"], $docArr["owner"], @@ -518,7 +518,7 @@ class LetoDMS_DMS { * This function retrieves a folder from the database by its id. * * @param integer $id internal id of folder - * @return object instance of LetoDMS_Folder or false + * @return object instance of LetoDMS_Core_Folder or false */ function getFolder($id) { /* {{{ */ if (!is_numeric($id)) return false; @@ -532,7 +532,7 @@ class LetoDMS_DMS { return false; $resArr = $resArr[0]; - $folder = new LetoDMS_Folder($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]); + $folder = new LetoDMS_Core_Folder($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]); $folder->setDMS($this); return $folder; } /* }}} */ @@ -565,7 +565,7 @@ class LetoDMS_DMS { return false; $resArr = $resArr[0]; - $folder = new LetoDMS_Folder($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]); + $folder = new LetoDMS_Core_Folder($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]); $folder->setDMS($this); return $folder; } /* }}} */ @@ -576,7 +576,7 @@ class LetoDMS_DMS { * 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 + * @return object instance of LetoDMS_Core_User or false */ function getUser($id) { /* {{{ */ if (!is_numeric($id)) @@ -590,7 +590,7 @@ class LetoDMS_DMS { $resArr = $resArr[0]; - $user = new LetoDMS_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["role"], $resArr["hidden"]); + $user = new LetoDMS_Core_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["role"], $resArr["hidden"]); $user->setDMS($this); return $user; } /* }}} */ @@ -601,7 +601,7 @@ class LetoDMS_DMS { * 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 + * @return object instance of LetoDMS_Core_User or false */ function getUserByLogin($login) { /* {{{ */ $queryStr = "SELECT * FROM tblUsers WHERE login = '".$login."'"; @@ -612,7 +612,7 @@ class LetoDMS_DMS { $resArr = $resArr[0]; - $user = new LetoDMS_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["role"], $resArr["hidden"]); + $user = new LetoDMS_Core_User($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["role"], $resArr["hidden"]); $user->setDMS($this); return $user; } /* }}} */ @@ -620,7 +620,7 @@ class LetoDMS_DMS { /** * Return list of all users * - * @return array of instances of LetoDMS_User or false + * @return array of instances of LetoDMS_Core_User or false */ function getAllUsers() { /* {{{ */ $queryStr = "SELECT * FROM tblUsers ORDER BY login"; @@ -632,7 +632,7 @@ class LetoDMS_DMS { $users = array(); for ($i = 0; $i < count($resArr); $i++) { - $user = 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]["role"], $resArr[$i]["hidden"]); + $user = new LetoDMS_Core_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]["role"], $resArr[$i]["hidden"]); $user->setDMS($this); $users[$i] = $user; } @@ -651,7 +651,7 @@ class LetoDMS_DMS { * @param integer $role role of new user (can be 0=normal, 1=admin, 2=guest) * @param integer $isHidden hide user in all lists, if this is set login * is still allowed - * @return object of LetoDMS_User + * @return object of LetoDMS_Core_User */ function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $role=0, $isHidden=0) { /* {{{ */ if (is_object($this->getUserByLogin($login))) { @@ -685,7 +685,7 @@ class LetoDMS_DMS { $resArr = $resArr[0]; - $group = new LetoDMS_Group($resArr["id"], $resArr["name"], $resArr["comment"]); + $group = new LetoDMS_Core_Group($resArr["id"], $resArr["name"], $resArr["comment"]); $group->setDMS($this); return $group; } /* }}} */ @@ -707,7 +707,7 @@ class LetoDMS_DMS { $resArr = $resArr[0]; - $group = new LetoDMS_Group($resArr["id"], $resArr["name"], $resArr["comment"]); + $group = new LetoDMS_Core_Group($resArr["id"], $resArr["name"], $resArr["comment"]); $group->setDMS($this); return $group; } /* }}} */ @@ -715,7 +715,7 @@ class LetoDMS_DMS { /** * Get a list of all groups * - * @return array array of instances of {@link LetoDMS_Group} + * @return array array of instances of {@link LetoDMS_Core_Group} */ function getAllGroups() { /* {{{ */ $queryStr = "SELECT * FROM tblGroups ORDER BY name"; @@ -728,7 +728,7 @@ class LetoDMS_DMS { for ($i = 0; $i < count($resArr); $i++) { - $group = new LetoDMS_Group($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["comment"]); + $group = new LetoDMS_Core_Group($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["comment"]); $group->setDMS($this); $groups[$i] = $group; } @@ -741,7 +741,7 @@ class LetoDMS_DMS { * * @param string $name name of group * @param string $comment comment of group - * @return object/boolean instance of {@link LetoDMS_Group} or false in + * @return object/boolean instance of {@link LetoDMS_Core_Group} or false in * case of an error. */ function addGroup($name, $comment) { /* {{{ */ @@ -766,7 +766,7 @@ class LetoDMS_DMS { return false; $resArr = $resArr[0]; - $cat = new LetoDMS_Keywordcategory($resArr["id"], $resArr["owner"], $resArr["name"]); + $cat = new LetoDMS_Core_Keywordcategory($resArr["id"], $resArr["owner"], $resArr["name"]); $cat->setDMS($this); return $cat; } /* }}} */ @@ -778,7 +778,7 @@ class LetoDMS_DMS { return false; $resArr = $resArr[0]; - $cat = new LetoDMS_Keywordcategory($resArr["id"], $resArr["owner"], $resArr["name"]); + $cat = new LetoDMS_Core_Keywordcategory($resArr["id"], $resArr["owner"], $resArr["name"]); $cat->setDMS($this); return $cat; } /* }}} */ @@ -794,7 +794,7 @@ class LetoDMS_DMS { $categories = array(); foreach ($resArr as $row) { - $cat = new LetoDMS_KeywordCategory($row["id"], $row["owner"], $row["name"]); + $cat = new LetoDMS_Core_KeywordCategory($row["id"], $row["owner"], $row["name"]); $cat->setDMS($this); array_push($categories, $cat); } @@ -813,7 +813,7 @@ class LetoDMS_DMS { $categories = array(); foreach ($resArr as $row) { - $cat = new LetoDMS_KeywordCategory($row["id"], $row["owner"], $row["name"]); + $cat = new LetoDMS_Core_KeywordCategory($row["id"], $row["owner"], $row["name"]); $cat->setDMS($this); array_push($categories, $cat); } @@ -852,7 +852,7 @@ class LetoDMS_DMS { $notifications = array(); foreach ($resArr as $row) { - $not = new LetoDMS_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]); + $not = new LetoDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]); $not->setDMS($this); array_push($notifications, $cat); } @@ -880,7 +880,7 @@ class LetoDMS_DMS { $notifications = array(); foreach ($resArr as $row) { - $not = new LetoDMS_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]); + $not = new LetoDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]); $not->setDMS($this); array_push($notifications, $cat); } diff --git a/inc/inc.ClassDocument.php b/LetoDMS_Core/inc.ClassDocument.php similarity index 94% rename from inc/inc.ClassDocument.php rename to LetoDMS_Core/inc.ClassDocument.php index c4ee2ad15..270c77306 100644 --- a/inc/inc.ClassDocument.php +++ b/LetoDMS_Core/inc.ClassDocument.php @@ -33,7 +33,7 @@ define("S_EXPIRED", -3); * 2010 Matteo Lucarelli, 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_Document { /* {{{ */ +class LetoDMS_Core_Document { /* {{{ */ /** * @var integer unique id of document */ @@ -99,7 +99,7 @@ class LetoDMS_Document { /* {{{ */ */ var $_dms; - function LetoDMS_Document($id, $name, $comment, $date, $expires, $ownerID, $folderID, $inheritAccess, $defaultAccess, $locked, $keywords, $sequence) { /* {{{ */ + function LetoDMS_Core_Document($id, $name, $comment, $date, $expires, $ownerID, $folderID, $inheritAccess, $defaultAccess, $locked, $keywords, $sequence) { /* {{{ */ $this->_id = $id; $this->_name = $name; $this->_comment = $comment; @@ -257,7 +257,7 @@ class LetoDMS_Document { /* {{{ */ /** * Return owner of document * - * @return object owner of document as an instance of {@link LetoDMS_User} + * @return object owner of document as an instance of {@link LetoDMS_Core_User} */ function getOwner() { /* {{{ */ if (!isset($this->_owner)) @@ -528,9 +528,9 @@ class LetoDMS_Document { /* {{{ */ $this->_accessList[$mode] = array("groups" => array(), "users" => array()); foreach ($resArr as $row) { if ($row["userID"] != -1) - array_push($this->_accessList[$mode]["users"], new LetoDMS_UserAccess($this->_dms->getUser($row["userID"]), $row["mode"])); + array_push($this->_accessList[$mode]["users"], new LetoDMS_Core_UserAccess($this->_dms->getUser($row["userID"]), $row["mode"])); else //if ($row["groupID"] != -1) - array_push($this->_accessList[$mode]["groups"], new LetoDMS_GroupAccess($this->_dms->getGroup($row["groupID"]), $row["mode"])); + array_push($this->_accessList[$mode]["groups"], new LetoDMS_Core_GroupAccess($this->_dms->getGroup($row["groupID"]), $row["mode"])); } } @@ -626,7 +626,7 @@ class LetoDMS_Document { /* {{{ */ * The function takes inherited access rights into account. * For a list of possible access rights see @file inc.AccessUtils.php * - * @param $user object instance of class LetoDMS_User + * @param $user object instance of class LetoDMS_Core_User * @return integer access mode */ function getAccessMode($user) { /* {{{ */ @@ -670,7 +670,7 @@ class LetoDMS_Document { /* {{{ */ * The function takes inherited access rights into account. * For a list of possible access rights see @file inc.AccessUtils.php * - * @param $group object instance of class LetoDMS_Group + * @param $group object instance of class LetoDMS_Core_Group * @return integer access mode */ function getGroupAccessMode($group) { /* {{{ */ @@ -703,8 +703,8 @@ class LetoDMS_Document { /* {{{ */ * Returns a list of all notifications * * The returned list has two elements called 'users' and 'groups'. Each one - * is an array itself countaining objects of class LetoDMS_User and - * LetoDMS_Group. + * is an array itself countaining objects of class LetoDMS_Core_User and + * LetoDMS_Core_Group. * * @return array list of notifications */ @@ -958,12 +958,12 @@ class LetoDMS_Document { /* {{{ */ if (!$db->getResult($queryStr)) return false; // copy file - if (!LetoDMS_File::makeDir($this->_dms->contentDir . $dir)) return false; - if (!LetoDMS_File::copyFile($tmpFile, $this->_dms->contentDir . $dir . $version . $fileType)) return false; + if (!LetoDMS_Core_File::makeDir($this->_dms->contentDir . $dir)) return false; + if (!LetoDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $dir . $version . $fileType)) return false; unset($this->_content); unset($this->_latestContent); - $docResultSet = new LetoDMS_AddContentResultSet(new LetoDMS_DocumentContent($this, $version, $comment, $date, $user->getID(), $dir, $orgFileName, $fileType, $mimeType)); + $docResultSet = new LetoDMS_AddContentResultSet(new LetoDMS_Core_DocumentContent($this, $version, $comment, $date, $user->getID(), $dir, $orgFileName, $fileType, $mimeType)); // TODO - verify if ($this->_dms->enableConverting && in_array($docResultSet->_content->getFileType(), array_keys($this->_dms->convertFileTypes))) @@ -1041,7 +1041,7 @@ class LetoDMS_Document { /* {{{ */ * * This functions returns an array of content elements ordered by version * - * @return array list of objects of class LetoDMS_DocumentContent + * @return array list of objects of class LetoDMS_Core_DocumentContent */ function getContent() { /* {{{ */ $db = $this->_dms->getDB(); @@ -1054,7 +1054,7 @@ class LetoDMS_Document { /* {{{ */ $this->_content = array(); foreach ($resArr as $row) - array_push($this->_content, new LetoDMS_DocumentContent($this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"])); + array_push($this->_content, new LetoDMS_Core_DocumentContent($this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"])); } return $this->_content; @@ -1064,7 +1064,7 @@ class LetoDMS_Document { /* {{{ */ * Return the content element of a document with a given version number * * @param integer $version version number of content element - * @return object object of class LetoDMS_DocumentContent + * @return object object of class LetoDMS_Core_DocumentContent */ function getContentByVersion($version) { /* {{{ */ if (!is_numeric($version)) return false; @@ -1086,7 +1086,7 @@ class LetoDMS_Document { /* {{{ */ return false; $resArr = $resArr[0]; - return new LetoDMS_DocumentContent($this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"]); + return new LetoDMS_Core_DocumentContent($this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"]); } /* }}} */ function getLatestContent() { /* {{{ */ @@ -1100,7 +1100,7 @@ class LetoDMS_Document { /* {{{ */ return false; $resArr = $resArr[0]; - $this->_latestContent = new LetoDMS_DocumentContent($this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"]); + $this->_latestContent = new LetoDMS_Core_DocumentContent($this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"]); } return $this->_latestContent; } /* }}} */ @@ -1112,7 +1112,7 @@ class LetoDMS_Document { /* {{{ */ $emailList[] = $version->_userID; if (file_exists( $this->_dms->contentDir.$version->getPath() )) - if (!LetoDMS_File::removeFile( $this->_dms->contentDir.$version->getPath() )) + if (!LetoDMS_Core_File::removeFile( $this->_dms->contentDir.$version->getPath() )) return false; $status = $version->getStatus(); @@ -1179,7 +1179,7 @@ class LetoDMS_Document { /* {{{ */ $resArr = $resArr[0]; $document = $this->_dms->getDocument($resArr["document"]); $target = $this->_dms->getDocument($resArr["target"]); - return new LetoDMS_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]); + return new LetoDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]); } /* }}} */ function getDocumentLinks() { /* {{{ */ @@ -1194,7 +1194,7 @@ class LetoDMS_Document { /* {{{ */ foreach ($resArr as $row) { $target = $this->_dms->getDocument($row["target"]); - array_push($this->_documentLinks, new LetoDMS_DocumentLink($row["id"], $this, $target, $row["userID"], $row["public"])); + array_push($this->_documentLinks, new LetoDMS_Core_DocumentLink($row["id"], $this, $target, $row["userID"], $row["public"])); } } return $this->_documentLinks; @@ -1232,7 +1232,7 @@ class LetoDMS_Document { /* {{{ */ if ((is_bool($resArr) && !$resArr) || count($resArr)==0) return false; $resArr = $resArr[0]; - return new LetoDMS_DocumentFile($resArr["id"], $this, $resArr["userID"], $resArr["comment"], $resArr["date"], $resArr["dir"], $resArr["fileType"], $resArr["mimeType"], $resArr["orgFileName"], $resArr["name"]); + return new LetoDMS_Core_DocumentFile($resArr["id"], $this, $resArr["userID"], $resArr["comment"], $resArr["date"], $resArr["dir"], $resArr["fileType"], $resArr["mimeType"], $resArr["orgFileName"], $resArr["name"]); } /* }}} */ function getDocumentFiles() { /* {{{ */ @@ -1246,7 +1246,7 @@ class LetoDMS_Document { /* {{{ */ $this->_documentFiles = array(); foreach ($resArr as $row) { - array_push($this->_documentFiles, new LetoDMS_DocumentFile($row["id"], $this, $row["userID"], $row["comment"], $row["date"], $row["dir"], $row["fileType"], $row["mimeType"], $row["orgFileName"], $row["name"])); + array_push($this->_documentFiles, new LetoDMS_Core_DocumentFile($row["id"], $this, $row["userID"], $row["comment"], $row["date"], $row["dir"], $row["fileType"], $row["mimeType"], $row["orgFileName"], $row["name"])); } } return $this->_documentFiles; @@ -1267,8 +1267,8 @@ class LetoDMS_Document { /* {{{ */ if (is_bool($file) && !$file) return false; // copy file - if (!LetoDMS_File::makeDir($this->_dms->contentDir . $dir)) return false; - if (!LetoDMS_File::copyFile($tmpFile, $this->_dms->contentDir . $file->getPath() )) return false; + if (!LetoDMS_Core_File::makeDir($this->_dms->contentDir . $dir)) return false; + if (!LetoDMS_Core_File::copyFile($tmpFile, $this->_dms->contentDir . $file->getPath() )) return false; return true; } /* }}} */ @@ -1280,7 +1280,7 @@ class LetoDMS_Document { /* {{{ */ if (is_bool($file) && !$file) return false; if (file_exists( $this->_dms->contentDir . $file->getPath() )){ - if (!LetoDMS_File::removeFile( $this->_dms->contentDir . $file->getPath() )) + if (!LetoDMS_Core_File::removeFile( $this->_dms->contentDir . $file->getPath() )) return false; } @@ -1318,7 +1318,7 @@ class LetoDMS_Document { /* {{{ */ // TODO: versioning file? if (file_exists( $this->_dms->contentDir . $this->getDir() )) - if (!LetoDMS_File::removeDir( $this->_dms->contentDir . $this->getDir() )) + if (!LetoDMS_Core_File::removeDir( $this->_dms->contentDir . $this->getDir() )) return false; $queryStr = "DELETE FROM tblDocuments WHERE id = " . $this->_id; @@ -1384,13 +1384,13 @@ class LetoDMS_Document { /* {{{ */ $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "WHERE `tblGroupMembers`.`groupID` IN (". $groupIDs .") ". - "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest.")"; + "AND `tblUsers`.`role` != ".LetoDMS_Core_User::role_guest.")"; } $queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). "(SELECT `tblUsers`.* FROM `tblUsers` ". - "WHERE (`tblUsers`.`role` != ".LetoDMS_User::role_guest.") ". + "WHERE (`tblUsers`.`role` != ".LetoDMS_Core_User::role_guest.") ". "AND ((`tblUsers`.`id` = ". $this->_ownerID . ") ". - "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin.")". + "OR (`tblUsers`.`role` = ".LetoDMS_Core_User::role_admin.")". (strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))"). ")) ORDER BY `login`"; } @@ -1399,16 +1399,16 @@ class LetoDMS_Document { /* {{{ */ $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")". - "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest . + "AND `tblUsers`.`role` != ".LetoDMS_Core_User::role_guest . (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"); } $queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). "(SELECT `tblUsers`.* FROM `tblUsers` ". "WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ". - "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin."))". + "OR (`tblUsers`.`role` = ".LetoDMS_Core_User::role_admin."))". "UNION ". "(SELECT `tblUsers`.* FROM `tblUsers` ". - "WHERE `tblUsers`.`role` != ".LetoDMS_User::role_guest . + "WHERE `tblUsers`.`role` != ".LetoDMS_Core_User::role_guest . (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"). " ORDER BY `login`"; } @@ -1442,7 +1442,7 @@ class LetoDMS_Document { /* {{{ */ $resArr = $db->getResultArray($queryStr); if (!is_bool($resArr)) { foreach ($resArr as $row) { - $this->_approversList["groups"][] = new LetoDMS_Group($row["id"], $row["name"], $row["comment"]); + $this->_approversList["groups"][] = new LetoDMS_Core_Group($row["id"], $row["name"], $row["comment"]); } } } @@ -1460,7 +1460,7 @@ class LetoDMS_Document { /* {{{ */ * meta data stored in the database. A document content has a version number * which is incremented with each replacement of the old content. Old versions * are kept unless they are explicitly deleted by - * {@link LetoDMS_Document::removeContent()}. + * {@link LetoDMS_Core_Document::removeContent()}. * * @category DMS * @package LetoDMS @@ -1471,7 +1471,7 @@ class LetoDMS_Document { /* {{{ */ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_DocumentContent { /* {{{ */ +class LetoDMS_Core_DocumentContent { /* {{{ */ // if status is released and there are reviewers set status draft_rev // if status is released or draft_rev and there are approves set status draft_app @@ -1510,7 +1510,7 @@ class LetoDMS_DocumentContent { /* {{{ */ else $this->setStatus(S_RELEASED,"",$user); } /* }}} */ - function LetoDMS_DocumentContent($document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType) { /* {{{ */ + function LetoDMS_Core_DocumentContent($document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType) { /* {{{ */ $this->_document = $document; $this->_version = $version; $this->_comment = $comment; @@ -1608,7 +1608,7 @@ class LetoDMS_DocumentContent { /* {{{ */ // $send_email=FALSE is used when removing entire document // to avoid one email for every version - // This function is deprecated. It was replaced by LetoDMS_Document::removeContent() + // This function is deprecated. It was replaced by LetoDMS_Core_Document::removeContent() function __remove($send_email=TRUE) { /* {{{ */ GLOBAL $user; $db = $this->_document->_dms->getDB(); @@ -1617,7 +1617,7 @@ class LetoDMS_DocumentContent { /* {{{ */ $emailList[] = $this->_userID; if (file_exists( $this->_document->_dms->contentDir.$version->getPath() )) - if (!LetoDMS_File::removeFile( $this->_document->_dms->contentDir.$version->getPath() )) + if (!LetoDMS_Core_File::removeFile( $this->_document->_dms->contentDir.$version->getPath() )) return false; $status = $this->getStatus(); @@ -2176,7 +2176,7 @@ class LetoDMS_DocumentContent { /* {{{ */ * Document links are to establish a reference from one document to * another document. The owner of the document link may not be the same * as the owner of one of the documents. - * Use {@link LetoDMS_Document::addDocumentLink()} to add a reference + * Use {@link LetoDMS_Core_Document::addDocumentLink()} to add a reference * to another document. * * @category DMS @@ -2188,14 +2188,14 @@ class LetoDMS_DocumentContent { /* {{{ */ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_DocumentLink { /* {{{ */ +class LetoDMS_Core_DocumentLink { /* {{{ */ var $_id; var $_document; var $_target; var $_userID; var $_public; - function LetoDMS_DocumentLink($id, $document, $target, $userID, $public) { + function LetoDMS_Core_DocumentLink($id, $document, $target, $userID, $public) { $this->_id = $id; $this->_document = $document; $this->_target = $target; @@ -2238,7 +2238,7 @@ class LetoDMS_DocumentLink { /* {{{ */ * Beside the regular document content arbitrary files can be attached * to a document. This is a similar concept as attaching files to emails. * The owner of the attached file and the document may not be the same. - * Use {@link LetoDMS_Document::addDocumentFile()} to attach a file. + * Use {@link LetoDMS_Core_Document::addDocumentFile()} to attach a file. * * @category DMS * @package LetoDMS @@ -2249,7 +2249,7 @@ class LetoDMS_DocumentLink { /* {{{ */ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_DocumentFile { /* {{{ */ +class LetoDMS_Core_DocumentFile { /* {{{ */ var $_id; var $_document; var $_userID; @@ -2261,7 +2261,7 @@ class LetoDMS_DocumentFile { /* {{{ */ var $_orgFileName; var $_name; - function LetoDMS_DocumentFile($id, $document, $userID, $comment, $date, $dir, $fileType, $mimeType, $orgFileName,$name) { + function LetoDMS_Core_DocumentFile($id, $document, $userID, $comment, $date, $dir, $fileType, $mimeType, $orgFileName,$name) { $this->_id = $id; $this->_document = $document; $this->_userID = $userID; @@ -2300,7 +2300,7 @@ class LetoDMS_DocumentFile { /* {{{ */ $db = $this->_document->_dms->getDB(); if (file_exists( $this->_document->_dms->contentDir.$this->getPath() )) - if (!LetoDMS_File::removeFile( $this->_document->_dms->contentDir.$this->getPath() )) + if (!LetoDMS_Core_File::removeFile( $this->_document->_dms->contentDir.$this->getPath() )) return false; @@ -2355,7 +2355,7 @@ class LetoDMS_AddContentResultSet { /* {{{ */ return false; } if (!strcasecmp($type, "i")) { - if (strcasecmp(get_class($reviewer), "LetoDMS_User")) { + if (strcasecmp(get_class($reviewer), "LetoDMS_Core_User")) { return false; } if ($this->_indReviewers == null) { @@ -2364,7 +2364,7 @@ class LetoDMS_AddContentResultSet { /* {{{ */ $this->_indReviewers[$status][] = $reviewer; } if (!strcasecmp($type, "g")) { - if (strcasecmp(get_class($reviewer), "LetoDMS_Group")) { + if (strcasecmp(get_class($reviewer), "LetoDMS_Core_Group")) { return false; } if ($this->_grpReviewers == null) { @@ -2381,7 +2381,7 @@ class LetoDMS_AddContentResultSet { /* {{{ */ return false; } if (!strcasecmp($type, "i")) { - if (strcasecmp(get_class($approver), "LetoDMS_User")) { + if (strcasecmp(get_class($approver), "LetoDMS_Core_User")) { return false; } if ($this->_indApprovers == null) { @@ -2390,7 +2390,7 @@ class LetoDMS_AddContentResultSet { /* {{{ */ $this->_indApprovers[$status][] = $approver; } if (!strcasecmp($type, "g")) { - if (strcasecmp(get_class($approver), "LetoDMS_Group")) { + if (strcasecmp(get_class($approver), "LetoDMS_Core_Group")) { return false; } if ($this->_grpApprovers == null) { diff --git a/inc/inc.ClassFolder.php b/LetoDMS_Core/inc.ClassFolder.php similarity index 95% rename from inc/inc.ClassFolder.php rename to LetoDMS_Core/inc.ClassFolder.php index 1e360a708..d82710098 100644 --- a/inc/inc.ClassFolder.php +++ b/LetoDMS_Core/inc.ClassFolder.php @@ -23,7 +23,7 @@ * 2010 Matteo Lucarelli, 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_Folder { +class LetoDMS_Core_Folder { /** * @var integer unique id of folder */ @@ -69,7 +69,7 @@ class LetoDMS_Folder { */ var $_dms; - function LetoDMS_Folder($id, $name, $parentID, $comment, $date, $ownerID, $inheritAccess, $defaultAccess, $sequence) { /* {{{ */ + function LetoDMS_Core_Folder($id, $name, $parentID, $comment, $date, $ownerID, $inheritAccess, $defaultAccess, $sequence) { /* {{{ */ $this->_id = $id; $this->_name = $name; $this->_parentID = $parentID; @@ -321,7 +321,7 @@ class LetoDMS_Folder { /** * Returns a list of subfolders * This function does not check for access rights. Use - * {@link LetoDMS_DMS::filterAccess} for checking each folder against + * {@link LetoDMS_Core_DMS::filterAccess} for checking each folder against * the currently logged in user and the access rights. * * @param string $orderby if set to 'n' the list is ordered by name, otherwise @@ -340,7 +340,7 @@ class LetoDMS_Folder { $this->_subFolders = array(); for ($i = 0; $i < count($resArr); $i++) -// $this->_subFolders[$i] = new LetoDMS_Folder($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["parent"], $resArr[$i]["comment"], $resArr[$i]["owner"], $resArr[$i]["inheritAccess"], $resArr[$i]["defaultAccess"], $resArr[$i]["sequence"]); +// $this->_subFolders[$i] = new LetoDMS_Core_Folder($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["parent"], $resArr[$i]["comment"], $resArr[$i]["owner"], $resArr[$i]["inheritAccess"], $resArr[$i]["defaultAccess"], $resArr[$i]["sequence"]); $this->_subFolders[$i] = $this->_dms->getFolder($resArr[$i]["id"]); } @@ -415,7 +415,7 @@ class LetoDMS_Folder { /** * Get all documents of the folder * This function does not check for access rights. Use - * {@link LetoDMS_DMS::filterAccess} for checking each document against + * {@link LetoDMS_Core_DMS::filterAccess} for checking each document against * the currently logged in user and the access rights. * * @param string $orderby if set to 'n' the list is ordered by name, otherwise @@ -435,7 +435,7 @@ class LetoDMS_Folder { $this->_documents = array(); foreach ($resArr as $row) { -// array_push($this->_documents, new LetoDMS_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], isset($row["lockUser"])?$row["lockUser"]:NULL, $row["keywords"], $row["sequence"])); +// array_push($this->_documents, new LetoDMS_Core_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], isset($row["lockUser"])?$row["lockUser"]:NULL, $row["keywords"], $row["sequence"])); array_push($this->_documents, $this->_dms->getDocument($row["id"])); } } @@ -569,9 +569,9 @@ class LetoDMS_Folder { $this->_accessList[$mode] = array("groups" => array(), "users" => array()); foreach ($resArr as $row) { if ($row["userID"] != -1) - array_push($this->_accessList[$mode]["users"], new LetoDMS_UserAccess($this->_dms->getUser($row["userID"]), $row["mode"])); + array_push($this->_accessList[$mode]["users"], new LetoDMS_Core_UserAccess($this->_dms->getUser($row["userID"]), $row["mode"])); else //if ($row["groupID"] != -1) - array_push($this->_accessList[$mode]["groups"], new LetoDMS_GroupAccess($this->_dms->getGroup($row["groupID"]), $row["mode"])); + array_push($this->_accessList[$mode]["groups"], new LetoDMS_Core_GroupAccess($this->_dms->getGroup($row["groupID"]), $row["mode"])); } } @@ -1003,13 +1003,13 @@ class LetoDMS_Folder { $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "WHERE `tblGroupMembers`.`groupID` IN (". $groupIDs .") ". - "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest.")"; + "AND `tblUsers`.`role` != ".LetoDMS_Core_User::role_guest.")"; } $queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). "(SELECT `tblUsers`.* FROM `tblUsers` ". - "WHERE (`tblUsers`.`role` != ".LetoDMS_User::role_guest.") ". + "WHERE (`tblUsers`.`role` != ".LetoDMS_Core_User::role_guest.") ". "AND ((`tblUsers`.`id` = ". $this->_ownerID . ") ". - "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin.")". + "OR (`tblUsers`.`role` = ".LetoDMS_Core_User::role_admin.")". (strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))"). ")) ORDER BY `login`"; } @@ -1018,16 +1018,16 @@ class LetoDMS_Folder { $queryStr = "(SELECT `tblUsers`.* FROM `tblUsers` ". "LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ". "WHERE `tblGroupMembers`.`groupID` NOT IN (". $groupIDs .")". - "AND `tblUsers`.`role` != ".LetoDMS_User::role_guest." ". + "AND `tblUsers`.`role` != ".LetoDMS_Core_User::role_guest." ". (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"); } $queryStr .= (strlen($queryStr)==0 ? "" : " UNION "). "(SELECT `tblUsers`.* FROM `tblUsers` ". "WHERE (`tblUsers`.`id` = ". $this->_ownerID . ") ". - "OR (`tblUsers`.`role` = ".LetoDMS_User::role_admin."))". + "OR (`tblUsers`.`role` = ".LetoDMS_Core_User::role_admin."))". "UNION ". "(SELECT `tblUsers`.* FROM `tblUsers` ". - "WHERE `tblUsers`.`role` != ".LetoDMS_User::role_guest." ". + "WHERE `tblUsers`.`role` != ".LetoDMS_Core_User::role_guest." ". (strlen($userIDs) == 0 ? ")" : " AND (`tblUsers`.`id` NOT IN (". $userIDs .")))"). " ORDER BY `login`"; } @@ -1061,7 +1061,7 @@ class LetoDMS_Folder { $resArr = $db->getResultArray($queryStr); if (!is_bool($resArr)) { foreach ($resArr as $row) { - $this->_approversList["groups"][] = new LetoDMS_Group($row["id"], $row["name"], $row["comment"]); + $this->_approversList["groups"][] = new LetoDMS_Core_Group($row["id"], $row["name"], $row["comment"]); } } } diff --git a/inc/inc.ClassGroup.php b/LetoDMS_Core/inc.ClassGroup.php similarity index 96% rename from inc/inc.ClassGroup.php rename to LetoDMS_Core/inc.ClassGroup.php index c1f338986..82486def6 100644 --- a/inc/inc.ClassGroup.php +++ b/LetoDMS_Core/inc.ClassGroup.php @@ -21,7 +21,7 @@ * @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_Group { +class LetoDMS_Core_Group { /** * The id of the user group * @@ -43,7 +43,7 @@ class LetoDMS_Group { */ var $_dms; - function LetoDMS_Group($id, $name, $comment) { /* {{{ */ + function LetoDMS_Core_Group($id, $name, $comment) { /* {{{ */ $this->_id = $id; $this->_name = $name; $this->_comment = $comment; @@ -96,7 +96,7 @@ class LetoDMS_Group { $this->_users = array(); foreach ($resArr as $row) { - $user = new LetoDMS_User($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']); + $user = new LetoDMS_Core_User($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']); array_push($this->_users, $user); } } diff --git a/inc/inc.ClassKeywords.php b/LetoDMS_Core/inc.ClassKeywords.php similarity index 92% rename from inc/inc.ClassKeywords.php rename to LetoDMS_Core/inc.ClassKeywords.php index 79b703ec4..19f53b593 100644 --- a/inc/inc.ClassKeywords.php +++ b/LetoDMS_Core/inc.ClassKeywords.php @@ -22,7 +22,7 @@ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_KeywordCategory { +class LetoDMS_Core_KeywordCategory { /** * @var integer $_id id of keyword category * @access protected @@ -47,7 +47,7 @@ class LetoDMS_KeywordCategory { */ var $_dms; - function LetoDMS_KeywordCategory($id, $ownerID, $name) { + function LetoDMS_Core_KeywordCategory($id, $ownerID, $name) { $this->_id = $id; $this->_name = $name; $this->_ownerID = $ownerID; diff --git a/inc/inc.ClassNotification.php b/LetoDMS_Core/inc.ClassNotification.php similarity index 92% rename from inc/inc.ClassNotification.php rename to LetoDMS_Core/inc.ClassNotification.php index 87f7f4e5f..f272567ed 100644 --- a/inc/inc.ClassNotification.php +++ b/LetoDMS_Core/inc.ClassNotification.php @@ -20,7 +20,7 @@ * @copyright Copyright (C) 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_Notification { /* {{{ */ +class LetoDMS_Core_Notification { /* {{{ */ /** * @var integer id of target (document or folder) * @@ -56,7 +56,7 @@ class LetoDMS_Notification { /* {{{ */ */ var $_dms; - function LetoDMS_Notification($target, $targettype, $userid, $groupid) { + function LetoDMS_Core_Notification($target, $targettype, $userid, $groupid) { $this->_target = $target; $this->_targettype = $targettype; $this->_userid = $userid; diff --git a/inc/inc.ClassUser.php b/LetoDMS_Core/inc.ClassUser.php similarity index 96% rename from inc/inc.ClassUser.php rename to LetoDMS_Core/inc.ClassUser.php index e3071928b..75f55270d 100644 --- a/inc/inc.ClassUser.php +++ b/LetoDMS_Core/inc.ClassUser.php @@ -22,7 +22,7 @@ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_User { +class LetoDMS_Core_User { /** * @var integer id of user * @@ -83,8 +83,8 @@ class LetoDMS_User { var $_comment; /** - * @var string role of user. Can be one of LetoDMS_User::role_user, - * LetoDMS_User::role_admin, LetoDMS_User::role_guest + * @var string role of user. Can be one of LetoDMS_Core_User::role_user, + * LetoDMS_Core_User::role_admin, LetoDMS_Core_User::role_guest * * @access protected */ @@ -108,7 +108,7 @@ class LetoDMS_User { const role_admin = '1'; const role_guest = '2'; - function LetoDMS_User($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0) { + function LetoDMS_Core_User($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0) { $this->_id = $id; $this->_login = $login; $this->_pwd = $pwd; @@ -239,29 +239,29 @@ class LetoDMS_User { return true; } /* }}} */ - function isAdmin() { return ($this->_role == LetoDMS_User::role_admin); } + function isAdmin() { return ($this->_role == LetoDMS_Core_User::role_admin); } function setAdmin($isAdmin) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET role = " . LetoDMS_User::role_admin . " WHERE id = " . $this->_id; + $queryStr = "UPDATE tblUsers SET role = " . LetoDMS_Core_User::role_admin . " WHERE id = " . $this->_id; if (!$db->getResult($queryStr)) return false; - $this->_role = LetoDMS_User::role_admin; + $this->_role = LetoDMS_Core_User::role_admin; return true; } /* }}} */ - function isGuest() { return ($this->_role == LetoDMS_User::role_guest); } + function isGuest() { return ($this->_role == LetoDMS_Core_User::role_guest); } function setGuest($isGuest) { /* {{{ */ $db = $this->_dms->getDB(); - $queryStr = "UPDATE tblUsers SET role = " . LetoDMS_User::role_guest . " WHERE id = " . $this->_id; + $queryStr = "UPDATE tblUsers SET role = " . LetoDMS_Core_User::role_guest . " WHERE id = " . $this->_id; if (!$db->getResult($queryStr)) return false; - $this->_role = LetoDMS_User::role_guest; + $this->_role = LetoDMS_Core_User::role_guest; return true; } /* }}} */ @@ -441,7 +441,7 @@ class LetoDMS_User { $this->_groups = array(); foreach ($resArr as $row) { - $group = new LetoDMS_Group($row["id"], $row["name"], $row["comment"]); + $group = new LetoDMS_Core_Group($row["id"], $row["name"], $row["comment"]); array_push($this->_groups, $group); } } diff --git a/inc/inc.DBAccess.php b/LetoDMS_Core/inc.DBAccess.php similarity index 98% rename from inc/inc.DBAccess.php rename to LetoDMS_Core/inc.DBAccess.php index e77b13f88..6c6fe4957 100644 --- a/inc/inc.DBAccess.php +++ b/LetoDMS_Core/inc.DBAccess.php @@ -30,7 +30,7 @@ else * @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_DatabaseAccess { +class LetoDMS_Core_DatabaseAccess { var $_driver; var $_hostname; var $_database; @@ -55,7 +55,7 @@ class LetoDMS_DatabaseAccess { /** * Konstruktor */ - function LetoDMS_DatabaseAccess($driver, $hostname, $user, $passw, $database = false) + function LetoDMS_Core_DatabaseAccess($driver, $hostname, $user, $passw, $database = false) { $this->_driver = $driver; $this->_hostname = $hostname; diff --git a/inc/inc.FileUtils.php b/LetoDMS_Core/inc.FileUtils.php similarity index 99% rename from inc/inc.FileUtils.php rename to LetoDMS_Core/inc.FileUtils.php index b589d232f..9a100ca59 100644 --- a/inc/inc.FileUtils.php +++ b/LetoDMS_Core/inc.FileUtils.php @@ -24,7 +24,7 @@ * 2010 Uwe Steinmann * @version Release: @package_version@ */ -class LetoDMS_File { +class LetoDMS_Core_File { function renameFile($old, $new) { return @rename($old, $new); } diff --git a/Makefile b/Makefile index ceb3e6095..7f264515c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION=3.0.0-RC1 -SRC=CHANGELOG* inc conf index.php LetoDMS.php languages op out webdav README reset_db.sql create_tables.sql create_tables-innodb.sql drop-tables-innodb.sql delete_all_contents.sql styles TODO UPDATE-* LICENSE Makefile package.xml +SRC=CHANGELOG* inc conf index.php languages op out README reset_db.sql create_tables.sql create_tables-innodb.sql drop-tables-innodb.sql delete_all_contents.sql styles TODO UPDATE-* LICENSE Makefile package.xml dist: mkdir -p tmp/letoDMS-$(VERSION) diff --git a/inc/inc.ClassEmail.php b/inc/inc.ClassEmail.php index f2720e280..f3504b1ee 100644 --- a/inc/inc.ClassEmail.php +++ b/inc/inc.ClassEmail.php @@ -38,8 +38,8 @@ class LetoDMS_Email extends LetoDMS_Notify { if ($recipient->getEmail()=="") return 0; - if ((!is_object($sender) && strcasecmp(get_class($sender), "LetoDMS_User")) || - (!is_object($recipient) && strcasecmp(get_class($recipient), "LetoDMS_User"))) { + if ((!is_object($sender) && strcasecmp(get_class($sender), "LetoDMS_Core_User")) || + (!is_object($recipient) && strcasecmp(get_class($recipient), "LetoDMS_Core_User"))) { return -1; } @@ -57,8 +57,8 @@ class LetoDMS_Email extends LetoDMS_Notify { global $settings; if (!$settings->_enableEmail) return 0; - if ((!is_object($sender) && strcasecmp(get_class($sender), "LetoDMS_User")) || - (!is_object($groupRecipient) && strcasecmp(get_class($groupRecipient), "LetoDMS_Group"))) { + if ((!is_object($sender) && strcasecmp(get_class($sender), "LetoDMS_Core_User")) || + (!is_object($groupRecipient) && strcasecmp(get_class($groupRecipient), "LetoDMS_Core_Group"))) { return -1; } @@ -87,7 +87,7 @@ class LetoDMS_Email extends LetoDMS_Notify { global $settings; if (!$settings->_enableEmail) return 0; - if ((!is_object($sender) && strcasecmp(get_class($sender), "LetoDMS_User")) || + if ((!is_object($sender) && strcasecmp(get_class($sender), "LetoDMS_Core_User")) || (!is_array($recipients) && count($recipients)==0)) { return -1; } @@ -97,7 +97,7 @@ class LetoDMS_Email extends LetoDMS_Notify { $toList = ""; foreach ($recipients as $recipient) { - if (is_object($recipient) && !strcasecmp(get_class($recipient), "LetoDMS_User")) { + if (is_object($recipient) && !strcasecmp(get_class($recipient), "LetoDMS_Core_User")) { if ($recipient->getEmail()!="") $toList .= (strlen($toList)==0 ? "" : ", ") . $recipient->getEmail(); diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php index 7b8cc330e..bea9bcc15 100644 --- a/inc/inc.ClassSession.php +++ b/inc/inc.ClassSession.php @@ -32,7 +32,7 @@ class LetoDMS_Session { /** * @var object $db reference to database object. This must be an instance - * of {@link LetoDMS_DatabaseAccess}. + * of {@link LetoDMS_Core_DatabaseAccess}. * @access protected */ protected $db; diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index ea9efe1a6..52b906290 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -176,7 +176,7 @@ class UI { echo "
  • ".getMLText("help")."
    • \n"; echo "
  • \n"; echo "
    "; - if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), "LetoDMS_Folder")) { + if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), "LetoDMS_Core_Folder")) { echo "getID()."\" />"; } echo ""; @@ -239,7 +239,7 @@ class UI { global $user, $settings, $theme; - if (!is_object($folder) || strcasecmp(get_class($folder), "LetoDMS_Folder")) { + if (!is_object($folder) || strcasecmp(get_class($folder), "LetoDMS_Core_Folder")) { echo "
      \n"; echo "
    \n"; return; @@ -620,7 +620,7 @@ class UI { if (!is_object($folder)) return; $subFolders = $folder->getSubFolders(); - $subFolders = LetoDMS_DMS::filterAccess($subFolders, $user, M_READ); + $subFolders = LetoDMS_Core_DMS::filterAccess($subFolders, $user, M_READ); if ($folderID == $settings->_rootFolderID) print "
      \n"; diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php index 26bbaf1ff..2f95b1310 100644 --- a/inc/inc.DBInit.php +++ b/inc/inc.DBInit.php @@ -18,10 +18,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -$db = new LetoDMS_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase); +$db = new LetoDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase); $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\""); -$dms = new LetoDMS_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir); +$dms = new LetoDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir); $dms->setRootFolderID($settings->_rootFolderID); $dms->setEnableAdminRevApp($settings->_enableAdminRevApp); $dms->setEnableConverting($settings->_enableConverting); diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index f9b6b65b5..cefb07b0e 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -101,7 +101,7 @@ function createVersionigFile($document) { /* {{{ */ // if directory has been removed recreate it if (!file_exists($settings->_contentDir . $document->getDir())) - if (!LetoDMS_File::makeDir($settings->_contentDir . $document->getDir())) return false; + if (!LetoDMS_Core_File::makeDir($settings->_contentDir . $document->getDir())) return false; $handle = fopen($settings->_contentDir . $document->getDir() .$settings-> _versioningFileName , "wb"); diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index ae1bf3d52..6be8942f3 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.AddDocumentLink.php b/op/op.AddDocumentLink.php index 9d71c2455..19c4ce76d 100644 --- a/op/op.AddDocumentLink.php +++ b/op/op.AddDocumentLink.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.AddEvent.php b/op/op.AddEvent.php index 654be2818..291f41df9 100644 --- a/op/op.AddEvent.php +++ b/op/op.AddEvent.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.AddFile.php b/op/op.AddFile.php index 1a90f8cdc..a3a99e7a2 100644 --- a/op/op.AddFile.php +++ b/op/op.AddFile.php @@ -18,7 +18,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php index f6f5d2053..9c4ca4ee7 100644 --- a/op/op.AddSubFolder.php +++ b/op/op.AddSubFolder.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php index 36a287475..4d006f7d4 100644 --- a/op/op.ApproveDocument.php +++ b/op/op.ApproveDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php index 26fb721e9..19646d27b 100644 --- a/op/op.CreateDump.php +++ b/op/op.CreateDump.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); @@ -60,7 +60,7 @@ foreach ($tables as $table){ fclose($h); -if (LetoDMS_File::gzcompressfile($dump_name,9)) unlink($dump_name); +if (LetoDMS_Core_File::gzcompressfile($dump_name,9)) unlink($dump_name); else UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); add_log_line(); diff --git a/op/op.CreateFolderArchive.php b/op/op.CreateFolderArchive.php index e6fe39d41..302fd4d04 100644 --- a/op/op.CreateFolderArchive.php +++ b/op/op.CreateFolderArchive.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); @@ -189,7 +189,7 @@ if (!createFolderTar($folder,$ark)) { TarAddFooter($ark); fclose($ark); -if (LetoDMS_File::gzcompressfile($ark_name,9)) unlink($ark_name); +if (LetoDMS_Core_File::gzcompressfile($ark_name,9)) unlink($ark_name); else UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); add_log_line(); diff --git a/op/op.CreateStatusIndex.php b/op/op.CreateStatusIndex.php index df5c757f6..1278f892b 100644 --- a/op/op.CreateStatusIndex.php +++ b/op/op.CreateStatusIndex.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.CreateSubFolderIndex.php b/op/op.CreateSubFolderIndex.php index 3a4015538..edf728b3f 100644 --- a/op/op.CreateSubFolderIndex.php +++ b/op/op.CreateSubFolderIndex.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -72,7 +72,7 @@ $resArr = $db->getResultArray($searchQuery); if (!is_bool($resArr) && count($resArr)>0) { echo "
        "; foreach($resArr as $docArr) { - $doc = new LetoDMS_Document($docArr["id"], + $doc = new LetoDMS_Core_Document($docArr["id"], $docArr["name"], $docArr["comment"], $docArr["date"], diff --git a/op/op.CreateVersioningFiles.php b/op/op.CreateVersioningFiles.php index 0f5162117..add8796fd 100644 --- a/op/op.CreateVersioningFiles.php +++ b/op/op.CreateVersioningFiles.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.DefaultKeywords.php b/op/op.DefaultKeywords.php index 4d3c10cd4..e87508e01 100644 --- a/op/op.DefaultKeywords.php +++ b/op/op.DefaultKeywords.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php index 8f22647ab..3face735e 100644 --- a/op/op.DocumentAccess.php +++ b/op/op.DocumentAccess.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.DocumentNotify.php b/op/op.DocumentNotify.php index 3fcf1b49f..db0a6a702 100644 --- a/op/op.DocumentNotify.php +++ b/op/op.DocumentNotify.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.Download.php b/op/op.Download.php index c4e7adb85..54cfb89e3 100644 --- a/op/op.Download.php +++ b/op/op.Download.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.EditComment.php b/op/op.EditComment.php index d85ea85ca..614ea3840 100644 --- a/op/op.EditComment.php +++ b/op/op.EditComment.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php index dc593302e..a793bb29d 100644 --- a/op/op.EditDocument.php +++ b/op/op.EditDocument.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.EditEvent.php b/op/op.EditEvent.php index 4f6e2a668..f93098226 100644 --- a/op/op.EditEvent.php +++ b/op/op.EditEvent.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index ca6c1faf2..2bc33bbc8 100644 --- a/op/op.EditFolder.php +++ b/op/op.EditFolder.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.EditUserData.php b/op/op.EditUserData.php index cb0baace8..74cb15dd0 100644 --- a/op/op.EditUserData.php +++ b/op/op.EditUserData.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php index e8b6da971..f6a5134db 100644 --- a/op/op.FolderAccess.php +++ b/op/op.FolderAccess.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.FolderNotify.php b/op/op.FolderNotify.php index cb8002740..a0e6416e0 100644 --- a/op/op.FolderNotify.php +++ b/op/op.FolderNotify.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php index 9fa787dca..bbdb3fd91 100644 --- a/op/op.GroupMgr.php +++ b/op/op.GroupMgr.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.LockDocument.php b/op/op.LockDocument.php index 41f33204d..6da85fa32 100644 --- a/op/op.LockDocument.php +++ b/op/op.LockDocument.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.Login.php b/op/op.Login.php index 2279dd0e4..78bddfe86 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassSession.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.Logout.php b/op/op.Logout.php index b3d534da3..190cdfa5f 100644 --- a/op/op.Logout.php +++ b/op/op.Logout.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassSession.php"); include("../inc/inc.DBInit.php"); diff --git a/op/op.ManageNotify.php b/op/op.ManageNotify.php index f8f35c0f3..382eec2a2 100644 --- a/op/op.ManageNotify.php +++ b/op/op.ManageNotify.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -37,7 +37,7 @@ function add_folder_notify($folder,$userid,$recursefolder,$recursedoc) // include all folder's document $documents = $folder->getDocuments(); - $documents = LetoDMS_DMS::filterAccess($documents, $dms->getUser($userid), M_READ); + $documents = LetoDMS_Core_DMS::filterAccess($documents, $dms->getUser($userid), M_READ); foreach($documents as $document) $document->addNotify($userid, true); @@ -48,7 +48,7 @@ function add_folder_notify($folder,$userid,$recursefolder,$recursedoc) // recurse all folder's folders $subFolders = $folder->getSubFolders(); - $subFolders = LetoDMS_DMS::filterAccess($subFolders, $dms->getUser($userid), M_READ); + $subFolders = LetoDMS_Core_DMS::filterAccess($subFolders, $dms->getUser($userid), M_READ); foreach($subFolders as $subFolder) add_folder_notify($subFolder,$userid,$recursefolder,$recursedoc); diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php index 1e98e0801..5356687e0 100644 --- a/op/op.MoveDocument.php +++ b/op/op.MoveDocument.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php index 4165625d9..1e437eb4c 100644 --- a/op/op.MoveFolder.php +++ b/op/op.MoveFolder.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index d4a51e4d4..99d8d23f7 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); diff --git a/op/op.RemoveArchive.php b/op/op.RemoveArchive.php index db6dea3a5..f69a07af9 100644 --- a/op/op.RemoveArchive.php +++ b/op/op.RemoveArchive.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -31,7 +31,7 @@ if (!isset($_POST["arkname"]) || !file_exists($settings->_contentDir.$_POST["ark UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } -if (!LetoDMS_File::removeFile($settings->_contentDir.$_POST["arkname"])) { +if (!LetoDMS_Core_File::removeFile($settings->_contentDir.$_POST["arkname"])) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php index 71324306f..6ab48c8f8 100644 --- a/op/op.RemoveDocument.php +++ b/op/op.RemoveDocument.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php index cdca0cd16..342a2746a 100644 --- a/op/op.RemoveDocumentFile.php +++ b/op/op.RemoveDocumentFile.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.RemoveDocumentLink.php b/op/op.RemoveDocumentLink.php index 1a7953385..881c39342 100644 --- a/op/op.RemoveDocumentLink.php +++ b/op/op.RemoveDocumentLink.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.RemoveDump.php b/op/op.RemoveDump.php index 01f5e7689..600b6b6ee 100644 --- a/op/op.RemoveDump.php +++ b/op/op.RemoveDump.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -31,7 +31,7 @@ if (!isset($_POST["dumpname"]) || !file_exists($settings->_contentDir.$_POST["du UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } -if (!LetoDMS_File::removeFile($settings->_contentDir.$_POST["dumpname"])) { +if (!LetoDMS_Core_File::removeFile($settings->_contentDir.$_POST["dumpname"])) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } diff --git a/op/op.RemoveEvent.php b/op/op.RemoveEvent.php index 35fccebea..7d518af34 100644 --- a/op/op.RemoveEvent.php +++ b/op/op.RemoveEvent.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php index 0491d3d22..685696bbd 100644 --- a/op/op.RemoveFolder.php +++ b/op/op.RemoveFolder.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.RemoveFolderFiles.php b/op/op.RemoveFolderFiles.php index 5c213d7ee..a37dd7ba2 100644 --- a/op/op.RemoveFolderFiles.php +++ b/op/op.RemoveFolderFiles.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); @@ -34,7 +34,7 @@ function removeFolderFiles($folder) $documents = $folder->getDocuments(); foreach ($documents as $document) - LetoDMS_File::removeDir($settings->_contentDir . $document->getDir()); + LetoDMS_Core_File::removeDir($settings->_contentDir . $document->getDir()); $subFolders = $folder->getSubFolders(); diff --git a/op/op.RemoveLog.php b/op/op.RemoveLog.php index f573bf597..e4d70106c 100644 --- a/op/op.RemoveLog.php +++ b/op/op.RemoveLog.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -35,7 +35,7 @@ if (@readlink($settings->_contentDir."current.log")==$settings->_contentDir.$_PO UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } -if (!LetoDMS_File::removeFile($settings->_contentDir.$_POST["logname"])) { +if (!LetoDMS_Core_File::removeFile($settings->_contentDir.$_POST["logname"])) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index ed85cc530..60f2041a1 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index f19081b9a..e937ceaec 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); diff --git a/op/op.Search.php b/op/op.Search.php index 45e0690f1..635ab1b2e 100644 --- a/op/op.Search.php +++ b/op/op.Search.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.SetExpires.php b/op/op.SetExpires.php index e4ca81c7e..a6cea2d0c 100644 --- a/op/op.SetExpires.php +++ b/op/op.SetExpires.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index 67bfe4aeb..769c93c03 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); diff --git a/op/op.UnlockDocument.php b/op/op.UnlockDocument.php index bc995574d..216d14269 100644 --- a/op/op.UnlockDocument.php +++ b/op/op.UnlockDocument.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 87670caef..962067282 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassEmail.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.UserDefaultKeywords.php b/op/op.UserDefaultKeywords.php index 1d305a861..cec237aff 100644 --- a/op/op.UserDefaultKeywords.php +++ b/op/op.UserDefaultKeywords.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index 2ae69cc5a..ce0886d82 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/op/op.ViewOnline.php b/op/op.ViewOnline.php index 5a4f74485..d32c62799 100644 --- a/op/op.ViewOnline.php +++ b/op/op.ViewOnline.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index 2bd63be32..ab55714e1 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php index 4924d8063..da3cfbe58 100644 --- a/out/out.AddEvent.php +++ b/out/out.AddEvent.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.AddFile.php b/out/out.AddFile.php index 7fad6060a..9ca00b0e6 100644 --- a/out/out.AddFile.php +++ b/out/out.AddFile.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.AddSubFolder.php b/out/out.AddSubFolder.php index be289b73a..27a37d17f 100644 --- a/out/out.AddSubFolder.php +++ b/out/out.AddSubFolder.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php index 3dc223f7a..777cd265e 100644 --- a/out/out.AdminTools.php +++ b/out/out.AdminTools.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index 5baaa6eb6..07a82bca6 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php index fe385c3b6..e6b659333 100644 --- a/out/out.ApproveDocument.php +++ b/out/out.ApproveDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php index dccc51b64..97eba7dbe 100644 --- a/out/out.BackupTools.php +++ b/out/out.BackupTools.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); diff --git a/out/out.Calendar.php b/out/out.Calendar.php index 211148d4e..cca160b24 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.Calendar.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/out/out.DefaultKeywords.php b/out/out.DefaultKeywords.php index 0587ad6b1..3ff87f282 100644 --- a/out/out.DefaultKeywords.php +++ b/out/out.DefaultKeywords.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.DocumentAccess.php b/out/out.DocumentAccess.php index 20a7ba167..938e1663e 100644 --- a/out/out.DocumentAccess.php +++ b/out/out.DocumentAccess.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.DocumentChooser.php b/out/out.DocumentChooser.php index 1171a3529..eb47452cd 100644 --- a/out/out.DocumentChooser.php +++ b/out/out.DocumentChooser.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); @@ -43,8 +43,8 @@ function printTree($path, $level = 0) GLOBAL $user, $form; $folder = $path[$level]; - $subFolders = LetoDMS_DMS::filterAccess($folder->getSubFolders(), $user, M_READ); - $documents = LetoDMS_DMS::filterAccess($folder->getDocuments(), $user, M_READ); + $subFolders = LetoDMS_Core_DMS::filterAccess($folder->getSubFolders(), $user, M_READ); + $documents = LetoDMS_Core_DMS::filterAccess($folder->getDocuments(), $user, M_READ); if ($level+1 < count($path)) $nextFolderID = $path[$level+1]->getID(); @@ -75,8 +75,8 @@ function printTree($path, $level = 0) printTree($path, $level+1); else { print "
      1. \n"; - $subFolders_ = LetoDMS_DMS::filterAccess($subFolders[$i]->getSubFolders(), $user, M_READ); - $documents_ = LetoDMS_DMS::filterAccess($subFolders[$i]->getDocuments(), $user, M_READ); + $subFolders_ = LetoDMS_Core_DMS::filterAccess($subFolders[$i]->getSubFolders(), $user, M_READ); + $documents_ = LetoDMS_Core_DMS::filterAccess($subFolders[$i]->getDocuments(), $user, M_READ); if (count($subFolders_) + count($documents_) > 0) print "getID()."\">"; diff --git a/out/out.DocumentNotify.php b/out/out.DocumentNotify.php index ae41cbadb..710287dc0 100644 --- a/out/out.DocumentNotify.php +++ b/out/out.DocumentNotify.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php index 409dfe7db..fb1c32727 100644 --- a/out/out.DocumentVersionDetail.php +++ b/out/out.DocumentVersionDetail.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.EditComment.php b/out/out.EditComment.php index 83ce56077..9b8d5e413 100644 --- a/out/out.EditComment.php +++ b/out/out.EditComment.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.EditDocument.php b/out/out.EditDocument.php index 8ab5c57fa..5473e3466 100644 --- a/out/out.EditDocument.php +++ b/out/out.EditDocument.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.EditEvent.php b/out/out.EditEvent.php index a67e2b8ec..dfcb736c6 100644 --- a/out/out.EditEvent.php +++ b/out/out.EditEvent.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php index cf47afc62..90f7f893b 100644 --- a/out/out.EditFolder.php +++ b/out/out.EditFolder.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.EditUserData.php b/out/out.EditUserData.php index 95bb3f67c..0406a2b46 100644 --- a/out/out.EditUserData.php +++ b/out/out.EditUserData.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.FolderAccess.php b/out/out.FolderAccess.php index 8b340d1ce..fa6dbf215 100644 --- a/out/out.FolderAccess.php +++ b/out/out.FolderAccess.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.FolderChooser.php b/out/out.FolderChooser.php index 1271d4fa4..8191a0301 100644 --- a/out/out.FolderChooser.php +++ b/out/out.FolderChooser.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php index f76c5daf3..96a6cea20 100644 --- a/out/out.FolderNotify.php +++ b/out/out.FolderNotify.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php index cae7e996b..69e9b2ef6 100644 --- a/out/out.GroupMgr.php +++ b/out/out.GroupMgr.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.GroupView.php b/out/out.GroupView.php index 9ebd9e833..9e598e09c 100644 --- a/out/out.GroupView.php +++ b/out/out.GroupView.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.Help.php b/out/out.Help.php index 52783d8ae..6e1ad326d 100644 --- a/out/out.Help.php +++ b/out/out.Help.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.Info.php b/out/out.Info.php index e37f3d502..623933b30 100644 --- a/out/out.Info.php +++ b/out/out.Info.php @@ -20,7 +20,7 @@ include("../inc/inc.Version.php"); include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.KeywordChooser.php b/out/out.KeywordChooser.php index f18aca249..9a97504d0 100644 --- a/out/out.KeywordChooser.php +++ b/out/out.KeywordChooser.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.LogManagement.php b/out/out.LogManagement.php index 36fc38a2b..9c6432090 100644 --- a/out/out.LogManagement.php +++ b/out/out.LogManagement.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php index 908a80cc1..b784b51b7 100644 --- a/out/out.ManageNotify.php +++ b/out/out.ManageNotify.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.MoveDocument.php b/out/out.MoveDocument.php index 58205f108..ce4fe906e 100644 --- a/out/out.MoveDocument.php +++ b/out/out.MoveDocument.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php index 2dce57d5f..52a338d54 100644 --- a/out/out.MoveFolder.php +++ b/out/out.MoveFolder.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php index 92c0dfef1..77701a359 100644 --- a/out/out.MyAccount.php +++ b/out/out.MyAccount.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index a4a304d77..a306d7679 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.OverrideContentStatus.php b/out/out.OverrideContentStatus.php index 6ddc4150c..b37cfb4ed 100644 --- a/out/out.OverrideContentStatus.php +++ b/out/out.OverrideContentStatus.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveArchive.php b/out/out.RemoveArchive.php index 3fec18b9b..d864c7cf9 100644 --- a/out/out.RemoveArchive.php +++ b/out/out.RemoveArchive.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php index 6df12be33..e934bf826 100644 --- a/out/out.RemoveDocument.php +++ b/out/out.RemoveDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveDocumentFile.php b/out/out.RemoveDocumentFile.php index abb4d5d05..fad983bba 100644 --- a/out/out.RemoveDocumentFile.php +++ b/out/out.RemoveDocumentFile.php @@ -18,7 +18,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveDump.php b/out/out.RemoveDump.php index 0941dadd7..d892d847b 100644 --- a/out/out.RemoveDump.php +++ b/out/out.RemoveDump.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveEvent.php b/out/out.RemoveEvent.php index bc170d658..6440161a1 100644 --- a/out/out.RemoveEvent.php +++ b/out/out.RemoveEvent.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveFolder.php b/out/out.RemoveFolder.php index 65f1cfcab..6e42f2fb8 100644 --- a/out/out.RemoveFolder.php +++ b/out/out.RemoveFolder.php @@ -19,7 +19,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveFolderFiles.php b/out/out.RemoveFolderFiles.php index 593374e44..4eeb7d4cd 100644 --- a/out/out.RemoveFolderFiles.php +++ b/out/out.RemoveFolderFiles.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveGroup.php b/out/out.RemoveGroup.php index 9c4e08f88..98e9ba2f4 100644 --- a/out/out.RemoveGroup.php +++ b/out/out.RemoveGroup.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveLog.php b/out/out.RemoveLog.php index 0224b3f6c..086524b3d 100644 --- a/out/out.RemoveLog.php +++ b/out/out.RemoveLog.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveUser.php b/out/out.RemoveUser.php index 4d35bbd93..9119d8797 100644 --- a/out/out.RemoveUser.php +++ b/out/out.RemoveUser.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.RemoveVersion.php b/out/out.RemoveVersion.php index 33af46077..39d17c1e2 100644 --- a/out/out.RemoveVersion.php +++ b/out/out.RemoveVersion.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ReviewDocument.php b/out/out.ReviewDocument.php index 90e320ccc..29b633737 100644 --- a/out/out.ReviewDocument.php +++ b/out/out.ReviewDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index f12e62f1f..cca652ddf 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.SearchForm.php b/out/out.SearchForm.php index d020609de..c22c9bffb 100644 --- a/out/out.SearchForm.php +++ b/out/out.SearchForm.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php index c989d0943..5243b0ab5 100644 --- a/out/out.SetExpires.php +++ b/out/out.SetExpires.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php index 6b815013c..02c92f9e6 100644 --- a/out/out.SetReviewersApprovers.php +++ b/out/out.SetReviewersApprovers.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.Statistic.php b/out/out.Statistic.php index 01f296689..5d912ea40 100644 --- a/out/out.Statistic.php +++ b/out/out.Statistic.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php index 1e91d62fd..91b28d4d0 100644 --- a/out/out.UpdateDocument.php +++ b/out/out.UpdateDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.UserDefaultKeywords.php b/out/out.UserDefaultKeywords.php index dcdf2caaa..4b465fe4b 100644 --- a/out/out.UserDefaultKeywords.php +++ b/out/out.UserDefaultKeywords.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.UserImage.php b/out/out.UserImage.php index cfd5e78fb..449452e56 100644 --- a/out/out.UserImage.php +++ b/out/out.UserImage.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Authentication.php"); diff --git a/out/out.UserList.php b/out/out.UserList.php index 8e9a1ef60..f08a497e7 100644 --- a/out/out.UserList.php +++ b/out/out.UserList.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php index ef5c8e412..99f56c4ee 100644 --- a/out/out.UsrMgr.php +++ b/out/out.UsrMgr.php @@ -19,7 +19,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -140,7 +140,7 @@ UI::contentContainerStart(); : - + : @@ -265,7 +265,7 @@ UI::contentContainerStart(); : - + : diff --git a/out/out.UsrView.php b/out/out.UsrView.php index 9273f3d5e..f9da7c47e 100644 --- a/out/out.UsrView.php +++ b/out/out.UsrView.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index 3f7cf3d50..a74aba3cc 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -20,7 +20,7 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ViewEvent.php b/out/out.ViewEvent.php index cc842ee01..1070a972e 100644 --- a/out/out.ViewEvent.php +++ b/out/out.ViewEvent.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index 4986e1ff7..2904cbdc0 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -20,7 +20,8 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); -include("../inc/inc.ClassDMS.php"); +include("../LetoDMS_Core.php"); +//include("../LetoDMS_Core.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -71,9 +72,9 @@ UI::contentHeading(getMLText("folder_contents")); UI::contentContainerStart(); $subFolders = $folder->getSubFolders($orderby); -$subFolders = LetoDMS_DMS::filterAccess($subFolders, $user, M_READ); +$subFolders = LetoDMS_Core_DMS::filterAccess($subFolders, $user, M_READ); $documents = $folder->getDocuments($orderby); -$documents = LetoDMS_DMS::filterAccess($documents, $user, M_READ); +$documents = LetoDMS_Core_DMS::filterAccess($documents, $user, M_READ); if ((count($subFolders) > 0)||(count($documents) > 0)){ print ""; @@ -95,9 +96,9 @@ foreach($subFolders as $subFolder) { $comment = $subFolder->getComment(); if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "..."; $subsub = $subFolder->getSubFolders(); - $subsub = LetoDMS_DMS::filterAccess($subsub, $user, M_READ); + $subsub = LetoDMS_Core_DMS::filterAccess($subsub, $user, M_READ); $subdoc = $subFolder->getDocuments(); - $subdoc = LetoDMS_DMS::filterAccess($subdoc, $user, M_READ); + $subdoc = LetoDMS_Core_DMS::filterAccess($subdoc, $user, M_READ); print ""; // print ""; diff --git a/package.xml b/package.xml index b1626780f..523f332ee 100644 --- a/package.xml +++ b/package.xml @@ -1,6 +1,6 @@ - LetoDMS + LetoDMS_Core pear.php.net Document management system LetoDMS is a web based document management system (DMS). This is @@ -34,7 +34,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/utils/adddoc.php b/utils/adddoc.php index c784b9799..416c04a9f 100644 --- a/utils/adddoc.php +++ b/utils/adddoc.php @@ -2,7 +2,7 @@ #ini_set('include_path', '.:/usr/share/php:/usr/share/letodms/www'); include("/etc/letodms/conf.Settings.php"); -include("LetoDMS/LetoDMS.php"); +include("LetoDMS/LetoDMS_Core.php"); function usage() { /* {{{ */ echo "Usage:\n"; @@ -88,12 +88,12 @@ if(isset($options['V'])) { if($reqversion<1) $reqversion=1; -$db = new LetoDMS_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase); +$db = new LetoDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase); $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\""); $db->_conn->debug = 1; -$dms = new LetoDMS_DMS($db, $settings->_contentDir, $settings->_contentOffsetDir); +$dms = new LetoDMS_Core_DMS($db, $settings->_contentDir, $settings->_contentOffsetDir); $dms->setRootFolderID($settings->_rootFolderID); $dms->setGuestID($settings->_guestID); $dms->setEnableGuestLogin($settings->_enableGuestLogin);