From 280a9b4b71864f7303391e61203f8540a57c96de Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Mar 2016 09:29:38 +0100 Subject: [PATCH 01/20] add entry for 4.3.25 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 640df1138..6b5d37625 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - send notification if folder is deleted by ajax call - add page ImportFS for mass importing files from drop folder - add initial version for editing text files online +- further pages with content security policy turned on -------------------------------------------------------------------------------- Changes in version 4.3.24 From f332371dde5a06b92c4aa3bf13c8936391e5e7b8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Mar 2016 15:59:45 +0100 Subject: [PATCH 02/20] create 'notindexed' option in CREATE TABLE for sqlite < 3.8.0 --- SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php index a6eb09aa6..1116616a6 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php @@ -61,7 +61,11 @@ class SeedDMS_SQLiteFTS_Indexer { /* Make sure the sequence of fields is identical to the field list * in SeedDMS_SQLiteFTS_Term */ - $sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, notindexed=created, matchinfo=fts3)'; + $version = SQLite3::version(); + if($version['versionNumber'] >= 3008000) + $sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, notindexed=created, matchinfo=fts3)'; + else + $sql = 'CREATE VIRTUAL TABLE docs USING fts4(title, comment, keywords, category, mimetype, origfilename, owner, content, created, matchinfo=fts3)'; $res = $index->_conn->exec($sql); if($res === false) { return null; From d659a5bd61ca202ed6d3a16acb3ff33fac067e1e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Mar 2016 16:00:16 +0100 Subject: [PATCH 03/20] new version 1.0.4 --- SeedDMS_SQLiteFTS/package.xml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml index 87d9735d9..2e88b8b6e 100644 --- a/SeedDMS_SQLiteFTS/package.xml +++ b/SeedDMS_SQLiteFTS/package.xml @@ -11,10 +11,10 @@ uwe@steinmann.cx yes - 2016-02-01 - + 2016-03-15 + - 1.0.3 + 1.0.4 1.0.1 @@ -23,7 +23,7 @@ GPL License -add command for indexing postѕcript files +make it work with sqlite3 < 3.8.0 @@ -114,5 +114,21 @@ add __get() to SQLiteFTS_Document because class.IndexInfo.php access class varia check if index exists before removing it when creating a new one + + 2016-02-01 + + + 1.0.3 + 1.0.1 + + + stable + stable + + GPL License + +add command for indexing postѕcript files + + From 27986fa4e2a784c2edb09143f70c45a8f635feaf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 15 Mar 2016 16:00:42 +0100 Subject: [PATCH 04/20] remove print_r() --- views/bootstrap/class.Indexer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php index 996b9e85e..6eb3d2db0 100644 --- a/views/bootstrap/class.Indexer.php +++ b/views/bootstrap/class.Indexer.php @@ -70,7 +70,6 @@ class SeedDMS_View_Indexer extends SeedDMS_Bootstrap_Style { $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, $this->converters ? $this->converters : null, false, $this->timeout)); echo $indent."(document updated)"; } catch(Exception $e) { - print_r($e); echo $indent."(updating document failed)"; } } From 90e1c351878a1739267c6b15d0010e6a20b1be83 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 09:29:37 +0100 Subject: [PATCH 05/20] fix selection of file, remove some old javascript only the first document in the list could be selected --- views/bootstrap/class.DropFolderChooser.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php index 849ca2062..4882c6782 100644 --- a/views/bootstrap/class.DropFolderChooser.php +++ b/views/bootstrap/class.DropFolderChooser.php @@ -34,7 +34,7 @@ class SeedDMS_View_DropFolderChooser extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ header('Content-Type: application/javascript'); ?> -$('#fileselect').click(function(ev) { +$('.fileselect').click(function(ev) { attr_filename = $(ev.currentTarget).attr('filename'); fileSelected(attr_filename); }); @@ -58,17 +58,6 @@ $('#folderselect').click(function(ev) { $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); -// $this->htmlStartPage(getMLText("choose_target_file")); -// $this->globalBanner(); -// $this->pageNavigation(getMLText("choose_target_file")); -?> - - -contentContainerStart(); - $dir = $dropfolderdir.'/'.$user->getLogin(); /* Check if we are still looking in the configured directory and * not somewhere else, e.g. if the login was '../test' @@ -91,7 +80,7 @@ var targetName = document..dropfolderfile; if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) { echo ""; } - echo "".$entry."".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."\n"; + echo "".$entry."".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."\n"; } elseif($showfolders) { echo ""; echo ""; @@ -105,10 +94,6 @@ var targetName = document..dropfolderfile; echo ''."\n"; } } - -// $this->contentContainerEnd(); -// echo "\n\n"; -// $this->htmlEndPage(); } /* }}} */ } ?> From 86cdb4e2fa89a2237985ff8a236510496a322f47 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 09:38:24 +0100 Subject: [PATCH 06/20] fix inserting personal keyword was still using old javascript code --- views/bootstrap/class.KeywordChooser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.KeywordChooser.php b/views/bootstrap/class.KeywordChooser.php index 57b98595d..a76dff632 100644 --- a/views/bootstrap/class.KeywordChooser.php +++ b/views/bootstrap/class.KeywordChooser.php @@ -198,7 +198,7 @@ myTA.focus(); else { print ""; } From 8a4e558f4bb94449ce9d150443a31397a59afef6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 12:41:17 +0100 Subject: [PATCH 07/20] place all javascript into external file --- out/out.AddDocument.php | 15 ++++++- views/bootstrap/class.AddDocument.php | 56 ++++++++++++++------------- 2 files changed, 42 insertions(+), 29 deletions(-) diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index 2a4320bde..4332a1958 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -46,9 +46,20 @@ if($settings->_quota > 0) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload); + $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); + $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); + $view->setParam('enableselfrevapp', $settings->_enableSelfRevApp); + $view->setParam('dropfolderdir', $settings->_dropFolderDir); + $view->setParam('workflowmode', $settings->_workflowMode); + $view->setParam('presetexpiration', $settings->_presetExpirationDate); + $view->setParam('sortusersinlist', $settings->_sortUsersInList); + $view->setParam('orderby', $settings->_sortFoldersDefault); + $view($_GET); exit; } diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index e2f04e8af..f73146525 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -31,29 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $enablelargefileupload = $this->params['enablelargefileupload']; - $enableadminrevapp = $this->params['enableadminrevapp']; - $enableownerrevapp = $this->params['enableownerrevapp']; - $enableselfrevapp = $this->params['enableselfrevapp']; - $strictformcheck = $this->params['strictformcheck']; - $dropfolderdir = $this->params['dropfolderdir']; - $workflowmode = $this->params['workflowmode']; - $presetexpiration = $this->params['presetexpiration']; - $sortusersinlist = $this->params['sortusersinlist']; - $orderby = $this->params['orderby']; - $folderid = $folder->getId(); - - $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); - + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - printKeywordChooserJs("form1"); + $this->printDropFolderChooserJs("form1"); + } /* }}} */ + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $enablelargefileupload = $this->params['enablelargefileupload']; + $enableadminrevapp = $this->params['enableadminrevapp']; + $enableownerrevapp = $this->params['enableownerrevapp']; + $enableselfrevapp = $this->params['enableselfrevapp']; + $strictformcheck = $this->params['strictformcheck']; + $dropfolderdir = $this->params['dropfolderdir']; + $workflowmode = $this->params['workflowmode']; + $presetexpiration = $this->params['presetexpiration']; + $sortusersinlist = $this->params['sortusersinlist']; + $orderby = $this->params['orderby']; + $folderid = $folder->getId(); + + $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); + $msg = getMLText("max_upload_size").": ".ini_get( "upload_max_filesize"); if($enablelargefileupload) { $msg .= "

".sprintf(getMLText('link_alt_updatedocument'), "out.AddMultiDocument.php?folderid=".$folderid."&showtree=".showtree())."

"; @@ -125,7 +127,7 @@ $(document).ready(function() { : - printKeywordChooser("form1");?> + printKeywordChooserHtml("form1");?> : @@ -204,7 +206,7 @@ $(document).ready(function() { : - printDropFolderChooser("form1");?> + printDropFolderChooserHtml("form1");?> From 79cb2b3b2cb7ea81ce018cb7ea257f7c1ae94855 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 12:57:55 +0100 Subject: [PATCH 08/20] add form check --- views/bootstrap/class.AddDocument.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index f73146525..e835f0b36 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -65,6 +65,10 @@ function checkForm() } $(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); $('#new-file').click(function(event) { $("#upload-file").clone().appendTo("#upload-files").removeAttr("id").children('div').children('input').val(''); }); @@ -107,7 +111,7 @@ $(document).ready(function() { // privileges. $docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp); ?> -
+ From 71b8cd7311605e04b66e3e7232ba09a3bcbf93c4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 12:58:18 +0100 Subject: [PATCH 09/20] place js into extra file --- out/out.AddEvent.php | 2 +- views/bootstrap/class.AddEvent.php | 39 +++++++++++++++++++----------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php index 344bb7dde..8776bae24 100644 --- a/out/out.AddEvent.php +++ b/out/out.AddEvent.php @@ -29,7 +29,7 @@ if ($user->isGuest()) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view($_GET); exit; } diff --git a/views/bootstrap/class.AddEvent.php b/views/bootstrap/class.AddEvent.php index 542e8572a..ab41e44d4 100644 --- a/views/bootstrap/class.AddEvent.php +++ b/views/bootstrap/class.AddEvent.php @@ -31,19 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_AddEvent extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - - $this->htmlStartPage(getMLText("calendar")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation("", "calendar"); - - $this->contentHeading(getMLText("add_event")); - $this->contentContainerStart(); - - $expdate = date('Y-m-d'); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); +htmlStartPage(getMLText("calendar")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation("", "calendar"); + + $this->contentHeading(getMLText("add_event")); + $this->contentContainerStart(); + + $expdate = date('Y-m-d'); +?> + + From 7c3bc05d6e876921ad46c7ba5c322e50318bb019 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 13:09:06 +0100 Subject: [PATCH 10/20] some code reorganisation --- out/out.AddFile.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/out/out.AddFile.php b/out/out.AddFile.php index e25a533f5..a878066e8 100644 --- a/out/out.AddFile.php +++ b/out/out.AddFile.php @@ -46,8 +46,12 @@ if ($document->getAccessMode($user) < M_READWRITE) { $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload); $view->setParam('accessobject', $accessop); $view($_GET); exit; From a758b29369a50f45aa7958e840f1928d903273ad Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 15:04:17 +0100 Subject: [PATCH 11/20] place javascript into external file --- out/out.AddSubFolder.php | 7 +++-- views/bootstrap/class.AddSubFolder.php | 42 ++++++++++++++++---------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/out/out.AddSubFolder.php b/out/out.AddSubFolder.php index c737043e6..f5d7c7943 100644 --- a/out/out.AddSubFolder.php +++ b/out/out.AddSubFolder.php @@ -39,9 +39,12 @@ if ($folder->getAccessMode($user) < M_READWRITE) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('orderby', $settings->_sortFoldersDefault); + $view($_GET); exit; } diff --git a/views/bootstrap/class.AddSubFolder.php b/views/bootstrap/class.AddSubFolder.php index efecd0fb2..bf03618bf 100644 --- a/views/bootstrap/class.AddSubFolder.php +++ b/views/bootstrap/class.AddSubFolder.php @@ -31,21 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_AddSubFolder extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $strictformcheck = $this->params['strictformcheck']; - $orderby = $this->params['orderby']; - - $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); - $this->contentHeading(getMLText("add_subfolder")); - $this->contentContainerStart(); + function js() { /* {{{ */ + header('Content-Type: application/javascript'); ?> - +$(document).ready( function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $strictformcheck = $this->params['strictformcheck']; + $orderby = $this->params['orderby']; + + $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); + $this->contentHeading(getMLText("add_subfolder")); + $this->contentContainerStart(); +?> + + From cfaa11a02c655f815fdc21a8bb68f4df88fdf27c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 15:11:33 +0100 Subject: [PATCH 12/20] turn on csp by adding method js() --- out/out.Calendar.php | 9 +++++++-- views/bootstrap/class.Calendar.php | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/out/out.Calendar.php b/out/out.Calendar.php index c6c46e433..b9355e67f 100644 --- a/out/out.Calendar.php +++ b/out/out.Calendar.php @@ -36,9 +36,14 @@ if (isset($_GET["day"])&&is_numeric($_GET["day"])) $day=$_GET["day"]; else $day = (int)date("d", $currDate); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user,'mode'=>$mode, 'year'=>$year, 'month'=>$month, 'day'=>$day, 'firstdayofweek'=>$settings->_firstDayOfWeek)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('mode', $mode); + $view->setParam('year', $year); + $view->setParam('month', $month); + $view->setParam('day', $day); + $view->setParam('firstdayofweek', $settings->_firstDayOfWeek); + $view($_GET); exit; } diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php index 7ca947308..816e56d86 100644 --- a/views/bootstrap/class.Calendar.php +++ b/views/bootstrap/class.Calendar.php @@ -182,6 +182,10 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style { print "
:
\n"; } /* }}} */ + function js() { /* {{{ */ + header('Content-Type: application/javascript'); + } /* }}} */ + function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; From 88fd6a1dc4e46d9973d1ac918dcdc9a5b0f4f8b6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 20:09:48 +0100 Subject: [PATCH 13/20] use new invocation of view --- out/out.AddFile2.php | 6 ++++-- out/out.AddMultiDocument.php | 8 ++++++-- out/out.AdminTools.php | 6 ++++-- out/out.ApprovalSummary.php | 7 +++++-- out/out.ApproveDocument.php | 6 ++++-- out/out.AttributeMgr.php | 4 +++- out/out.CategoryChooser.php | 7 +++++-- out/out.ChangePassword.php | 2 +- out/out.CreateIndex.php | 5 +++-- out/out.DocumentAccess.php | 6 +++++- out/out.DocumentVersionDetail.php | 12 ++++++++++-- out/out.DropFolderChooser.php | 5 ++++- out/out.EditAttributes.php | 8 ++++++-- out/out.EditComment.php | 8 ++++++-- out/out.EditEvent.php | 6 ++++-- out/out.EditFolder.php | 9 +++++++-- out/out.FolderAccess.php | 8 ++++++-- out/out.FolderNotify.php | 8 ++++++-- out/out.ForcePasswordChange.php | 5 +++-- out/out.GroupView.php | 6 ++++-- out/out.Help.php | 2 +- out/out.IndexInfo.php | 7 +++++-- out/out.Indexer.php | 10 ++++++++-- out/out.Info.php | 6 ++++-- out/out.MoveFolder.php | 6 ++++-- out/out.MyAccount.php | 8 ++++++-- out/out.MyDocuments.php | 10 ++++++++-- out/out.OverrideContentStatus.php | 7 +++++-- out/out.PasswordForgotten.php | 2 +- out/out.PasswordSend.php | 2 +- out/out.RemoveArchive.php | 5 +++-- out/out.RemoveDocument.php | 6 ++++-- out/out.RemoveDocumentFile.php | 7 +++++-- out/out.RemoveDump.php | 5 +++-- out/out.RemoveEvent.php | 5 +++-- out/out.RemoveFolder.php | 5 +++-- out/out.RemoveFolderFiles.php | 5 +++-- out/out.RemoveGroup.php | 5 +++-- out/out.RemoveLog.php | 6 ++++-- out/out.RemoveUser.php | 6 ++++-- out/out.RemoveVersion.php | 7 +++++-- out/out.RemoveWorkflow.php | 5 +++-- out/out.RemoveWorkflowFromDocument.php | 7 +++++-- out/out.ReturnFromSubWorkflow.php | 8 ++++++-- out/out.ReviewDocument.php | 7 +++++-- out/out.ReviewSummary.php | 7 +++++-- out/out.RewindWorkflow.php | 7 +++++-- out/out.RunSubWorkflow.php | 8 ++++++-- out/out.SearchForm.php | 9 +++++++-- out/out.SetExpires.php | 6 ++++-- out/out.SetReviewersApprovers.php | 10 ++++++++-- out/out.SetWorkflow.php | 7 +++++-- out/out.TriggerWorkflow.php | 8 ++++++-- out/out.UpdateDocument2.php | 6 ++++-- out/out.UserDefaultKeywords.php | 5 +++-- out/out.UsrView.php | 7 +++++-- out/out.ViewEvent.php | 5 +++-- out/out.WorkflowActionsMgr.php | 6 ++++-- out/out.WorkflowGraph.php | 7 +++++-- out/out.WorkflowMgr.php | 7 +++++-- out/out.WorkflowStatesMgr.php | 5 +++-- out/out.WorkflowSummary.php | 8 ++++++-- 62 files changed, 282 insertions(+), 117 deletions(-) diff --git a/out/out.AddFile2.php b/out/out.AddFile2.php index aea528765..fe918991e 100644 --- a/out/out.AddFile2.php +++ b/out/out.AddFile2.php @@ -43,9 +43,11 @@ if ($document->getAccessMode($user) < M_READWRITE) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view($_GET); exit; } diff --git a/out/out.AddMultiDocument.php b/out/out.AddMultiDocument.php index 049f962ed..6fc9a37db 100644 --- a/out/out.AddMultiDocument.php +++ b/out/out.AddMultiDocument.php @@ -42,9 +42,13 @@ if ($folder->getAccessMode($user) < M_READWRITE) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); + $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); + $view->setParam('enableselfrevapp', $settings->_enableSelfRevApp); + $view($_GET); exit; } diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php index 86aacc592..cd3e9506d 100644 --- a/out/out.AdminTools.php +++ b/out/out.AdminTools.php @@ -27,9 +27,11 @@ if (!$user->isAdmin()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enablefullsearch'=>$settings->_enableFullSearch, 'logfileenable'=>$settings->_logFileEnable)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('enablefullsearch', $settings->_enableFullSearch); + $view->setParam('logfileenable', $settings->_logFileEnable); + $view($_GET); exit; } diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php index db2f0813d..d2a838a64 100644 --- a/out/out.ApprovalSummary.php +++ b/out/out.ApprovalSummary.php @@ -34,9 +34,12 @@ if ($user->isGuest()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('timeout', $settings->_cmdTimeout); + $view($_GET); exit; } diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php index 110e3c5f0..e02e2b567 100644 --- a/out/out.ApproveDocument.php +++ b/out/out.ApproveDocument.php @@ -71,10 +71,12 @@ if(!$approvals) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php index 142a41d19..87a8bcc7a 100644 --- a/out/out.AttributeMgr.php +++ b/out/out.AttributeMgr.php @@ -43,8 +43,10 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'attrdefs'=>$attrdefs, 'selattrdef'=>$selattrdef)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('attrdefs', $attrdefs); + $view->setParam('selattrdef', $selattrdef); $view->setParam('showtree', showtree()); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); diff --git a/out/out.CategoryChooser.php b/out/out.CategoryChooser.php index f1eb7c20f..47ade1e7b 100644 --- a/out/out.CategoryChooser.php +++ b/out/out.CategoryChooser.php @@ -28,9 +28,12 @@ $selcats = preg_replace('/[^0-9,]+/', '', $_GET["cats"]); $categories = $dms->getDocumentCategories(); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories, 'form'=>$form, 'selcats'=>$selcats)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('categories', $categories); + $view->setParam('form', $form); + $view->setParam('selcats', $selcats); + $view($_GET); exit; } diff --git a/out/out.ChangePassword.php b/out/out.ChangePassword.php index b414f4e16..9663d7281 100644 --- a/out/out.ChangePassword.php +++ b/out/out.ChangePassword.php @@ -39,7 +39,7 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referui'=>$referui, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength)); if($view) { - $view->show(); + $view($_GET); exit; } diff --git a/out/out.CreateIndex.php b/out/out.CreateIndex.php index 795c1ba99..229a5872e 100644 --- a/out/out.CreateIndex.php +++ b/out/out.CreateIndex.php @@ -36,9 +36,10 @@ if(!$settings->_enableFullSearch) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enablefullsearch'=>$settings->_enableFullSearch)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('enablefullsearch', $settings->_enableFullSearch); + $view($_GET); exit; } diff --git a/out/out.DocumentAccess.php b/out/out.DocumentAccess.php index 64de1396f..cfb5f2f41 100644 --- a/out/out.DocumentAccess.php +++ b/out/out.DocumentAccess.php @@ -48,8 +48,12 @@ $allGroups = $dms->getAllGroups(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'allusers'=>$allUsers, 'allgroups'=>$allGroups)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('allusers', $allUsers); + $view->setParam('allgroups', $allGroups); $view->setParam('accessobject', $accessop); $view($_GET); exit; diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php index e7ff437b4..6342e6092 100644 --- a/out/out.DocumentVersionDetail.php +++ b/out/out.DocumentVersionDetail.php @@ -68,10 +68,18 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewWidthDetail'=>$settings->_previewWidthDetail, 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); + $view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes); + $view->setParam('enableversionmodification', $settings->_enableVersionModification); + $view->setParam('previewWidthDetail', $settings->_previewWidthDetail); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php index 2365dc8d2..34e45e243 100644 --- a/out/out.DropFolderChooser.php +++ b/out/out.DropFolderChooser.php @@ -42,8 +42,11 @@ else $showfolders = false; $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'dropfolderdir'=>$dropfolderdir, 'dropfolderfile'=>$_GET["dropfolderfile"], 'form'=>$form)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('dropfolderdir', $dropfolderdir); + $view->setParam('dropfolderfile', $_GET["dropfolderfile"]); + $view->setParam('form', $form); $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('timeout', $settings->_cmdTimeout); diff --git a/out/out.EditAttributes.php b/out/out.EditAttributes.php index eedb18f72..be26f886b 100644 --- a/out/out.EditAttributes.php +++ b/out/out.EditAttributes.php @@ -49,10 +49,14 @@ $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'attrdefs'=>$attrdefs)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); + $view->setParam('attrdefs', $attrdefs); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.EditComment.php b/out/out.EditComment.php index 0fe44c67a..f7f4c8eb4 100644 --- a/out/out.EditComment.php +++ b/out/out.EditComment.php @@ -52,10 +52,14 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'strictformcheck'=>$settings->_strictFormCheck)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); + $view->setParam('strictformcheck', $settings->_strictFormCheck); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.EditEvent.php b/out/out.EditEvent.php index 71c418db3..e070d9c2a 100644 --- a/out/out.EditEvent.php +++ b/out/out.EditEvent.php @@ -41,9 +41,11 @@ if (($user->getID()!=$event["userID"])&&(!$user->isAdmin())){ } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'event'=>$event, 'strictformcheck'=>$settings->_strictFormCheck)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('event', $event); + $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view($_GET); exit; } diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php index 89e2497bc..1c6ced73b 100644 --- a/out/out.EditFolder.php +++ b/out/out.EditFolder.php @@ -40,9 +40,14 @@ if ($folder->getAccessMode($user) < M_READWRITE) { $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all)); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'rootfolderid'=>$settings->_rootFolderID, 'orderby'=>$settings->_sortFoldersDefault)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('attrdefs', $attrdefs); + $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view->setParam('rootfolderid', $settings->_rootFolderID); + $view->setParam('orderby', $settings->_sortFoldersDefault); + $view($_GET); exit; } diff --git a/out/out.FolderAccess.php b/out/out.FolderAccess.php index c4ccd5780..a7fc41866 100644 --- a/out/out.FolderAccess.php +++ b/out/out.FolderAccess.php @@ -42,9 +42,13 @@ $allUsers = $dms->getAllUsers(); $allGroups = $dms->getAllGroups(); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'allusers'=>$allUsers, 'allgroups'=>$allGroups, 'rootfolderid'=>$settings->_rootFolderID)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('allusers', $allUsers); + $view->setParam('allgroups', $allGroups); + $view->setParam('rootfolderid', $settings->_rootFolderID); + $view($_GET); exit; } diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php index af4a03b52..a064cc874 100644 --- a/out/out.FolderNotify.php +++ b/out/out.FolderNotify.php @@ -42,9 +42,13 @@ $allUsers = $dms->getAllUsers($settings->_sortUsersInList); $allGroups = $dms->getAllGroups(); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'allusers'=>$allUsers, 'allgroups'=>$allGroups, 'strictformcheck'=>$settings->_strictFormCheck)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('allusers', $allUsers); + $view->setParam('allgroups', $allGroups); + $view->setParam('strictformcheck', $settings->_strictFormCheck); + $view($_GET); exit; } diff --git a/out/out.ForcePasswordChange.php b/out/out.ForcePasswordChange.php index 702e466cf..707fd34e9 100644 --- a/out/out.ForcePasswordChange.php +++ b/out/out.ForcePasswordChange.php @@ -18,9 +18,10 @@ include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'passwordstrength'=>$settings->_passwordStrength)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('passwordstrength', $settings->_passwordStrength); + $view($_GET); exit; } diff --git a/out/out.GroupView.php b/out/out.GroupView.php index 7e9402165..719998475 100644 --- a/out/out.GroupView.php +++ b/out/out.GroupView.php @@ -41,9 +41,11 @@ if (is_bool($allGroups)) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'allusers'=>$allUsers, 'allgroups'=>$allGroups)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('allusers', $allUsers); + $view->setParam('allgroups', $allGroups); + $view($_GET); exit; } diff --git a/out/out.Help.php b/out/out.Help.php index e68154dae..e2eec938f 100644 --- a/out/out.Help.php +++ b/out/out.Help.php @@ -33,7 +33,7 @@ if($view) { $view->setParam('dms', $dms); $view->setParam('user', $user); $view->setParam('context', $context); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.IndexInfo.php b/out/out.IndexInfo.php index 5c5cb3cc1..0a4a1d630 100644 --- a/out/out.IndexInfo.php +++ b/out/out.IndexInfo.php @@ -40,9 +40,12 @@ if(!$index) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'luceneclassdir'=>$settings->_luceneClassDir, 'lucenedir'=>$settings->_luceneDir, 'index'=>$index)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('luceneclassdir', $settings->_luceneClassDir); + $view->setParam('lucenedir', $settings->_luceneDir); + $view->setParam('index', $index); + $view($_GET); exit; } diff --git a/out/out.Indexer.php b/out/out.Indexer.php index 5f99225d3..d1fa1b97f 100644 --- a/out/out.Indexer.php +++ b/out/out.Indexer.php @@ -63,9 +63,15 @@ else { $folder = $dms->getFolder($folderid); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'index'=>$index, 'indexconf'=>$indexconf, 'recreate'=>(isset($_GET['create']) && $_GET['create']==1), 'folder'=>$folder, 'converters'=>$settings->_converters['fulltext'], 'timeout'=>$settings->_cmdTimeout)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('index', $index); + $view->setParam('indexconf', $indexconf); + $view->setParam('recreate', (isset($_GET['create']) && $_GET['create']==1)); + $view->setParam('folder', $folder); + $view->setParam('converters', $settings->_converters['fulltext']); + $view->setParam('timeout', $settings->_cmdTimeout); + $view($_GET); exit; } diff --git a/out/out.Info.php b/out/out.Info.php index 22caf8f8d..bc9c10a4c 100644 --- a/out/out.Info.php +++ b/out/out.Info.php @@ -41,9 +41,11 @@ if(@ini_get('allow_url_fopen') == '1') { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'version'=>$v, 'availversions'=>$versions)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('version', $v); + $view->setParam('availversions', $versions); + $view($_GET); exit; } diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php index 17a7de21f..5159d7eb0 100644 --- a/out/out.MoveFolder.php +++ b/out/out.MoveFolder.php @@ -61,9 +61,11 @@ if(isset($_GET['targetid']) && $_GET['targetid']) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'target'=>$target)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('target', $target); + $view($_GET); exit; } diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php index 15f1b7e5d..c9a314e89 100644 --- a/out/out.MyAccount.php +++ b/out/out.MyAccount.php @@ -29,9 +29,13 @@ if ($user->isGuest()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enableuserimage'=>$settings->_enableUserImage, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'quota'=>$settings->_quota)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('enableuserimage', $settings->_enableUserImage); + $view->setParam('passwordexpiration', $settings->_passwordExpiration); + $view->setParam('httproot', $settings->_httpRoot); + $view->setParam('quota', $settings->_quota); + $view($_GET); exit; } diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php index bc9ae7df9..4fdc2a0ed 100644 --- a/out/out.MyDocuments.php +++ b/out/out.MyDocuments.php @@ -46,9 +46,15 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('orderby', $orderby); + $view->setParam('showinprocess', $showInProcess); + $view->setParam('workflowmode', $settings->_workflowMode); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('timeout', $settings->_cmdTimeout); + $view($_GET); exit; } diff --git a/out/out.OverrideContentStatus.php b/out/out.OverrideContentStatus.php index aed70551d..5eba0babc 100644 --- a/out/out.OverrideContentStatus.php +++ b/out/out.OverrideContentStatus.php @@ -63,10 +63,13 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $content); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.PasswordForgotten.php b/out/out.PasswordForgotten.php index b12232c22..24374e0f0 100644 --- a/out/out.PasswordForgotten.php +++ b/out/out.PasswordForgotten.php @@ -32,7 +32,7 @@ if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('referrer'=>$referrer)); if($view) { - $view->show(); + $view($_GET); exit; } diff --git a/out/out.PasswordSend.php b/out/out.PasswordSend.php index b12232c22..24374e0f0 100644 --- a/out/out.PasswordSend.php +++ b/out/out.PasswordSend.php @@ -32,7 +32,7 @@ if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('referrer'=>$referrer)); if($view) { - $view->show(); + $view($_GET); exit; } diff --git a/out/out.RemoveArchive.php b/out/out.RemoveArchive.php index 89b8e091c..da8258cbf 100644 --- a/out/out.RemoveArchive.php +++ b/out/out.RemoveArchive.php @@ -33,9 +33,10 @@ if (!isset($_GET["arkname"]) || !file_exists($settings->_contentDir.$_GET["arkna $arkname = $_GET["arkname"]; $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'archive'=>$arkname)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('archive', $arkname); + $view($_GET); exit; } diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php index 8c9320522..8431761e7 100644 --- a/out/out.RemoveDocument.php +++ b/out/out.RemoveDocument.php @@ -52,10 +52,12 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.RemoveDocumentFile.php b/out/out.RemoveDocumentFile.php index 3c4fbecfb..e0382eab6 100644 --- a/out/out.RemoveDocumentFile.php +++ b/out/out.RemoveDocumentFile.php @@ -54,10 +54,13 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'file'=>$file)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('file', $file); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.RemoveDump.php b/out/out.RemoveDump.php index dd0119ad9..7b8e12079 100644 --- a/out/out.RemoveDump.php +++ b/out/out.RemoveDump.php @@ -33,9 +33,10 @@ if (!isset($_GET["dumpname"]) || !file_exists($settings->_contentDir.$_GET["dump $dumpname = $_GET["dumpname"]; $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'dumpfile'=>$dumpname)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('dumpfile', $dumpname); + $view($_GET); exit; } diff --git a/out/out.RemoveEvent.php b/out/out.RemoveEvent.php index 8ac8abded..0a01154b3 100644 --- a/out/out.RemoveEvent.php +++ b/out/out.RemoveEvent.php @@ -37,9 +37,10 @@ if (($user->getID()!=$event["userID"])&&(!$user->isAdmin())){ } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'event'=>$event)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('event', $event); + $view($_GET); exit; } diff --git a/out/out.RemoveFolder.php b/out/out.RemoveFolder.php index 2de78cf90..fb1409083 100644 --- a/out/out.RemoveFolder.php +++ b/out/out.RemoveFolder.php @@ -43,9 +43,10 @@ if ($folder->getAccessMode($user) < M_ALL) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view($_GET); exit; } diff --git a/out/out.RemoveFolderFiles.php b/out/out.RemoveFolderFiles.php index a52302721..0a6359865 100644 --- a/out/out.RemoveFolderFiles.php +++ b/out/out.RemoveFolderFiles.php @@ -37,9 +37,10 @@ if (!is_object($folder)) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view($_GET); exit; } diff --git a/out/out.RemoveGroup.php b/out/out.RemoveGroup.php index 7b9972b24..56f5218b6 100644 --- a/out/out.RemoveGroup.php +++ b/out/out.RemoveGroup.php @@ -38,9 +38,10 @@ if (!is_object($group)) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'group'=>$group)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('group', $group); + $view($_GET); exit; } diff --git a/out/out.RemoveLog.php b/out/out.RemoveLog.php index b30a14bee..6d392c2c3 100644 --- a/out/out.RemoveLog.php +++ b/out/out.RemoveLog.php @@ -47,9 +47,11 @@ foreach($lognames as $file) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'lognames'=>$lognames, 'mode'=>$mode)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('lognames', $lognames); + $view->setParam('mode', $mode); + $view($_GET); exit; } diff --git a/out/out.RemoveUser.php b/out/out.RemoveUser.php index fcbdd9f4f..242d8eb17 100644 --- a/out/out.RemoveUser.php +++ b/out/out.RemoveUser.php @@ -48,9 +48,11 @@ if ($rmuser->getID()==$user->getID()) { $allusers = $dms->getAllUsers($settings->_sortUsersInList); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rmuser'=>$rmuser, 'allusers'=>$allusers)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('rmuser', $rmuser); + $view->setParam('allusers', $allusers); + $view($_GET); exit; } diff --git a/out/out.RemoveVersion.php b/out/out.RemoveVersion.php index afa46211f..1e8bb148f 100644 --- a/out/out.RemoveVersion.php +++ b/out/out.RemoveVersion.php @@ -61,10 +61,13 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.RemoveWorkflow.php b/out/out.RemoveWorkflow.php index fb623d026..34a0419ca 100644 --- a/out/out.RemoveWorkflow.php +++ b/out/out.RemoveWorkflow.php @@ -39,9 +39,10 @@ if (!is_object($workflow)) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'workflow'=>$workflow)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('workflow'=>$workflow); + $view($_GET); exit; } diff --git a/out/out.RemoveWorkflowFromDocument.php b/out/out.RemoveWorkflowFromDocument.php index da77424ff..ebe9df647 100644 --- a/out/out.RemoveWorkflowFromDocument.php +++ b/out/out.RemoveWorkflowFromDocument.php @@ -61,10 +61,13 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.ReturnFromSubWorkflow.php b/out/out.ReturnFromSubWorkflow.php index 414806810..6eb0ebb3c 100644 --- a/out/out.ReturnFromSubWorkflow.php +++ b/out/out.ReturnFromSubWorkflow.php @@ -62,9 +62,13 @@ if(isset($_POST["transition"]) && $_POST["transition"]) { $folder = $document->getFolder(); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'transition'=>$transition)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); + $view->setParam('transition', $transition); + $view($_GET); exit; } diff --git a/out/out.ReviewDocument.php b/out/out.ReviewDocument.php index 4fab1c9dd..aea5fc3f2 100644 --- a/out/out.ReviewDocument.php +++ b/out/out.ReviewDocument.php @@ -71,10 +71,13 @@ if(!$reviews) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $content); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php index 919bc2cb4..7c6567105 100644 --- a/out/out.ReviewSummary.php +++ b/out/out.ReviewSummary.php @@ -35,9 +35,12 @@ if ($user->isGuest()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('timeout', $settings->_cmdTimeout); + $view($_GET); exit; } diff --git a/out/out.RewindWorkflow.php b/out/out.RewindWorkflow.php index da77424ff..ebe9df647 100644 --- a/out/out.RewindWorkflow.php +++ b/out/out.RewindWorkflow.php @@ -61,10 +61,13 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.RunSubWorkflow.php b/out/out.RunSubWorkflow.php index 52d5d0618..eb1c38296 100644 --- a/out/out.RunSubWorkflow.php +++ b/out/out.RunSubWorkflow.php @@ -66,10 +66,14 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'subworkflow'=>$subworkflow)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); + $view->setParam('subworkflow', $subworkflow); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.SearchForm.php b/out/out.SearchForm.php index fa0961c70..6fa30cff2 100644 --- a/out/out.SearchForm.php +++ b/out/out.SearchForm.php @@ -42,9 +42,14 @@ $allCats = $dms->getDocumentCategories(); $allUsers = $dms->getAllUsers($settings->_sortUsersInList); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'attrdefs'=>$attrdefs, 'allcategories'=>$allCats, 'allusers'=>$allUsers, 'enablefullsearch'=>$settings->_enableFullSearch)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('attrdefs', $attrdefs); + $view->setParam('allcategories', $allCats); + $view->setParam('allusers', $allUsers); + $view->setParam('enablefullsearch', $settings->_enableFullSearch); + $view($_GET); exit; } diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php index 5b6856179..bad783a1a 100644 --- a/out/out.SetExpires.php +++ b/out/out.SetExpires.php @@ -45,10 +45,12 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php index 1f2500fb1..c648563f2 100644 --- a/out/out.SetReviewersApprovers.php +++ b/out/out.SetReviewersApprovers.php @@ -65,10 +65,16 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $content); + $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); + $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); + $view->setParam('enableselfrevapp', $settings->_enableSelfRevApp); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.SetWorkflow.php b/out/out.SetWorkflow.php index 445f3991b..27510bafc 100644 --- a/out/out.SetWorkflow.php +++ b/out/out.SetWorkflow.php @@ -52,10 +52,13 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.TriggerWorkflow.php b/out/out.TriggerWorkflow.php index 020ccf556..2a9121530 100644 --- a/out/out.TriggerWorkflow.php +++ b/out/out.TriggerWorkflow.php @@ -62,10 +62,14 @@ $folder = $document->getFolder(); $accessop = new SeedDMS_AccessOperation($document, $user, $settings); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'transition'=>$transition)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view->setParam('version', $version); + $view->setParam('transition', $transition); $view->setParam('accessobject', $accessop); - $view->show(); + $view($_GET); exit; } diff --git a/out/out.UpdateDocument2.php b/out/out.UpdateDocument2.php index 1e45a0826..b8fbdb01e 100644 --- a/out/out.UpdateDocument2.php +++ b/out/out.UpdateDocument2.php @@ -46,9 +46,11 @@ if ($document->getAccessMode($user) < M_READWRITE) { $folder = $document->getFolder(); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('folder', $folder); + $view->setParam('document', $document); + $view($_GET); exit; } diff --git a/out/out.UserDefaultKeywords.php b/out/out.UserDefaultKeywords.php index ed9e589c7..82298ea4e 100644 --- a/out/out.UserDefaultKeywords.php +++ b/out/out.UserDefaultKeywords.php @@ -30,9 +30,10 @@ if ($user->isGuest()) { $categories = $dms->getAllUserKeywordCategories($user->getID()); $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('categories', $categories); + $view($_GET); exit; } diff --git a/out/out.UsrView.php b/out/out.UsrView.php index 6d83b36fe..bd0191cca 100644 --- a/out/out.UsrView.php +++ b/out/out.UsrView.php @@ -36,9 +36,12 @@ if (is_bool($users)) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'allusers'=>$users, 'enableuserimage'=>$settings->_enableUserImage, 'httproot'=>$settings->_httpRoot)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('allusers', $users); + $view->setParam('enableuserimage', $settings->_enableUserImage); + $view->setParam('httproot', $settings->_httpRoot); + $view($_GET); exit; } diff --git a/out/out.ViewEvent.php b/out/out.ViewEvent.php index 4e26cd1f0..5b2e0a189 100644 --- a/out/out.ViewEvent.php +++ b/out/out.ViewEvent.php @@ -33,9 +33,10 @@ if (is_bool($event)&&!$event){ } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'event'=>$event)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('event', $event); + $view($_GET); exit; } diff --git a/out/out.WorkflowActionsMgr.php b/out/out.WorkflowActionsMgr.php index 42184244e..650020971 100644 --- a/out/out.WorkflowActionsMgr.php +++ b/out/out.WorkflowActionsMgr.php @@ -41,9 +41,11 @@ if (is_bool($workflowactions)) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'allworkflowactions'=>$workflowactions, 'selworkflowaction'=>$selworkflowaction)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('allworkflowactions', $workflowactions); + $view->setParam('selworkflowaction', $selworkflowaction); + $view($_GET); exit; } diff --git a/out/out.WorkflowGraph.php b/out/out.WorkflowGraph.php index 55f548500..36198ba80 100644 --- a/out/out.WorkflowGraph.php +++ b/out/out.WorkflowGraph.php @@ -49,9 +49,12 @@ if(isset($_GET['transition']) && $_GET['transition']) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'workflow'=>$workflow, 'transition'=>$transition, 'document'=>$document)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('workflow', $workflow); + $view->setParam('transition', $transition); + $view->setParam('document', $document); + $view($_GET); exit; } diff --git a/out/out.WorkflowMgr.php b/out/out.WorkflowMgr.php index a46bb952b..7dd3ab351 100644 --- a/out/out.WorkflowMgr.php +++ b/out/out.WorkflowMgr.php @@ -46,9 +46,12 @@ if(isset($_GET['workflowid']) && $_GET['workflowid']) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selworkflow'=>$selworkflow, 'allworkflows'=>$workflows, 'allworkflowstates'=>$workflowstates)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('selworkflow', $selworkflow); + $view->setParam('allworkflows', $workflows); + $view->setParam('allworkflowstates', $workflowstates); + $view($_GET); exit; } diff --git a/out/out.WorkflowStatesMgr.php b/out/out.WorkflowStatesMgr.php index c7ef54271..92094c966 100644 --- a/out/out.WorkflowStatesMgr.php +++ b/out/out.WorkflowStatesMgr.php @@ -36,9 +36,10 @@ if(isset($_GET['workflowstateid']) && $_GET['workflowstateid']) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selworkflowstate'=>$selworkflowstate)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('selworkflowstate', $selworkflowstate); + $view($_GET); exit; } diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php index 73423a49b..b0247a6c0 100644 --- a/out/out.WorkflowSummary.php +++ b/out/out.WorkflowSummary.php @@ -35,9 +35,13 @@ if ($user->isGuest()) { } $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); -$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout)); +$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->show(); + $view->setParam('cachedir', $settings->_cacheDir); + $view->setParam('workflowmode', $settings->_workflowMode); + $view->setParam('previewWidthList', $settings->_previewWidthList); + $view->setParam('timeout', $settings->_cmdTimeout); + $view($_GET); exit; } From 29de2282a3e941defb8ef97282169459a3ac9ad3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 20:10:17 +0100 Subject: [PATCH 14/20] add method js() --- views/bootstrap/class.CreateIndex.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/bootstrap/class.CreateIndex.php b/views/bootstrap/class.CreateIndex.php index 1e1b61141..77d6ca302 100644 --- a/views/bootstrap/class.CreateIndex.php +++ b/views/bootstrap/class.CreateIndex.php @@ -31,6 +31,10 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_CreateIndex extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + header('Content-Type: application/javascript'); + } /* }}} */ + function show() { /* {{{ */ $this->htmlStartPage(getMLText("admin_tools")); $this->globalNavigation(); From efbf85e34eec16b1e05a9c8ab6795c02878b9281 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 16 Mar 2016 20:10:59 +0100 Subject: [PATCH 15/20] add javascript into external file --- views/bootstrap/class.FolderAccess.php | 41 ++++++++++------- views/bootstrap/class.FolderNotify.php | 46 +++++++++++-------- views/bootstrap/class.ForcePasswordChange.php | 40 +++++++++++++++- 3 files changed, 88 insertions(+), 39 deletions(-) diff --git a/views/bootstrap/class.FolderAccess.php b/views/bootstrap/class.FolderAccess.php index 5253a644d..bcbee1872 100644 --- a/views/bootstrap/class.FolderAccess.php +++ b/views/bootstrap/class.FolderAccess.php @@ -39,21 +39,9 @@ class SeedDMS_View_FolderAccess extends SeedDMS_Bootstrap_Style { print "\n"; } /* }}} */ - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $allUsers = $this->params['allusers']; - $allGroups = $this->params['allgroups']; - $rootfolderid = $this->params['rootfolderid']; - - $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $allUsers = $this->params['allusers']; + $allGroups = $this->params['allgroups']; + $rootfolderid = $this->params['rootfolderid']; + + $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); + $this->contentHeading(getMLText("edit_folder_access")); $this->contentContainerStart(); @@ -227,7 +234,7 @@ function checkForm() print "
"; } ?> - + diff --git a/views/bootstrap/class.FolderNotify.php b/views/bootstrap/class.FolderNotify.php index f3bc8865f..e798547dc 100644 --- a/views/bootstrap/class.FolderNotify.php +++ b/views/bootstrap/class.FolderNotify.php @@ -31,24 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_FolderNotify extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $allUsers = $this->params['allusers']; - $allGroups = $this->params['allgroups']; - $strictformcheck = $this->params['strictformcheck']; - - $notifyList = $folder->getNotifyList(); - - $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); - + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $allUsers = $this->params['allusers']; + $allGroups = $this->params['allgroups']; + $strictformcheck = $this->params['strictformcheck']; + + $notifyList = $folder->getNotifyList(); + + $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); + $this->contentHeading(getMLText("edit_existing_notify")); $this->contentContainerStart(); @@ -125,7 +131,7 @@ function checkForm() ?>
- + diff --git a/views/bootstrap/class.ForcePasswordChange.php b/views/bootstrap/class.ForcePasswordChange.php index 61f921fb3..64fc5577c 100644 --- a/views/bootstrap/class.ForcePasswordChange.php +++ b/views/bootstrap/class.ForcePasswordChange.php @@ -31,6 +31,42 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + $strictformcheck = $this->params['strictformcheck']; + + header('Content-Type: application/javascript'); +?> +function checkForm() +{ + msg = new Array(); + + if($("#currentpwd").val() == "") msg.push(""); + if($("#pwd").val() == "") msg.push(""); + if($("#pwd").val() != $("#pwdconf").val()) msg.push(""); + if (msg != "") { + noty({ + text: msg.join('
'), + type: 'error', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + _timeout: 1500, + }); + return false; + } + else + return true; +} + +$(document).ready( function() { + $('body').on('submit', '#form', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); +params['dms']; $user = $this->params['user']; @@ -43,7 +79,7 @@ class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style { echo "
".getMLText('password_expiration_text')."
"; $this->contentContainerStart(); ?> - + @@ -51,7 +87,7 @@ class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style { - + From c09979eaede72cde8a18248a329ee8d0bfcf65c1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Mar 2016 15:32:34 +0100 Subject: [PATCH 16/20] fix log message --- op/op.WorkflowActionsMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.WorkflowActionsMgr.php b/op/op.WorkflowActionsMgr.php index 51a67823c..d456a43a9 100644 --- a/op/op.WorkflowActionsMgr.php +++ b/op/op.WorkflowActionsMgr.php @@ -113,7 +113,7 @@ else if ($action == "editworkflowaction") { if ($editedWorkflowAction->getName() != $name) $editedWorkflowAction->setName($name); - add_log_line(".php&action=editworkflowaction&workflowactionid=".$workflow); + add_log_line(".php&action=editworkflowaction&workflowactionid=".$workflowactionid); } else UI::exitError(getMLText("admin_tools"),getMLText("unknown_command")); From 889a080339f75c9ad0e7e715a112a9e8c39f3917 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Mar 2016 15:32:49 +0100 Subject: [PATCH 17/20] fix syntax error --- out/out.RemoveWorkflow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.RemoveWorkflow.php b/out/out.RemoveWorkflow.php index 34a0419ca..e16af58cc 100644 --- a/out/out.RemoveWorkflow.php +++ b/out/out.RemoveWorkflow.php @@ -41,7 +41,7 @@ if (!is_object($workflow)) { $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME'])); $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user)); if($view) { - $view->setParam('workflow'=>$workflow); + $view->setParam('workflow', $workflow); $view($_GET); exit; } From ca6f0303b2ab162f10289709baf53ee05aa83245 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Mar 2016 15:33:18 +0100 Subject: [PATCH 18/20] put javascript into its own file and turn on content security policy --- views/bootstrap/class.ApproveDocument.php | 69 ++--- views/bootstrap/class.AttributeMgr.php | 4 +- views/bootstrap/class.Bootstrap.php | 4 +- views/bootstrap/class.ChangePassword.php | 10 +- views/bootstrap/class.EditComment.php | 40 +-- views/bootstrap/class.EditEvent.php | 41 +-- views/bootstrap/class.EditFolder.php | 41 +-- views/bootstrap/class.EditOnline.php | 47 ++-- views/bootstrap/class.GroupView.php | 17 +- views/bootstrap/class.MoveFolder.php | 12 +- .../bootstrap/class.OverrideContentStatus.php | 49 ++-- views/bootstrap/class.PasswordForgotten.php | 35 ++- views/bootstrap/class.RemoveWorkflow.php | 2 +- .../class.RemoveWorkflowFromDocument.php | 2 +- .../bootstrap/class.ReturnFromSubWorkflow.php | 44 ++-- views/bootstrap/class.ReviewDocument.php | 76 +++--- views/bootstrap/class.SearchForm.php | 48 ++-- views/bootstrap/class.SetWorkflow.php | 36 ++- views/bootstrap/class.Statistic.php | 2 +- views/bootstrap/class.TriggerWorkflow.php | 45 ++-- views/bootstrap/class.UserDefaultKeywords.php | 49 ++-- views/bootstrap/class.WorkflowActionsMgr.php | 205 +++++++-------- views/bootstrap/class.WorkflowGraph.php | 71 +++--- views/bootstrap/class.WorkflowMgr.php | 241 ++++++++---------- views/bootstrap/class.WorkflowStatesMgr.php | 227 ++++++++--------- 25 files changed, 758 insertions(+), 659 deletions(-) diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php index b2264bb2d..e5327d691 100644 --- a/views/bootstrap/class.ApproveDocument.php +++ b/views/bootstrap/class.ApproveDocument.php @@ -31,29 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ApproveDocument extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $document = $this->params['document']; - - $latestContent = $document->getLatestContent(); - $approvals = $latestContent->getApprovalStatus(); - - foreach($approvals as $approval) { - if($approval['approveID'] == $_GET['approveid']) { - $approvalStatus = $approval; - break; - } - } - - $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); - $this->contentHeading(getMLText("add_approval")); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkIndForm()) return; + event.preventDefault(); + }); + $('body').on('submit', '#form2', function(ev){ + if(checkGrpForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $document = $this->params['document']; + + $latestContent = $document->getLatestContent(); + $approvals = $latestContent->getApprovalStatus(); + + foreach($approvals as $approval) { + if($approval['approveID'] == $_GET['approveid']) { + $approvalStatus = $approval; + break; + } + } + + $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + $this->contentHeading(getMLText("add_approval")); $this->contentContainerStart(); @@ -118,7 +129,7 @@ function checkGrpForm() print "
:
:
:

\n"; } ?> - + @@ -170,7 +181,7 @@ function checkGrpForm() } ?> - +
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php index e49026a8a..9451ab770 100644 --- a/views/bootstrap/class.AttributeMgr.php +++ b/views/bootstrap/class.AttributeMgr.php @@ -162,7 +162,7 @@ $(document).ready( function() { -
:
+
: @@ -315,6 +315,8 @@ $(document).ready( function() { + + contentEnd(); $this->htmlEndPage(); diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index af9bbddbd..7ee83a990 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -43,7 +43,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { } /* }}} */ function htmlStartPage($title="", $bodyClass="") { /* {{{ */ - if(method_exists($this, 'js')) { + if(1 || method_exists($this, 'js')) { /* We still need unsafe-eval, because printDocumentChooserHtml and * printFolderChooserHtml will include a javascript file with ajax * which is evaled by jquery @@ -67,9 +67,9 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common { echo ''."\n"; echo ''."\n"; echo ''."\n"; + echo ''."\n"; if($this->extraheader['css']) echo $this->extraheader['css']; - echo ''."\n"; // echo ''."\n"; echo ''."\n"; diff --git a/views/bootstrap/class.ChangePassword.php b/views/bootstrap/class.ChangePassword.php index 55dcef687..cd094eee0 100644 --- a/views/bootstrap/class.ChangePassword.php +++ b/views/bootstrap/class.ChangePassword.php @@ -31,6 +31,13 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ChangePassword extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); +?> +document.form1.newpassword.focus(); +params['dms']; $referuri = $this->params['referuri']; @@ -43,7 +50,7 @@ class SeedDMS_View_ChangePassword extends SeedDMS_Bootstrap_Style { $this->pageNavigation(getMLText("change_password")); $this->contentContainerStart(); ?> - + "; @@ -80,7 +87,6 @@ class SeedDMS_View_ChangePassword extends SeedDMS_Bootstrap_Style {
contentContainerEnd(); ?> -

contentEnd(); diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php index 71de6bee0..440c087ed 100644 --- a/views/bootstrap/class.EditComment.php +++ b/views/bootstrap/class.EditComment.php @@ -31,21 +31,10 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_EditComment extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $document = $this->params['document']; - $version = $this->params['version']; + function js() { /* {{{ */ $strictformcheck = $this->params['strictformcheck']; - - $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); - + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $document = $this->params['document']; + $version = $this->params['version']; + $strictformcheck = $this->params['strictformcheck']; + + $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + $this->contentHeading(getMLText("edit_comment")); $this->contentContainerStart(); ?> -
+ diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php index b342a4535..9bec4cd97 100644 --- a/views/bootstrap/class.EditEvent.php +++ b/views/bootstrap/class.EditEvent.php @@ -31,21 +31,10 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_EditEvent extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $event = $this->params['event']; + function js() { /* {{{ */ $strictformcheck = $this->params['strictformcheck']; - - $this->htmlStartPage(getMLText("calendar")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation(getMLText("calendar"), "calendar"); - - $this->contentHeading(getMLText("edit_event")); - $this->contentContainerStart(); + header('Content-Type: application/javascript; charset=UTF-8'); ?> - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $event = $this->params['event']; + $strictformcheck = $this->params['strictformcheck']; + + $this->htmlStartPage(getMLText("calendar")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("calendar"), "calendar"); + + $this->contentHeading(getMLText("edit_event")); + $this->contentContainerStart(); +?> + + "> diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php index 5a4b9d835..b9c70f2e3 100644 --- a/views/bootstrap/class.EditFolder.php +++ b/views/bootstrap/class.EditFolder.php @@ -31,22 +31,10 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_EditFolder extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $attrdefs = $this->params['attrdefs']; - $rootfolderid = $this->params['rootfolderid']; + function js() { /* {{{ */ $strictformcheck = $this->params['strictformcheck']; - $orderby = $this->params['orderby']; - - $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $attrdefs = $this->params['attrdefs']; + $rootfolderid = $this->params['rootfolderid']; + $strictformcheck = $this->params['strictformcheck']; + $orderby = $this->params['orderby']; + + $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder); $this->contentHeading(getMLText("edit_folder_props")); $this->contentContainerStart(); ?> - + diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php index 89bd59fc4..8c1c9e711 100644 --- a/views/bootstrap/class.EditOnline.php +++ b/views/bootstrap/class.EditOnline.php @@ -36,6 +36,32 @@ class SeedDMS_View_EditOnline extends SeedDMS_Bootstrap_Style { var $file_count; var $storage_size; + function js() { /* {{{ */ + $document = $this->params['document']; + header('Content-Type: application/javascript; charset=UTF-8'); +?> +$(document).ready(function() { + $('#markdown').markItUp(mySettings); + + $('#update').click(function(event) { + event.preventDefault(); + $.post("../op/op.EditOnline.php", $('#form1').serialize(), function(response) { + noty({ + text: response.message, + type: response.success === true ? 'success' : 'error', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + timeout: 1500, + }); + $('div.ajax').trigger('update', {documentid: getId() ?>}); + }, "json"); + return false; + }); +}); +params['dms']; $document = $this->params['document']; @@ -91,27 +117,6 @@ echo "
\n"; echo "
\n"; $this->contentHeading(getMLText("content")); ?> - diff --git a/views/bootstrap/class.PasswordForgotten.php b/views/bootstrap/class.PasswordForgotten.php index 9a6c2b2cb..49ea96bd9 100644 --- a/views/bootstrap/class.PasswordForgotten.php +++ b/views/bootstrap/class.PasswordForgotten.php @@ -31,6 +31,38 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_PasswordForgotten extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); +?> +function checkForm() +{ + msg = new Array(); + if (document.form1.login.value == "") msg.push(""); + if (document.form1.email.value == "") msg.push(""); + if (msg != "") { + noty({ + text: msg.join('
'), + type: 'error', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + _timeout: 1500, + }); + return false; + } + else + return true; +} +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); +document.form1.email.focus(); +params['referrer']; @@ -41,7 +73,7 @@ class SeedDMS_View_PasswordForgotten extends SeedDMS_Bootstrap_Style { ?> contentContainerStart(); ?> - + "; @@ -64,7 +96,6 @@ class SeedDMS_View_PasswordForgotten extends SeedDMS_Bootstrap_Style {
contentContainerEnd(); ?> -

contentEnd(); diff --git a/views/bootstrap/class.RemoveWorkflow.php b/views/bootstrap/class.RemoveWorkflow.php index 9166ba3e6..8ffac1287 100644 --- a/views/bootstrap/class.RemoveWorkflow.php +++ b/views/bootstrap/class.RemoveWorkflow.php @@ -47,7 +47,7 @@ class SeedDMS_View_RemoveWorkflow extends SeedDMS_Bootstrap_Style {

-
+ - -
diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php index f55111ca3..50b8474fb 100644 --- a/views/bootstrap/class.RemoveWorkflowFromDocument.php +++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php @@ -69,7 +69,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {

- + "; echo ""; echo "\n"; + echo "
diff --git a/views/bootstrap/class.ReturnFromSubWorkflow.php b/views/bootstrap/class.ReturnFromSubWorkflow.php index b72ec811f..b62c93d17 100644 --- a/views/bootstrap/class.ReturnFromSubWorkflow.php +++ b/views/bootstrap/class.ReturnFromSubWorkflow.php @@ -31,22 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ReturnFromSubWorkflow extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $document = $this->params['document']; - $transition = $this->params['transition']; - - $latestContent = $document->getLatestContent(); - - $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); - $this->contentHeading(getMLText("return_from_subworkflow")); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $document = $this->params['document']; + $transition = $this->params['transition']; + + $latestContent = $document->getLatestContent(); + + $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + $this->contentHeading(getMLText("return_from_subworkflow")); $currentstate = $latestContent->getWorkflowState(); $wkflog = $latestContent->getWorkflowLog(); @@ -93,7 +100,7 @@ function checkForm() ?>
- + @@ -140,4 +147,3 @@ function checkForm() } /* }}} */ } ?> - diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php index 3f442afa7..501c3180e 100644 --- a/views/bootstrap/class.ReviewDocument.php +++ b/views/bootstrap/class.ReviewDocument.php @@ -31,28 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_ReviewDocument extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $document = $this->params['document']; - $content = $this->params['version']; - - $reviews = $content->getReviewStatus(); - foreach($reviews as $review) { - if($review['reviewID'] == $_GET['reviewid']) { - $reviewStatus = $review; - break; - } - } - - $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); - $this->contentHeading(getMLText("submit_review")); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkIndForm()) return; + event.preventDefault(); + }); + $('body').on('submit', '#form2', function(ev){ + if(checkGrpForm()) return; + event.preventDefault(); + }); +}); params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $document = $this->params['document']; + $content = $this->params['version']; + + $reviews = $content->getReviewStatus(); + foreach($reviews as $review) { + if($review['reviewID'] == $_GET['reviewid']) { + $reviewStatus = $review; + break; + } + } + + $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); + $this->contentHeading(getMLText("submit_review")); $this->contentContainerStart(); // Display the Review form. @@ -109,7 +127,7 @@ function checkGrpForm() print "
:

"; } ?> - + @@ -167,7 +185,7 @@ function checkGrpForm() } ?> - +
diff --git a/views/bootstrap/class.SearchForm.php b/views/bootstrap/class.SearchForm.php index 8162d5b03..cc5c91f91 100644 --- a/views/bootstrap/class.SearchForm.php +++ b/views/bootstrap/class.SearchForm.php @@ -31,22 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_SearchForm extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $folder = $this->params['folder']; - $attrdefs = $this->params['attrdefs']; - $allCats = $this->params['allcategories']; - $allUsers = $this->params['allusers']; - $enablefullsearch = $this->params['enablefullsearch']; - $workflowmode = $this->params['workflowmode']; - - $this->htmlStartPage(getMLText("search")); - $this->globalNavigation($folder); - $this->contentStart(); - $this->pageNavigation(getMLText("search"), ""); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - + +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); +}); +printFolderChooserJs("form1"); + } /* }}} */ + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $folder = $this->params['folder']; + $attrdefs = $this->params['attrdefs']; + $allCats = $this->params['allcategories']; + $allUsers = $this->params['allusers']; + $enablefullsearch = $this->params['enablefullsearch']; + $workflowmode = $this->params['workflowmode']; + + $this->htmlStartPage(getMLText("search")); + $this->globalNavigation($folder); + $this->contentStart(); + $this->pageNavigation(getMLText("search"), ""); +?>
@@ -160,7 +172,7 @@ function checkForm() - + diff --git a/views/bootstrap/class.SetWorkflow.php b/views/bootstrap/class.SetWorkflow.php index f92a62afa..3569f80ba 100644 --- a/views/bootstrap/class.SetWorkflow.php +++ b/views/bootstrap/class.SetWorkflow.php @@ -31,6 +31,28 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_SetWorkflow extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + $document = $this->params['document']; + header('Content-Type: application/javascript; charset=UTF-8'); +?> +function showWorkflow(selectObj) { + id = selectObj.options[selectObj.selectedIndex].value; + if (id > 0) { + $('#workflowgraph').show(); + $('#workflowgraph iframe').attr('src', 'out.WorkflowGraph.php?documentid=getID(); ?>&workflow='+id); + } else { + $('#workflowgraph').hide(); + } + +} +$(document).ready( function() { + $( "#selector" ).change(function() { + showWorkflow(this); + }); +}); +params['dms']; $user = $this->params['user']; @@ -48,18 +70,6 @@ class SeedDMS_View_SetWorkflow extends SeedDMS_Bootstrap_Style { $this->contentContainerStart(); // Display the Workflow form. ?> -
- -
:
:printFolderChooser("form1", M_READ, -1, $folder);?>printFolderChooserHtml("form1", M_READ, -1, $folder);?>
: "; + echo " diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php index d69dd5dd3..95a8a7a6a 100644 --- a/views/bootstrap/class.UserDefaultKeywords.php +++ b/views/bootstrap/class.UserDefaultKeywords.php @@ -31,17 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_UserDefaultKeywords extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $categories = $this->params['categories']; - - $this->htmlStartPage(getMLText("edit_default_keywords")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation(getMLText("my_account"), "my_account"); + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - + +sel = document.getElementById("selector"); +sel.selectedIndex=0; //; +showKeywords(sel); + +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); + $( "#selector" ).change(function() { + showKeywords(this); +// $('div.ajax').trigger('update', {userid: $(this).val()}); + }); +}); params['dms']; + $user = $this->params['user']; + $categories = $this->params['categories']; + + $this->htmlStartPage(getMLText("edit_default_keywords")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("my_account"), "my_account"); $this->contentHeading(getMLText("edit_default_keywords")); ?>
: -
- - contentEnd(); $this->htmlEndPage(); diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php index dd91b4e40..043442e44 100644 --- a/views/bootstrap/class.WorkflowActionsMgr.php +++ b/views/bootstrap/class.WorkflowActionsMgr.php @@ -31,27 +31,14 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_WorkflowActionsMgr extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $selworkflowaction = $this->params['selworkflowaction']; - - $workflowactions = $dms->getAllWorkflowActions(); - - $this->htmlStartPage(getMLText("admin_tools")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); - + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - +$(document).ready( function() { + $('body').on('submit', '#form', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); + $( "#selector" ).change(function() { + $('div.ajax').trigger('update', {workflowactionid: $(this).val()}); + }); +}); contentHeading(getMLText("workflow_actions_management")); -?> + } /* }}} */ -
-
-
-: - -
-
+ function info() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + } /* }}} */ -
-
-
:
- - - -getID()."\" style=\"display : none;\">"; -?> -
- - - - - - - - - - - - - - - - + + + + + + + +
+ +
+ +
+
+
+ +
+ +
+
-
-isUsed()) { + function showWorkflowActionForm($action) { /* {{{ */ + if($action) { + if($action->isUsed()) { ?>

- +
-
:
-
-
+params['selworkflowaction']; + + $this->showWorkflowActionForm($selworkflowaction); + } /* }}} */ + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $selworkflowaction = $this->params['selworkflowaction']; + + $workflowactions = $dms->getAllWorkflowActions(); + + $this->htmlStartPage(getMLText("admin_tools")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); + $this->contentHeading(getMLText("workflow_actions_management")); +?> + +
+
+
+: +
+
getID()."\"" : "") ?>>
- +
+
+
getID()."\"" : "") ?>>
+
+
+
contentEnd(); $this->htmlEndPage(); diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php index d649840aa..52d50a058 100644 --- a/views/bootstrap/class.WorkflowGraph.php +++ b/views/bootstrap/class.WorkflowGraph.php @@ -31,6 +31,39 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style { + function js() { /* {{{ */ + $this->workflow = $this->params['workflow']; + header('Content-Type: application/javascript; charset=UTF-8'); +?> +$(document).ready(function() { + var width = $('#canvas').width(); + var height = $('#canvas').height();; + var ggg = new Graph(); + ggg.edgeFactory.template.style.directed = true; + + var render_action = function(r, n) { + /* the Raphael set is obligatory, containing all you want to display */ + var set = r.set().push( + /* custom objects go here */ + r.rect(n.point[0]-45, n.point[1]-13, 90, 44).attr({"fill": (n.color == undefined ? "#feb" : n.color), r : "12px", "stroke-width" : "1px" })).push( + r.text(n.point[0], n.point[1] + 10, (n.label || n.id) + "\n(" + (n.maxtime == undefined ? "Infinity" : n.maxtime) + ")")); + return set; + }; + +seentrans = array(); + $state = $this->workflow->getInitState(); + $this->states = array(); + $this->actions = array(); + $this->printGraph(); +?> + var layouter = new Graph.Layout.Spring(ggg); + var renderer = new Graph.Renderer.Raphael('canvas', ggg, width, height); +}); + +workflow->getTransitions(); if($transitions) { @@ -112,42 +145,20 @@ class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style { ''."\n". ''."\n". ''."\n"); + $this->htmlAddHeader(' + +', 'css'); $this->htmlStartPage(getMLText("admin_tools")); // $this->contentContainerStart(); ?> -
- - +
contentContainerEnd(); + if(method_exists($this, 'js')) + echo ''."\n"; echo "\n\n"; } /* }}} */ } diff --git a/views/bootstrap/class.WorkflowMgr.php b/views/bootstrap/class.WorkflowMgr.php index 483910c70..05e77986e 100644 --- a/views/bootstrap/class.WorkflowMgr.php +++ b/views/bootstrap/class.WorkflowMgr.php @@ -31,20 +31,9 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_WorkflowMgr extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $selworkflow = $this->params['selworkflow']; - $workflows = $this->params['allworkflows']; - $workflowstates = $this->params['allworkflowstates']; - - $this->htmlStartPage(getMLText("admin_tools")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); - + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); + $( "#selector" ).change(function() { + $('div.ajax').trigger('update', {workflowid: $(this).val()}); + }); +}); contentHeading(getMLText("workflow_management")); -?> + } /* }}} */ -
-
-
-: - -
-
- -
+ function info() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $selworkflow = $this->params['selworkflow']; + if($selworkflow) { ?> +
+
+ -
- - - + function showWorkflowForm($workflow) { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $workflows = $this->params['allworkflows']; + $workflowstates = $this->params['allworkflowstates']; -getID()."\" style=\"display : none;\">"; - $transitions = $currWorkflow->getTransitions(); - $initstate = $currWorkflow->getInitState(); + if($workflow) { + $transitions = $workflow->getTransitions(); + $initstate = $workflow->getInitState(); $hasinitstate = true; $missesug = false; if($transitions) { @@ -184,31 +107,37 @@ function showWorkflow(selectObj) { $this->errorMsg('One of the transitions has neither a user nor a group!'); if(!$hasinitstate) $this->errorMsg('None of the transitions starts with the initial state of the workflow!'); -?> - - - - -
- - - - + + + + + + + +
-isUsed()) { + + if($workflow->isUsed()) { ?>

- + -
- + @@ -216,7 +145,7 @@ function showWorkflow(selectObj) { getID()."\""; - if($currWorkflow->getInitState()->getID() == $workflowstate->getID()) + if($workflow && $workflow->getInitState()->getID() == $workflowstate->getID()) echo " selected=\"selected\""; echo ">".htmlspecialchars($workflowstate->getName())."\n"; } @@ -231,11 +160,12 @@ function showWorkflow(selectObj) {
:">
:
getAllWorkflowActions(); if($actions) { - $transitions = $currWorkflow->getTransitions(); - echo ""; - echo ""; + $transitions = $workflow->getTransitions(); + echo "
".getMLText('state_and_next_state')."".getMLText('action')."".getMLText('users_and_groups')."
"; + echo ""; if($transitions) { foreach($transitions as $transition) { $state = $transition->getState(); @@ -273,7 +203,7 @@ function showWorkflow(selectObj) { ?> - + @@ -282,9 +212,11 @@ function showWorkflow(selectObj) { echo "\n"; } } + echo "
".getMLText('state_and_next_state')."".getMLText('action')."".getMLText('users_and_groups')."
"; ?>
"; echo ""; ?> - + "> "; echo "
"; ?> "; + } + } + } /* }}} */ + + function form() { /* {{{ */ + $selworkflow = $this->params['selworkflow']; + + $this->showWorkflowForm($selworkflow); + } /* }}} */ + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $selworkflow = $this->params['selworkflow']; + $workflows = $this->params['allworkflows']; + $workflowstates = $this->params['allworkflowstates']; + + $this->htmlStartPage(getMLText("admin_tools")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); + $this->contentHeading(getMLText("workflow_management")); +?> + +
+
+
+: +
-
+
+
getID()."\"" : "") ?>>
- +
+
+
getID()."\"" : "") ?>>
+
+
+ contentEnd(); diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php index 6710ae082..89df42033 100644 --- a/views/bootstrap/class.WorkflowStatesMgr.php +++ b/views/bootstrap/class.WorkflowStatesMgr.php @@ -31,27 +31,15 @@ require_once("class.Bootstrap.php"); */ class SeedDMS_View_WorkflowStatesMgr extends SeedDMS_Bootstrap_Style { - function show() { /* {{{ */ - $dms = $this->params['dms']; - $user = $this->params['user']; - $selworkflowstate = $this->params['selworkflowstate']; - - $workflowstates = $dms->getAllWorkflowStates(); - - $this->htmlStartPage(getMLText("admin_tools")); - $this->globalNavigation(); - $this->contentStart(); - $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); - + function js() { /* {{{ */ + header('Content-Type: application/javascript; charset=UTF-8'); ?> - +$(document).ready(function() { + $('body').on('submit', '#form1', function(ev){ + if(checkForm()) return; + event.preventDefault(); + }); + $( "#selector" ).change(function() { + $('div.ajax').trigger('update', {workflowstateid: $(this).val()}); + }); +}); contentHeading(getMLText("workflow_states_management")); -?> + } /* }}} */ -
-
-
-: - -
-
+ function info() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + } /* }}} */ -
-
- - - - -getID()."\" style=\"display : none;\">"; -?> -
- - - - - - - + + + - - - - - - - - - - - - - + + + + + +
+ +
+ +
+
-
-isUsed()) { + function showWorkflowStateForm($state) { /* {{{ */ + if($state) { + if($state->isUsed()) { ?>

- +
-
:
: + +
+ +
+ +
+
+
+ +
+
- - - -
+params['selworkflowstate']; + + $this->showWorkflowStateForm($selworkflowstate); + } /* }}} */ + + function show() { /* {{{ */ + $dms = $this->params['dms']; + $user = $this->params['user']; + $selworkflowstate = $this->params['selworkflowstate']; + + $workflowstates = $dms->getAllWorkflowStates(); + + $this->htmlStartPage(getMLText("admin_tools")); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("admin_tools"), "admin_tools"); + $this->contentHeading(getMLText("workflow_states_management")); +?> + +
+
+
+: +
+
getID()."\"" : "") ?>>
- +
+
+
getID()."\"" : "") ?>>
+
+
+
contentEnd(); From 6702d5de81bc1066cf7cd1e7cbde84419f0a0f03 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Mar 2016 15:35:04 +0100 Subject: [PATCH 19/20] add missing phrases --- languages/ar_EG/lang.inc | 3 +++ languages/bg_BG/lang.inc | 3 +++ languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 3 +++ languages/de_DE/lang.inc | 7 +++++-- languages/en_GB/lang.inc | 7 +++++-- languages/es_ES/lang.inc | 3 +++ languages/fr_FR/lang.inc | 5 ++++- languages/hr_HR/lang.inc | 3 +++ languages/hu_HU/lang.inc | 3 +++ languages/it_IT/lang.inc | 3 +++ languages/ko_KR/lang.inc | 3 +++ languages/nl_NL/lang.inc | 3 +++ languages/pl_PL/lang.inc | 11 +++++++---- languages/pt_BR/lang.inc | 3 +++ languages/ro_RO/lang.inc | 3 +++ languages/ru_RU/lang.inc | 3 +++ languages/sk_SK/lang.inc | 3 +++ languages/sv_SE/lang.inc | 3 +++ languages/tr_TR/lang.inc | 3 +++ languages/uk_UA/lang.inc | 3 +++ languages/zh_CN/lang.inc | 3 +++ languages/zh_TW/lang.inc | 3 +++ 23 files changed, 78 insertions(+), 9 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index b7119fc0e..c00d0ff45 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -377,6 +377,7 @@ URL: [url]', 'edit_folder_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_props' => 'تعديل مجلد', 'edit_group' => 'تعديل مجموعة', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'تعديل المستخدم', 'edit_user_details' => 'تعديل بيانات المستخدم', @@ -971,6 +972,8 @@ URL: [url]', 'settings_dropFolderDir' => '', 'settings_dropFolderDir_desc' => '', 'settings_Edition' => 'اعدادات التحرير', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 3fb57efcf..e00ffb7c9 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -332,6 +332,7 @@ $text = array( 'edit_folder_notify' => 'Списък с уведомявания за папка', 'edit_folder_props' => 'Редактирай папка', 'edit_group' => 'Редактирай група', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Редактирай потребител', 'edit_user_details' => 'Редактирай данните на потребителя', @@ -836,6 +837,8 @@ $text = array( 'settings_dropFolderDir' => 'Директория за папката -пускане-', 'settings_dropFolderDir_desc' => 'Тази папка може да се ползва за -пускане- на файлове във файловата система на сървъра и импортиране от там вместо качване през браузър. Папката трябва да съдържа под-паки за всеки потребител който има права да работи по този начин.', 'settings_Edition' => 'Настройки редакция', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Разреши Admin Rev App', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index c4a0d9bd4..43f48be01 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -337,6 +337,7 @@ URL: [url]', 'edit_folder_notify' => 'Llista de notificació', 'edit_folder_props' => 'Editar directori', 'edit_group' => 'Editar grup...', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuari...', 'edit_user_details' => 'Editar detalls d\'usuari', @@ -841,6 +842,8 @@ URL: [url]', 'settings_dropFolderDir' => '', 'settings_dropFolderDir_desc' => '', 'settings_Edition' => 'Edition settings', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 0c6517b28..dc8ae72c3 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -384,6 +384,7 @@ URL: [url]', 'edit_folder_notify' => 'Seznam upozornění', 'edit_folder_props' => 'Upravit adresář', 'edit_group' => 'Upravit skupinu', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Upravit uživatele', 'edit_user_details' => 'Upravit podrobnosti uživatele', @@ -980,6 +981,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Adresář pro přetažení složky', 'settings_dropFolderDir_desc' => 'Tento adresář může být použit k ukládání souborů do souborového systému serveru a jejich importování odtud, místo natahování přes prohlížeč. Adresář musí obsahovat podadresář pro každého uživatele, kterému je povoleno importovat soubory touto cestou.', 'settings_Edition' => '', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 590583f9c..f89993998 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2198), dgrutsch (21) +// Translators: Admin (2202), dgrutsch (21) $text = array( 'accept' => 'Übernehmen', @@ -389,6 +389,7 @@ URL: [url]', 'edit_folder_notify' => 'Beobachtung von Ordnern', 'edit_folder_props' => 'Bearbeiten', 'edit_group' => 'Gruppe bearbeiten', +'edit_online' => 'Online editieren', 'edit_transmittal_props' => 'Attribute der Dokumentenliste bearbeiten', 'edit_user' => 'Benutzer bearbeiten', 'edit_user_details' => 'Benutzerdetails bearbeiten', @@ -1017,6 +1018,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Verzeichnis für Ablageordner', 'settings_dropFolderDir_desc' => 'Dieses Verzeichnis kann dazu benutzt werden Dokumente auf dem Server abzulegen und von dort zu importieren anstatt sie über den Browser hochzuladen. Das Verzeichnis muss ein Unterverzeichnis mit dem Login-Namen des angemeldeten Benutzers beinhalten.', 'settings_Edition' => 'Funktions-Einstellungen', +'settings_editOnlineFileTypes' => 'Dateitypen für Online-Editieren:', +'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).', 'settings_enableAcknowledgeWorkflow' => 'Ermögliche Bestätigung des Dokumentenempfang', 'settings_enableAcknowledgeWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten', 'settings_enableAdminRevApp' => 'Admin darf freigeben/prüfen', @@ -1109,7 +1112,7 @@ URL: [url]', 'settings_install_success' => 'Die Installation wurde erfolgreich beendet', 'settings_install_welcome_text' => '

Before you start to install SeedDMS make sure you have created a file \'ENABLE_INSTALL_TOOL\' in your configuration directory, otherwise the installation will not work. On Unix-System this can easily be done with \'touch conf/ENABLE_INSTALL_TOOL\'. After you have finished the installation delete the file.

SeedDMS has very minimal requirements. You will need a mysql database or sqlite support and a php enabled web server. The pear package Log has to be installed too. For the lucene full text search, you will also need the Zend framework installed on disc where it can be found by php. For the WebDAV server you will also need the HTTP_WebDAV_Server. The path to it can later be set during installation.

If you like to create the database before you start installation, then just create it manually with your favorite tool, optionally create a database user with access on the database and import one of the database dumps in the configuration directory. The installation script can do that for you as well, but it will need database access with sufficient rights to create databases.

', 'settings_install_welcome_title' => 'Willkommen zur Installation von SeedDMS', -'settings_install_zendframework' => 'Installiere Zend Framework, wenn Sie die Volltextsuche einsetzen möchten.', +'settings_install_zendframework' => 'Installiere Zend Framework, wenn Sie die zend-basierte Volltextsuche einsetzen möchten. Anderenfalls, ignorieren Sie diese Meldung und fahren Sie mit der Installation fort.', 'settings_language' => 'Voreingestellte Sprache', 'settings_language_desc' => 'Voreingestellte Sprache (entspricht dem Unterverzeichnis im Verzeichnis \'languages\')', 'settings_libraryFolder' => 'Bibliotheksordner', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index f4571dbb2..33fa54b44 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1347), dgrutsch (7), netixw (14) +// Translators: Admin (1351), dgrutsch (7), netixw (14) $text = array( 'accept' => 'Accept', @@ -389,6 +389,7 @@ URL: [url]', 'edit_folder_notify' => 'Folder Notification List', 'edit_folder_props' => 'Edit folder', 'edit_group' => 'Edit group', +'edit_online' => 'Edit online', 'edit_transmittal_props' => 'Edit transmittal properties', 'edit_user' => 'Edit user', 'edit_user_details' => 'Edit User Details', @@ -1018,6 +1019,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Directory for drop folder', 'settings_dropFolderDir_desc' => 'This directory can be used for dropping files on the server\'s file system and importing them from there instead of uploading via the browser. The directory must contain a sub directory for each user who is allowed to import files this way.', 'settings_Edition' => 'Edition settings', +'settings_editOnlineFileTypes' => 'Edit Online File Types:', +'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings can be edited online (USE ONLY LOWER CASE CHARACTERS)', 'settings_enableAcknowledgeWorkflow' => 'Enable acknowledge of document reception', 'settings_enableAcknowledgeWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableAdminRevApp' => 'Allow review/approval for admins', @@ -1110,7 +1113,7 @@ URL: [url]', 'settings_install_success' => 'The installation has been successfully completed.', 'settings_install_welcome_text' => '

Before you start to install SeedDMS make sure you have created a file \'ENABLE_INSTALL_TOOL\' in your configuration directory, otherwise the installation will not work. On Unix-System this can easily be done with \'touch conf/ENABLE_INSTALL_TOOL\'. After you have finished the installation delete the file.

SeedDMS has very minimal requirements. You will need a mysql database or sqlite support and a php enabled web server. The pear package Log has to be installed too. For the lucene full text search, you will also need the Zend framework installed on disc where it can be found by php. For the WebDAV server you will also need the HTTP_WebDAV_Server. The path to it can later be set during installation.

If you like to create the database before you start installation, then just create it manually with your favorite tool, optionally create a database user with access on the database and import one of the database dumps in the configuration directory. The installation script can do that for you as well, but it will need database access with sufficient rights to create databases.

', 'settings_install_welcome_title' => 'Welcome to the installation of SeedDMS', -'settings_install_zendframework' => 'Install Zend Framework, if you intend to use the full text search engine', +'settings_install_zendframework' => 'Install Zend Framework, if you intend to use the zend based full text search engine. Otherwise, ignore this message and continue the installation.', 'settings_language' => 'Default language', 'settings_language_desc' => 'Default language (name of a subfolder in folder "languages")', 'settings_libraryFolder' => 'Library folder', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 04227f71b..2f5ae2bc9 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -384,6 +384,7 @@ URL: [url]', 'edit_folder_notify' => 'Lista de notificación', 'edit_folder_props' => 'Editar carpeta', 'edit_group' => 'Editar grupo...', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuario...', 'edit_user_details' => 'Editar detalles de usuario', @@ -986,6 +987,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Carpeta para dejar ficheros', 'settings_dropFolderDir_desc' => 'Esta carpeta puede ser usada para dejar ficheros en el sistema de archivos del servidor e importarlos desde ahí en lugar de subirlos vía navegador. La carpeta debe contener un subdirectorio para cada usuario que tenga permiso para importar ficheros de esta forma.', 'settings_Edition' => 'Configuración de edición', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Habilitar Administrador Rev Apr', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index b05d93f88..6251607c6 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1026), jeromerobert (50), lonnnew (9) +// Translators: Admin (1028), jeromerobert (50), lonnnew (9) $text = array( 'accept' => 'Accepter', @@ -384,6 +384,7 @@ URL: [url]', 'edit_folder_notify' => 'Liste de notification de dossiers', 'edit_folder_props' => 'Modifier le dossier', 'edit_group' => 'Modifier un groupe', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Modifier un utilisateur', 'edit_user_details' => 'Modifier les détails d\'utilisateur', @@ -962,6 +963,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Répertoire de dépôt de fichier sur le serveur', 'settings_dropFolderDir_desc' => 'Ce répertoire peut être utilisé pour déposer des fichiers sur le serveur et les importer à partir d\'ici au lieu de les charger à partir du navigateur. Le répertoire doit avoir un sous-répertoire pour chaque utilisateur autorisé à importer des fichiers de cette manière.', 'settings_Edition' => 'Paramètres d’édition', +'settings_editOnlineFileTypes' => 'Editer le type de fichier', +'settings_editOnlineFileTypes_desc' => 'Editer la description du type de fichier', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Activer Admin Rev App', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 214fd640d..c4581bcc6 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -389,6 +389,7 @@ Internet poveznica: [url]', 'edit_folder_notify' => 'Popis za obavijesti o mapi', 'edit_folder_props' => 'Uredi mapu', 'edit_group' => 'Uredi mapu', +'edit_online' => '', 'edit_transmittal_props' => 'Izmjena postavki proslijeđivanja', 'edit_user' => 'Uredi korisnika', 'edit_user_details' => 'Uredi detalje korisnika', @@ -1007,6 +1008,8 @@ Internet poveznica: [url]', 'settings_dropFolderDir' => 'Mapa za zonu ispuštanja', 'settings_dropFolderDir_desc' => 'Ova mapa može se koristiti za ispuštanje datoteka na datotečni sustav poslužitelja i uvoz istih od tamo umjesto učitavanja preko internet preglednika. Mapa mora sadržavati pod mapu za svakog korisnika koji ima dozvolu za uvoz datoteka na ovaj način.', 'settings_Edition' => 'Postavke izdanja', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Omogućavanje potvrđivanja prijema dokumenta', 'settings_enableAcknowledgeWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.', 'settings_enableAdminRevApp' => 'Dopusti pregled/ovjeru za administratore', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index fba607c0e..f4c0bd6be 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -384,6 +384,7 @@ URL: [url]', 'edit_folder_notify' => 'Mappa értesítési lista', 'edit_folder_props' => 'Mappa szerkesztése', 'edit_group' => 'Csoport szerkesztése', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Felhasználó szerkesztése', 'edit_user_details' => 'Felhasználó részletes adatainak szerkesztése', @@ -985,6 +986,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Drop mappa könyvtára', 'settings_dropFolderDir_desc' => 'Ez a könyvtár használható az importálandó állományok elhelyezésére a fájlrendszeren a böngészővel történő feltöltés helyett. A könyvtárnak tartalmaznia kell alkönyvtárakat minden felhasználóhoz akinek engedélyezett az állományok ilyen módon történő importálása.', 'settings_Edition' => 'Kiadás beállítások', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást az adminisztrátorok számára', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 340e13c8e..a26ee7e42 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -390,6 +390,7 @@ URL: [url]', 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella', 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', +'edit_online' => '', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', 'edit_user_details' => 'Modifica i dettagli utente', @@ -1009,6 +1010,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Cartella per il drop', 'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.', 'settings_Edition' => 'Impostazioni di edizione', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche', 'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 1dfcd6937..77fcfd433 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -389,6 +389,7 @@ URL: [url]', 'edit_folder_notify' => '폴더 알림 목록', 'edit_folder_props' => '폴더 편집', 'edit_group' => '편집 그룹', +'edit_online' => '', 'edit_transmittal_props' => '전송 속성 편집', 'edit_user' => '사용자 편집', 'edit_user_details' => '사용자 세부 사항 편집', @@ -1000,6 +1001,8 @@ URL : [url]', 'settings_dropFolderDir' => '드롭 폴더 디렉토리', 'settings_dropFolderDir_desc' => '서버의 파일 시스템에서 파일을 Dropping 위해 디렉토리. 브라우저를 통해 업로드 할 수 있습니다. 각 사용자는 디렉토리를 소유 했거나 사용이 허가 권한이 있어야 합니다.', 'settings_Edition' => '판(Edition) 설정', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '문서 수신의 응답 활성화', 'settings_enableAcknowledgeWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.', 'settings_enableAdminRevApp' => '관리자에 대한 검토 / 승인 허용', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 8782a72ce..7a0ca9232 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -382,6 +382,7 @@ URL: [url]', 'edit_folder_notify' => 'Map Notificatie Lijst', 'edit_folder_props' => 'Wijzig Map eigenschappen', 'edit_group' => 'Wijzig Groep', +'edit_online' => '', 'edit_transmittal_props' => 'Opmerkingen bij verzending', 'edit_user' => 'Wijzig gebruiker', 'edit_user_details' => 'Wijzig gebruiker Details', @@ -982,6 +983,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Pad voor drop folder', 'settings_dropFolderDir_desc' => 'Dit pad kan gebruikt worden voor dropfiles op de server en hier vanaf te importeren in plaats van uploaden via de browser.', 'settings_Edition' => 'Uitgave instellingen', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Inschakelen Beheer Contr/Beoord', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 9974b7fb6..ce635ffca 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (728), netixw (84), romi (93), uGn (112) +// Translators: Admin (731), netixw (84), romi (93), uGn (112) $text = array( 'accept' => 'Akceptuj', @@ -377,6 +377,7 @@ URL: [url]', 'edit_folder_notify' => 'Lista powiadomień dla folderu', 'edit_folder_props' => 'Edytuj folder', 'edit_group' => 'Edytuj grupę', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Edytuj użytkownika', 'edit_user_details' => 'Zmień dane użytkownika', @@ -955,7 +956,7 @@ URL: [url]', 'settings_dbVersion' => 'Schemat bazy danych jest za stary', 'settings_defaultSearchMethod' => '', 'settings_defaultSearchMethod_desc' => '', -'settings_defaultSearchMethod_valdatabase' => '', +'settings_defaultSearchMethod_valdatabase' => 'baza danych', 'settings_defaultSearchMethod_valfulltext' => '', 'settings_delete_install_folder' => 'Aby móc używać LetoDMS, musisz usunąć plik ENABLE_INSTALL_TOOL znajdujący się w katalogu konfiguracyjnym', 'settings_disableSelfEdit' => 'Wyłącz auto edycję', @@ -965,6 +966,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Katalog dla folderu rozwijanego', 'settings_dropFolderDir_desc' => 'Ten katalog służy do kopiowania plików, przeznaczonych do zaimportowania, bezpośrednio do serwera i z pominięciem przeglądarki. W tym katalogu muszą się znajdować podfoldery dla wszystkich użytkowników, którzy posiadają uprawnienia do tego typu importu.', 'settings_Edition' => 'Ustawienia edycji', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Dołącz Administratora do recenzji/rewizji', @@ -1039,7 +1042,7 @@ URL: [url]', 'settings_footNote' => 'Treść stopki', 'settings_footNote_desc' => 'Wiadomość wyświetlana na dole każdej strony', 'settings_fullSearchEngine' => '', -'settings_fullSearchEngine_desc' => '', +'settings_fullSearchEngine_desc' => 'Ustaw metodę używaną do pełnotekstowego wyszukiwania', 'settings_fullSearchEngine_vallucene' => 'Zend Lucene', 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS', 'settings_guestID' => 'ID gościa', @@ -1109,7 +1112,7 @@ URL: [url]', 'settings_previewWidthDetail' => '', 'settings_previewWidthDetail_desc' => '', 'settings_previewWidthList' => '', -'settings_previewWidthList_desc' => '', +'settings_previewWidthList_desc' => 'Szerokość podglądu obrazu pokazanego na liście', 'settings_printDisclaimer' => 'Wyświetlaj Zrzeczenie się', 'settings_printDisclaimer_desc' => 'Zaznaczenie tej opcji spowoduje, że na dole strony będzie wyświetlany komunikat zrzeczenia się zawarty w pliku lang.inc.', 'settings_quota' => 'Przydział dysku użytkownika', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index ecdb1b5de..e19635b23 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -383,6 +383,7 @@ URL: [url]', 'edit_folder_notify' => 'Lista de notificação', 'edit_folder_props' => 'Editar pasta', 'edit_group' => 'Editar grupo', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Editar usuário', 'edit_user_details' => 'Editar Perfil', @@ -983,6 +984,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Diretório para pasta suspensa', 'settings_dropFolderDir_desc' => 'Este diretório pode ser usado para soltar arquivos no sistema de arquivos do servidor e importá-los de lá, em vez de fazer o upload através do browser. O diretório deve conter um sub-diretório para cada usuário que tem permissão para importar arquivos desta forma.', 'settings_Edition' => 'Configurações Edição', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Permitir revisão/aprovação para administradores', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 1bdd22c5f..87c8cefa5 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -389,6 +389,7 @@ URL: [url]', 'edit_folder_notify' => 'Listă de notificare pentru folder', 'edit_folder_props' => 'Editează folder', 'edit_group' => 'Editează grup', +'edit_online' => '', 'edit_transmittal_props' => 'Editeaza proprietatile de transmitere', 'edit_user' => 'Editează utilizator', 'edit_user_details' => 'Editează detalii utilizator', @@ -1008,6 +1009,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Director pentru plasare folder(drop folder)', 'settings_dropFolderDir_desc' => 'Acest director poate fi utilizat pentru plasarea fișierelor pe sistemul de fișiere al serverului și importul acestora de acolo în loc să mai fie încărcate prin intermediul browser-ului. Directorul trebuie să conțină un subdirector pentru fiecare utilizator care are permisiunea de a importa fișiere în acest fel.', 'settings_Edition' => 'Setările Editiei', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Permite revizuirea/aprobarea pentru admini', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 799575de6..7d1810699 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -389,6 +389,7 @@ URL: [url]', 'edit_folder_notify' => 'Список уведомления каталога', 'edit_folder_props' => 'Изменить каталог', 'edit_group' => 'Изменить группу', +'edit_online' => '', 'edit_transmittal_props' => 'Редактировать группы получателей', 'edit_user' => 'Редактировать пользователя', 'edit_user_details' => 'Изменить данные пользователя', @@ -1015,6 +1016,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Размещение проходного каталога', 'settings_dropFolderDir_desc' => 'Этот каталог используется для размещения файлов на сервере и их импорта вместо загрузки через браузер. Каталог должен содержать подкаталог для каждого пользователя, которому разрешён импорт файлов таким способом.', 'settings_Edition' => 'Настройки версий', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Включить подтверждение получения документа', 'settings_enableAcknowledgeWorkflow_desc' => 'Включить для активации функции подтверждения получения документа', 'settings_enableAdminRevApp' => 'Администратор как
рецензирующий и утверждающий', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 157610b46..373f2880f 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -336,6 +336,7 @@ URL: [url]', 'edit_folder_notify' => 'Zoznam upozornení', 'edit_folder_props' => 'Uprav priečinok', 'edit_group' => 'Upraviť skupinu', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Upraviť používateľa', 'edit_user_details' => 'Upraviť podrobnosti používateľa', @@ -840,6 +841,8 @@ URL: [url]', 'settings_dropFolderDir' => '', 'settings_dropFolderDir_desc' => '', 'settings_Edition' => '', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 11d62456d..a452d6f44 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -377,6 +377,7 @@ URL: [url]', 'edit_folder_notify' => 'Katalog-meddelandelista', 'edit_folder_props' => 'Ändra katalog', 'edit_group' => 'Ändra grupp', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Ändra användare', 'edit_user_details' => 'Ändra användarens information', @@ -971,6 +972,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Mapp för mellanlagring av filer', 'settings_dropFolderDir_desc' => 'Denna mapp kan användas för att mellanlagra filer på serverns filsystem och den kan importeras därifrån istället för att filen laddas upp via webbläsaren. Mappen måste innehålla en undermapp för varje användare som har tillstånd att importera filer denna vägen.', 'settings_Edition' => 'Redigeringsinställningar', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Visa Admin i listan granska/godkänna', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 58c20d57b..79113505f 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -383,6 +383,7 @@ URL: [url]', 'edit_folder_notify' => 'Klasör Bildirim Listesi', 'edit_folder_props' => 'Klasörü düzenle', 'edit_group' => 'Grubu düzenle', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => 'Kullanıcıyı düzenle', 'edit_user_details' => 'Kullanıcı Detaylarını Düzenle', @@ -987,6 +988,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Sürükleme klasörü dizini', 'settings_dropFolderDir_desc' => 'Bu dizin, tarayıcı üzerinden dosya göndermek yerine dosyaları sürükleyip bırakmak için kullanılacak dizindir. Bu işi yapmaya yetkili kılınmış her bir kullanıcı için alt dizin içermelidir.', 'settings_Edition' => 'Düzenleme ayarları', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Yöneticilere kontrol/onay izni ver', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 388eb8451..2203a268b 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -389,6 +389,7 @@ URL: [url]', 'edit_folder_notify' => 'Список сповіщення каталогу', 'edit_folder_props' => 'Змінити каталог', 'edit_group' => 'Змінити групу', +'edit_online' => '', 'edit_transmittal_props' => 'Редагувати налаштування перенесення', 'edit_user' => 'Редагувати користувача', 'edit_user_details' => 'Змінити дані користувача', @@ -1008,6 +1009,8 @@ URL: [url]', 'settings_dropFolderDir' => 'Розміщення проміжного каталогу', 'settings_dropFolderDir_desc' => 'Цей каталог використовується для розміщення файлів на сервері і їх імпорту замість завантаження їх через браузер. Каталог повинен містити підкаталог для кожного користувача, якому дозволено імпорт файлів таким методом.', 'settings_Edition' => 'Налаштування версій', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Увімкнути підтвердження отримання документу', 'settings_enableAcknowledgeWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу', 'settings_enableAdminRevApp' => 'Адміністратор може бути
рецензент і затверджувач', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index bd26f74af..c4a5f69c9 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -338,6 +338,7 @@ URL: [url]', 'edit_folder_notify' => '文件夹通知列表', 'edit_folder_props' => '编辑文件夹', 'edit_group' => '编辑组别', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => '编辑用户', 'edit_user_details' => '编辑用户详情', @@ -842,6 +843,8 @@ URL: [url]', 'settings_dropFolderDir' => '', 'settings_dropFolderDir_desc' => '', 'settings_Edition' => '编辑设置', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index f461830d7..a885555ff 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -336,6 +336,7 @@ URL: [url]', 'edit_folder_notify' => '資料夾通知列表', 'edit_folder_props' => '編輯資料夾', 'edit_group' => '編輯組別', +'edit_online' => '', 'edit_transmittal_props' => '', 'edit_user' => '編輯用戶', 'edit_user_details' => '編輯用戶詳情', @@ -840,6 +841,8 @@ URL: [url]', 'settings_dropFolderDir' => '', 'settings_dropFolderDir_desc' => '', 'settings_Edition' => '', +'settings_editOnlineFileTypes' => '', +'settings_editOnlineFileTypes_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', From c583feb8689e0813298da0e492f95f006cd6a0f1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 18 Mar 2016 15:41:21 +0100 Subject: [PATCH 20/20] get list of notifications before deleting folder --- op/op.Ajax.php | 1 + 1 file changed, 1 insertion(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index a83611b42..99be0fe3b 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -290,6 +290,7 @@ switch($command) { if($folder) { if ($folder->getAccessMode($user) >= M_READWRITE) { $parent=$folder->getParent(); + $nl = $folder->getNotifyList(); $foldername = $folder->getName(); if($folder->remove()) { if ($notifier) {