From 73e1df3ad88197f75bafecbc5b73c3bcce319cad Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Oct 2018 09:39:02 +0200 Subject: [PATCH] make it work with slim notfound handler --- ext/example/class.example.php | 32 +++++- inc/inc.Authentication.php | 2 - index.php | 153 +++++++++++++------------ op/op.LockDocument.php | 19 +-- out/out.AddDocument.php | 19 +-- out/out.AddEvent.php | 17 +-- out/out.AddFile.php | 21 ++-- out/out.AddSubFolder.php | 19 +-- out/out.AdminTools.php | 17 +-- out/out.ApprovalSummary.php | 17 +-- out/out.ApproveDocument.php | 21 ++-- out/out.AttributeMgr.php | 17 +-- out/out.BackupTools.php | 19 +-- out/out.Calendar.php | 19 +-- out/out.Categories.php | 17 +-- out/out.CategoryChooser.php | 17 +-- out/out.ChangePassword.php | 9 +- out/out.Charts.php | 19 +-- out/out.ClearCache.php | 19 +-- out/out.Clipboard.php | 19 +-- out/out.CreateIndex.php | 19 +-- out/out.DefaultKeywords.php | 17 +-- out/out.DocumentAccess.php | 21 ++-- out/out.DocumentChooser.php | 17 +-- out/out.DocumentNotify.php | 21 ++-- out/out.DocumentVersionDetail.php | 21 ++-- out/out.DropFolderChooser.php | 17 +-- out/out.EditAttributes.php | 21 ++-- out/out.EditComment.php | 21 ++-- out/out.EditDocument.php | 21 ++-- out/out.EditDocumentFile.php | 21 ++-- out/out.EditEvent.php | 19 +-- out/out.EditFolder.php | 19 +-- out/out.EditOnline.php | 19 +-- out/out.EditUserData.php | 17 +-- out/out.ErrorDlg.php | 21 ++-- out/out.ExpiredDocuments.php | 17 +-- out/out.ExtensionMgr.php | 19 +-- out/out.FolderAccess.php | 19 +-- out/out.FolderChooser.php | 17 +-- out/out.FolderNotify.php | 19 +-- out/out.ForcePasswordChange.php | 17 +-- out/out.GroupMgr.php | 17 +-- out/out.GroupView.php | 17 +-- out/out.Help.php | 17 +-- out/out.Hooks.php | 17 +-- out/out.ImportFS.php | 19 +-- out/out.IndexInfo.php | 19 +-- out/out.Indexer.php | 19 +-- out/out.Info.php | 19 +-- out/out.KeywordChooser.php | 17 +-- out/out.LogManagement.php | 19 +-- out/out.Login.php | 15 +-- out/out.ManageNotify.php | 17 +-- out/out.MoveDocument.php | 21 ++-- out/out.MoveFolder.php | 19 +-- out/out.MyAccount.php | 17 +-- out/out.MyDocuments.php | 17 +-- out/out.ObjectCheck.php | 19 +-- out/out.OpensearchDesc.php | 21 ++-- out/out.OverrideContentStatus.php | 21 ++-- out/out.PasswordForgotten.php | 13 ++- out/out.PasswordSend.php | 13 ++- out/out.RemoveArchive.php | 19 +-- out/out.RemoveDocument.php | 21 ++-- out/out.RemoveDocumentFile.php | 21 ++-- out/out.RemoveDump.php | 17 +-- out/out.RemoveEvent.php | 19 +-- out/out.RemoveFolder.php | 19 +-- out/out.RemoveFolderFiles.php | 17 +-- out/out.RemoveGroup.php | 17 +-- out/out.RemoveLog.php | 17 +-- out/out.RemoveUser.php | 17 +-- out/out.RemoveUserFromProcesses.php | 15 +-- out/out.RemoveVersion.php | 21 ++-- out/out.RemoveWorkflow.php | 19 +-- out/out.RemoveWorkflowFromDocument.php | 21 ++-- out/out.ReturnFromSubWorkflow.php | 17 +-- out/out.ReviewDocument.php | 21 ++-- out/out.ReviewSummary.php | 17 +-- out/out.RewindWorkflow.php | 21 ++-- out/out.RunSubWorkflow.php | 21 ++-- out/out.Search.php | 21 ++-- out/out.SearchForm.php | 19 +-- out/out.SendLoginData.php | 15 +-- out/out.Session.php | 19 +-- out/out.SetExpires.php | 21 ++-- out/out.SetReviewersApprovers.php | 21 ++-- out/out.SetWorkflow.php | 21 ++-- out/out.Settings.php | 17 +-- out/out.Setup2Factor.php | 15 +-- out/out.Statistic.php | 19 +-- out/out.SubstituteUser.php | 21 ++-- out/out.Tasks.php | 17 +-- out/out.Timeline.php | 19 +-- out/out.TransferDocument.php | 21 ++-- out/out.TransferObjects.php | 15 +-- out/out.TriggerWorkflow.php | 21 ++-- out/out.UpdateDocument.php | 21 ++-- out/out.UpdateDocument2.php | 19 +-- out/out.UserDefaultKeywords.php | 17 +-- out/out.UserImage.php | 13 ++- out/out.UserList.php | 19 +-- out/out.UsrMgr.php | 17 +-- out/out.UsrView.php | 17 +-- out/out.ViewDocument.php | 21 ++-- out/out.ViewEvent.php | 19 +-- out/out.ViewFolder.php | 19 +-- out/out.WorkflowActionsMgr.php | 17 +-- out/out.WorkflowGraph.php | 17 +-- out/out.WorkflowMgr.php | 17 +-- out/out.WorkflowStatesMgr.php | 17 +-- out/out.WorkflowSummary.php | 17 +-- views/bootstrap/class.Bootstrap.php | 4 +- 114 files changed, 1178 insertions(+), 1037 deletions(-) diff --git a/ext/example/class.example.php b/ext/example/class.example.php index ae68ecfe2..af5b8eee9 100644 --- a/ext/example/class.example.php +++ b/ext/example/class.example.php @@ -53,6 +53,28 @@ class SeedDMS_ExtExample extends SeedDMS_ExtBase { } /* }}} */ } +class SeedDMS_ExtExample_HomeController { /* {{{ */ + + protected $dms; + + protected $settings; + + public function __construct($dms, $settings) { + $this->dms = $dms; + $this->settings = $settings; + } + + public function home($request, $response, $args) { + $response->getBody()->write('Output of route /ext/example/home'.get_class($this->dms)); + return $response; + } + + public function echos($request, $response, $args) { + $response->getBody()->write('Output of route /ext/example/echo'); + return $response; + } +} /* }}} */ + /** * Class containing methods for hooks when the dms is initialized * @@ -72,7 +94,15 @@ class SeedDMS_ExtExample_InitDMS { /* {{{ */ $settings = $arr['settings']; $app = $arr['app']; - $app->get('/ext/example/echo', + $container = $app->getContainer(); + $container['HomeController'] = function($c) use ($dms, $settings) { +// $view = $c->get("view"); // retrieve the 'view' from the container + return new SeedDMS_ExtExample_HomeController($dms, $settings); + }; + + $app->get('/ext/example/home', 'HomeController:home'); + + $app->get('/ext/example/echos', function ($request, $response) use ($app) { echo "Output of route /ext/example/echo"; } diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php index 7ab085b95..de9e93a5c 100644 --- a/inc/inc.Authentication.php +++ b/inc/inc.Authentication.php @@ -25,7 +25,6 @@ if (!strncmp("/op", $refer, 3)) { } if (!isset($_COOKIE["mydms_session"])) { if($settings->_enableGuestLogin && $settings->_enableGuestAutoLogin) { - require_once("../inc/inc.ClassSession.php"); $session = new SeedDMS_Session($db); if(!$dms_session = $session->create(array('userid'=>$settings->_guestID, 'theme'=>$settings->_theme, 'lang'=>$settings->_language))) { header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); @@ -33,7 +32,6 @@ if (!isset($_COOKIE["mydms_session"])) { } $resArr = $session->load($dms_session); } elseif($settings->_autoLoginUser) { - require_once("../inc/inc.ClassSession.php"); if(!($user = $dms->getUser($settings->_autoLoginUser))/* || !$user->isGuest()*/) { header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer); exit; diff --git a/index.php b/index.php index 5b75be6d0..27fef289d 100644 --- a/index.php +++ b/index.php @@ -1,75 +1,78 @@ -withStatus(302) - ->withHeader('Location', isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_httpRoot.$settings->_siteDefaultPage : $settings->_httpRoot."out/out.ViewFolder.php"); - }; -}; -$app = new \Slim\App($c); - -if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) { - foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) { - if (method_exists($hookObj, 'addRoute')) { - $hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings)); - } - } -} - -/* -$app->any('/echo', - function ($request, $response) use ($app) { - echo "lasjf".$request->getBody(); - } -); - -$app->any('/[{path:.*}]', function($request, $response, $path = null) { - return $response->write($path ? 'subroute' : 'index'); -}); -*/ - -$app->run(); -exit; - -header("Location: ". (isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php")); -?> - - - SeedDMS - - - - - - - +getUri(); + if($uri->getBasePath()) + $file = $uri->getPath(); + else + $file = substr($uri->getPath(), 1); + if(file_exists($file)) { + $_SERVER['SCRIPT_FILENAME'] = basename($file); + include($file); + exit; + } +// print_r($request->getUri()); +// exit; + return $c['response'] + ->withStatus(302) + ->withHeader('Location', isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_httpRoot.$settings->_siteDefaultPage : $settings->_httpRoot."out/out.ViewFolder.php"); + }; + }; + $app = new \Slim\App($c); + + if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) { + foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) { + if (method_exists($hookObj, 'addRoute')) { + $hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings)); + } + } + } + + $app->run(); +} else { + + header("Location: ". (isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php")); +?> + + + SeedDMS + + + + + + + + diff --git a/op/op.LockDocument.php b/op/op.LockDocument.php index 7992ef05b..a72b873fa 100644 --- a/op/op.LockDocument.php +++ b/op/op.LockDocument.php @@ -18,15 +18,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index 1f693931e..82a68ec8e 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php index 0412c9ccf..e97f2cf98 100644 --- a/out/out.AddEvent.php +++ b/out/out.AddEvent.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.AddFile.php b/out/out.AddFile.php index 88f35e789..79ac15d08 100644 --- a/out/out.AddFile.php +++ b/out/out.AddFile.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.AddSubFolder.php b/out/out.AddSubFolder.php index a6c573278..42216d13d 100644 --- a/out/out.AddSubFolder.php +++ b/out/out.AddSubFolder.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php index 873222e61..506bcbde1 100644 --- a/out/out.AdminTools.php +++ b/out/out.AdminTools.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index 1e5091fa9..90999b694 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php index 1631740f8..5785e48e8 100644 --- a/out/out.ApproveDocument.php +++ b/out/out.ApproveDocument.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index e02d80b7c..51cf76ffe 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php index 3202da372..38ea9a04c 100644 --- a/out/out.BackupTools.php +++ b/out/out.BackupTools.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'contentdir'=>$settings->_contentDir)); diff --git a/out/out.Calendar.php b/out/out.Calendar.php index cad975bff..9247e28b4 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassCalendar.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.ClassCalendar.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Categories.php b/out/out.Categories.php index 5c359fe0e..fa1e86775 100644 --- a/out/out.Categories.php +++ b/out/out.Categories.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.CategoryChooser.php b/out/out.CategoryChooser.php index 44e7feb16..2ab2570b8 100644 --- a/out/out.CategoryChooser.php +++ b/out/out.CategoryChooser.php @@ -18,14 +18,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.Authentication.php"); $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]); $selcats = preg_replace('/[^0-9,]+/', '', $_GET["cats"]); diff --git a/out/out.ChangePassword.php b/out/out.ChangePassword.php index 48d781335..a19768f91 100644 --- a/out/out.ChangePassword.php +++ b/out/out.ChangePassword.php @@ -18,10 +18,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; diff --git a/out/out.Charts.php b/out/out.Charts.php index 84591584d..7114ad30f 100644 --- a/out/out.Charts.php +++ b/out/out.Charts.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ClearCache.php b/out/out.ClearCache.php index 96f0b1b7b..cd9a8775d 100644 --- a/out/out.ClearCache.php +++ b/out/out.ClearCache.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.Authentication.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.Authentication.php"); +require_once("inc/inc.ClassUI.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Clipboard.php b/out/out.Clipboard.php index 45c2e21fa..97587323b 100644 --- a/out/out.Clipboard.php +++ b/out/out.Clipboard.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.Authentication.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.Authentication.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.ClassUI.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.CreateIndex.php b/out/out.CreateIndex.php index 330f4fabe..d793fa577 100644 --- a/out/out.CreateIndex.php +++ b/out/out.CreateIndex.php @@ -20,15 +20,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Version.php"); -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Version.php"); +require_once("inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.DefaultKeywords.php b/out/out.DefaultKeywords.php index 0864b462c..85294f68a 100644 --- a/out/out.DefaultKeywords.php +++ b/out/out.DefaultKeywords.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.DocumentAccess.php b/out/out.DocumentAccess.php index e5c531cee..779e14e76 100644 --- a/out/out.DocumentAccess.php +++ b/out/out.DocumentAccess.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.DocumentChooser.php b/out/out.DocumentChooser.php index 0ebe87ae8..b6c7f4d2d 100644 --- a/out/out.DocumentChooser.php +++ b/out/out.DocumentChooser.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $folderid = intval($_GET["folderid"]); $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]); diff --git a/out/out.DocumentNotify.php b/out/out.DocumentNotify.php index 12018f791..0cdd88793 100644 --- a/out/out.DocumentNotify.php +++ b/out/out.DocumentNotify.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php index 8a53790fc..9f456e7bc 100644 --- a/out/out.DocumentVersionDetail.php +++ b/out/out.DocumentVersionDetail.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php index 54d6928ea..97cccfb37 100644 --- a/out/out.DropFolderChooser.php +++ b/out/out.DropFolderChooser.php @@ -18,14 +18,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if(isset($_GET["form"])) $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]); diff --git a/out/out.EditAttributes.php b/out/out.EditAttributes.php index e103c98d6..27af0bcd2 100644 --- a/out/out.EditAttributes.php +++ b/out/out.EditAttributes.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.EditComment.php b/out/out.EditComment.php index ff7884d2b..fbb700748 100644 --- a/out/out.EditComment.php +++ b/out/out.EditComment.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.EditDocument.php b/out/out.EditDocument.php index b0958904d..a4cfd8e72 100644 --- a/out/out.EditDocument.php +++ b/out/out.EditDocument.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.EditDocumentFile.php b/out/out.EditDocumentFile.php index 20499f566..8c7078f1a 100644 --- a/out/out.EditDocumentFile.php +++ b/out/out.EditDocumentFile.php @@ -17,16 +17,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.EditEvent.php b/out/out.EditEvent.php index b60b00075..6f72bcaba 100644 --- a/out/out.EditEvent.php +++ b/out/out.EditEvent.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Calendar.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Calendar.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php index b7d872dd1..5f0480a94 100644 --- a/out/out.EditFolder.php +++ b/out/out.EditFolder.php @@ -18,15 +18,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.EditOnline.php b/out/out.EditOnline.php index bfc5c6027..00af1f66a 100644 --- a/out/out.EditOnline.php +++ b/out/out.EditOnline.php @@ -18,15 +18,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.EditUserData.php b/out/out.EditUserData.php index 348723ef3..5e110fbaa 100644 --- a/out/out.EditUserData.php +++ b/out/out.EditUserData.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ErrorDlg.php b/out/out.ErrorDlg.php index 8b97683f6..bbea7a3ec 100644 --- a/out/out.ErrorDlg.php +++ b/out/out.ErrorDlg.php @@ -22,16 +22,17 @@ // This file is needed because SeedDMS_View_Bootstrap::htmlEndPage() includes // a file out/out.ErrorDlg.php?action=webrootjs and out/out.ErrorDlg.php?action=footerjs -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ExpiredDocuments.php b/out/out.ExpiredDocuments.php index b81b83a61..ebb635dc8 100644 --- a/out/out.ExpiredDocuments.php +++ b/out/out.ExpiredDocuments.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php index d75345e77..2e7e0e896 100644 --- a/out/out.ExtensionMgr.php +++ b/out/out.ExtensionMgr.php @@ -16,15 +16,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Version.php"); -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Version.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.FolderAccess.php b/out/out.FolderAccess.php index 970769c1a..08cf72877 100644 --- a/out/out.FolderAccess.php +++ b/out/out.FolderAccess.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.FolderChooser.php b/out/out.FolderChooser.php index 57023e9cc..0b47e55c1 100644 --- a/out/out.FolderChooser.php +++ b/out/out.FolderChooser.php @@ -18,14 +18,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]); $mode = intval($_GET["mode"]); diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php index ef667d9b9..e457802f9 100644 --- a/out/out.FolderNotify.php +++ b/out/out.FolderNotify.php @@ -18,15 +18,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ForcePasswordChange.php b/out/out.ForcePasswordChange.php index 67303faa9..0c78e3d4b 100644 --- a/out/out.ForcePasswordChange.php +++ b/out/out.ForcePasswordChange.php @@ -30,14 +30,15 @@ * @version Release: @package_version@ */ -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php index 7f61bdaf5..ca87a7e04 100644 --- a/out/out.GroupMgr.php +++ b/out/out.GroupMgr.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.GroupView.php b/out/out.GroupView.php index 8024323cb..f2fa399c4 100644 --- a/out/out.GroupView.php +++ b/out/out.GroupView.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Help.php b/out/out.Help.php index 705feb80e..dc8f2db78 100644 --- a/out/out.Help.php +++ b/out/out.Help.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1]); diff --git a/out/out.Hooks.php b/out/out.Hooks.php index 9eda3c44b..db3845254 100644 --- a/out/out.Hooks.php +++ b/out/out.Hooks.php @@ -16,14 +16,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php index af394806a..28ee7c482 100644 --- a/out/out.ImportFS.php +++ b/out/out.ImportFS.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.IndexInfo.php b/out/out.IndexInfo.php index 6e614a927..131c80965 100644 --- a/out/out.IndexInfo.php +++ b/out/out.IndexInfo.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Version.php"); -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Version.php"); +require_once("inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Indexer.php b/out/out.Indexer.php index 1e1ceb01e..ae66aa004 100644 --- a/out/out.Indexer.php +++ b/out/out.Indexer.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Version.php"); -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Version.php"); +require_once("inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Info.php b/out/out.Info.php index 09a382473..21f5b1483 100644 --- a/out/out.Info.php +++ b/out/out.Info.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Version.php"); -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Version.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.KeywordChooser.php b/out/out.KeywordChooser.php index 2903a375f..1c1ec862a 100644 --- a/out/out.KeywordChooser.php +++ b/out/out.KeywordChooser.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $allusers = $dms->getAllUsers(); $userids = array($user->getID()); diff --git a/out/out.LogManagement.php b/out/out.LogManagement.php index 0984e4fcd..b02839b41 100644 --- a/out/out.LogManagement.php +++ b/out/out.LogManagement.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Login.php b/out/out.Login.php index 4aa044fec..950750a7f 100644 --- a/out/out.Login.php +++ b/out/out.Login.php @@ -19,13 +19,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php index 6d2419fdb..49a9d7ba6 100644 --- a/out/out.ManageNotify.php +++ b/out/out.ManageNotify.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.MoveDocument.php b/out/out.MoveDocument.php index 4f9fcdb5c..674036c89 100644 --- a/out/out.MoveDocument.php +++ b/out/out.MoveDocument.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php index 3cace3498..e5b101f49 100644 --- a/out/out.MoveFolder.php +++ b/out/out.MoveFolder.php @@ -18,15 +18,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php index 27fbbd853..ee6bd0ab9 100644 --- a/out/out.MyAccount.php +++ b/out/out.MyAccount.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index 4af578678..298ca5b1a 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php index 43fbd4135..5f94a1966 100644 --- a/out/out.ObjectCheck.php +++ b/out/out.ObjectCheck.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Version.php"); -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Version.php"); +require_once("inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.OpensearchDesc.php b/out/out.OpensearchDesc.php index 8c4cc8d42..5d34d75b9 100644 --- a/out/out.OpensearchDesc.php +++ b/out/out.OpensearchDesc.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.OverrideContentStatus.php b/out/out.OverrideContentStatus.php index bb2c497d4..c7ef9d0d5 100644 --- a/out/out.OverrideContentStatus.php +++ b/out/out.OverrideContentStatus.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.PasswordForgotten.php b/out/out.PasswordForgotten.php index 81af10241..fddc18050 100644 --- a/out/out.PasswordForgotten.php +++ b/out/out.PasswordForgotten.php @@ -18,12 +18,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; diff --git a/out/out.PasswordSend.php b/out/out.PasswordSend.php index 81af10241..fddc18050 100644 --- a/out/out.PasswordSend.php +++ b/out/out.PasswordSend.php @@ -18,12 +18,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; diff --git a/out/out.RemoveArchive.php b/out/out.RemoveArchive.php index c8da8401b..fb5509962 100644 --- a/out/out.RemoveArchive.php +++ b/out/out.RemoveArchive.php @@ -16,15 +16,16 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +/ +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php index f82cea728..cd8363a28 100644 --- a/out/out.RemoveDocument.php +++ b/out/out.RemoveDocument.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.RemoveDocumentFile.php b/out/out.RemoveDocumentFile.php index 20499f566..8c7078f1a 100644 --- a/out/out.RemoveDocumentFile.php +++ b/out/out.RemoveDocumentFile.php @@ -17,16 +17,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.RemoveDump.php b/out/out.RemoveDump.php index f07777424..b42719c7c 100644 --- a/out/out.RemoveDump.php +++ b/out/out.RemoveDump.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveEvent.php b/out/out.RemoveEvent.php index 5b5c28ec6..9f695b96d 100644 --- a/out/out.RemoveEvent.php +++ b/out/out.RemoveEvent.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Calendar.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Calendar.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["id"]) || !is_numeric($_GET["id"]) || intval($_GET["id"])<1) { UI::exitError(getMLText("edit_event"),getMLText("error_occured")); diff --git a/out/out.RemoveFolder.php b/out/out.RemoveFolder.php index 35b40cc52..800e72195 100644 --- a/out/out.RemoveFolder.php +++ b/out/out.RemoveFolder.php @@ -18,15 +18,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveFolderFiles.php b/out/out.RemoveFolderFiles.php index 2151648d0..699dd449e 100644 --- a/out/out.RemoveFolderFiles.php +++ b/out/out.RemoveFolderFiles.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveGroup.php b/out/out.RemoveGroup.php index e1ffe181e..3116e9edf 100644 --- a/out/out.RemoveGroup.php +++ b/out/out.RemoveGroup.php @@ -18,14 +18,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveLog.php b/out/out.RemoveLog.php index 5910d9e9e..618009819 100644 --- a/out/out.RemoveLog.php +++ b/out/out.RemoveLog.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveUser.php b/out/out.RemoveUser.php index 541957199..ff062ae8d 100644 --- a/out/out.RemoveUser.php +++ b/out/out.RemoveUser.php @@ -18,14 +18,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveUserFromProcesses.php b/out/out.RemoveUserFromProcesses.php index 3948a5d78..c7e2afcb7 100644 --- a/out/out.RemoveUserFromProcesses.php +++ b/out/out.RemoveUserFromProcesses.php @@ -18,13 +18,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); diff --git a/out/out.RemoveVersion.php b/out/out.RemoveVersion.php index 547d7177f..9c982338e 100644 --- a/out/out.RemoveVersion.php +++ b/out/out.RemoveVersion.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.RemoveWorkflow.php b/out/out.RemoveWorkflow.php index a87592ed1..b94e6c444 100644 --- a/out/out.RemoveWorkflow.php +++ b/out/out.RemoveWorkflow.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RemoveWorkflowFromDocument.php b/out/out.RemoveWorkflowFromDocument.php index 9aed29ca8..9d7351aeb 100644 --- a/out/out.RemoveWorkflowFromDocument.php +++ b/out/out.RemoveWorkflowFromDocument.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ReturnFromSubWorkflow.php b/out/out.ReturnFromSubWorkflow.php index 1e877146f..5ddf54709 100644 --- a/out/out.ReturnFromSubWorkflow.php +++ b/out/out.ReturnFromSubWorkflow.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.ReviewDocument.php b/out/out.ReviewDocument.php index 122242008..58e9a05d5 100644 --- a/out/out.ReviewDocument.php +++ b/out/out.ReviewDocument.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 1e5091fa9..90999b694 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RewindWorkflow.php b/out/out.RewindWorkflow.php index 9aed29ca8..9d7351aeb 100644 --- a/out/out.RewindWorkflow.php +++ b/out/out.RewindWorkflow.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.RunSubWorkflow.php b/out/out.RunSubWorkflow.php index c8d1e8011..528cd21a4 100644 --- a/out/out.RunSubWorkflow.php +++ b/out/out.RunSubWorkflow.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Search.php b/out/out.Search.php index e2643ed86..bd2edbd2c 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); function getTime() { if (function_exists('microtime')) { diff --git a/out/out.SearchForm.php b/out/out.SearchForm.php index 36de4b92b..b70c6c617 100644 --- a/out/out.SearchForm.php +++ b/out/out.SearchForm.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) { $folderid=$settings->_rootFolderID; diff --git a/out/out.SendLoginData.php b/out/out.SendLoginData.php index 1ac00e443..bd8216498 100644 --- a/out/out.SendLoginData.php +++ b/out/out.SendLoginData.php @@ -18,13 +18,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); diff --git a/out/out.Session.php b/out/out.Session.php index cc6ac7e71..37b123ff5 100644 --- a/out/out.Session.php +++ b/out/out.Session.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); -include("../inc/inc.ClassAccessOperation.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); +require_once("inc/inc.ClassAccessOperation.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php index edec2d482..3edafd9e7 100644 --- a/out/out.SetExpires.php +++ b/out/out.SetExpires.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php index ceca25a3c..379c47086 100644 --- a/out/out.SetReviewersApprovers.php +++ b/out/out.SetReviewersApprovers.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.SetWorkflow.php b/out/out.SetWorkflow.php index 04b9d9d98..5ac1aacd8 100644 --- a/out/out.SetWorkflow.php +++ b/out/out.SetWorkflow.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.Settings.php b/out/out.Settings.php index c379177c7..0c3718d3a 100644 --- a/out/out.Settings.php +++ b/out/out.Settings.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Setup2Factor.php b/out/out.Setup2Factor.php index 2bbcc3007..f7f0672d9 100644 --- a/out/out.Setup2Factor.php +++ b/out/out.Setup2Factor.php @@ -11,13 +11,14 @@ * @version Release: @package_version@ */ -include("../inc/inc.Settings.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Statistic.php b/out/out.Statistic.php index e5b025637..ec6f0ecdd 100644 --- a/out/out.Statistic.php +++ b/out/out.Statistic.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.SubstituteUser.php b/out/out.SubstituteUser.php index 295ee3bb5..c4bce86bb 100644 --- a/out/out.SubstituteUser.php +++ b/out/out.SubstituteUser.php @@ -16,16 +16,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1]); diff --git a/out/out.Tasks.php b/out/out.Tasks.php index 3c0df220e..2babf09eb 100644 --- a/out/out.Tasks.php +++ b/out/out.Tasks.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.Authentication.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.Authentication.php"); +require_once("inc/inc.ClassUI.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.Timeline.php b/out/out.Timeline.php index 17b5412ab..b29f9f541 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.TransferDocument.php b/out/out.TransferDocument.php index 7d423e1f1..dbafb6411 100644 --- a/out/out.TransferDocument.php +++ b/out/out.TransferDocument.php @@ -18,16 +18,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.TransferObjects.php b/out/out.TransferObjects.php index 5831d6807..b2a0095c8 100644 --- a/out/out.TransferObjects.php +++ b/out/out.TransferObjects.php @@ -18,13 +18,14 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!$user->isAdmin()) { UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); diff --git a/out/out.TriggerWorkflow.php b/out/out.TriggerWorkflow.php index 126103692..bcbc988fc 100644 --- a/out/out.TriggerWorkflow.php +++ b/out/out.TriggerWorkflow.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php index 92433bff9..796c8852f 100644 --- a/out/out.UpdateDocument.php +++ b/out/out.UpdateDocument.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.UpdateDocument2.php b/out/out.UpdateDocument2.php index 88803a176..c3f760fa8 100644 --- a/out/out.UpdateDocument2.php +++ b/out/out.UpdateDocument2.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); diff --git a/out/out.UserDefaultKeywords.php b/out/out.UserDefaultKeywords.php index d78691960..ce75d1273 100644 --- a/out/out.UserDefaultKeywords.php +++ b/out/out.UserDefaultKeywords.php @@ -18,14 +18,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.UserImage.php b/out/out.UserImage.php index 85c951760..a71891312 100644 --- a/out/out.UserImage.php +++ b/out/out.UserImage.php @@ -18,12 +18,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.Authentication.php"); /* Get the user as passed to the script. This allows to show * pictures of other users as well diff --git a/out/out.UserList.php b/out/out.UserList.php index 6b17312df..752ce0fd4 100644 --- a/out/out.UserList.php +++ b/out/out.UserList.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); -include("../inc/inc.ClassPasswordStrength.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); +require_once("inc/inc.ClassPasswordStrength.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php index 99e70f3f1..a0595a00d 100644 --- a/out/out.UsrMgr.php +++ b/out/out.UsrMgr.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.UsrView.php b/out/out.UsrView.php index db19bb304..01fb0d9b8 100644 --- a/out/out.UsrView.php +++ b/out/out.UsrView.php @@ -17,14 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php index 1fd66e748..dbd1c8801 100644 --- a/out/out.ViewDocument.php +++ b/out/out.ViewDocument.php @@ -19,16 +19,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.ClassAccessOperation.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.ClassAccessOperation.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ViewEvent.php b/out/out.ViewEvent.php index a19d60484..4abac08c9 100644 --- a/out/out.ViewEvent.php +++ b/out/out.ViewEvent.php @@ -17,15 +17,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Calendar.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Calendar.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php index c48e243e5..76f10a721 100644 --- a/out/out.ViewFolder.php +++ b/out/out.ViewFolder.php @@ -19,15 +19,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Utils.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.Authentication.php"); -include("../inc/inc.ClassUI.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Utils.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.Authentication.php"); +require_once("inc/inc.ClassUI.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.WorkflowActionsMgr.php b/out/out.WorkflowActionsMgr.php index 84593a195..85d133967 100644 --- a/out/out.WorkflowActionsMgr.php +++ b/out/out.WorkflowActionsMgr.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.WorkflowGraph.php b/out/out.WorkflowGraph.php index 0ea650493..290494e3c 100644 --- a/out/out.WorkflowGraph.php +++ b/out/out.WorkflowGraph.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.WorkflowMgr.php b/out/out.WorkflowMgr.php index b56414147..061ad0a87 100644 --- a/out/out.WorkflowMgr.php +++ b/out/out.WorkflowMgr.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.WorkflowStatesMgr.php b/out/out.WorkflowStatesMgr.php index fe226f977..1a1bd40dc 100644 --- a/out/out.WorkflowStatesMgr.php +++ b/out/out.WorkflowStatesMgr.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php index e76e17833..3bca0ba67 100644 --- a/out/out.WorkflowSummary.php +++ b/out/out.WorkflowSummary.php @@ -19,14 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); -include("../inc/inc.Language.php"); -include("../inc/inc.Init.php"); -include("../inc/inc.Extension.php"); -include("../inc/inc.DBInit.php"); -include("../inc/inc.ClassUI.php"); -include("../inc/inc.Authentication.php"); +if(!isset($settings)) + require_once("../inc/inc.Settings.php"); +require_once("inc/inc.LogInit.php"); +require_once("inc/inc.Language.php"); +require_once("inc/inc.Init.php"); +require_once("inc/inc.Extension.php"); +require_once("inc/inc.DBInit.php"); +require_once("inc/inc.ClassUI.php"); +require_once("inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 279222dba..d0550a325 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1466,9 +1466,9 @@ $(document).ready(function() { function getImgPath($img) { /* {{{ */ - if ( is_file($this->imgpath.$img) ) { +// if ( is_file($this->imgpath.$img) ) { return $this->imgpath.$img; - } +// } return ""; } /* }}} */