-contentContainerStart(); ?>
-
+ $this->showStartPaneContent('system', $currenttab == 'system');
+?>
-
-contentContainerEnd(); ?>
-
-
- | : | -showTextField("rootDir", $settings->_rootDir); ?> | -
| : | -showTextField("httpRoot", $settings->_httpRoot); ?> | -
| : | -showTextField("contentDir", $settings->_contentDir); ?> | -
| : | -showTextField("backupDir", $settings->_backupDir); ?> | -
| : | -showTextField("cacheDir", $settings->_cacheDir); ?> | -
| : | -showTextField("stagingDir", $settings->_stagingDir); ?> | -
| : | -showTextField("luceneDir", $settings->_luceneDir); ?> | -
| : | -showTextField("dropFolderDir", $settings->_dropFolderDir); ?> | -
| : | -_logFileEnable) echo "checked" ?> /> | -
| : | -- - |
| : | -_enableLargeFileUpload) echo "checked" ?> /> | -
| : | -showTextField("partitionSize", $settings->_partitionSize); ?> | -
| : | -showTextField("maxUploadSize", $settings->_maxUploadSize); ?> | -
| : | -_enableGuestLogin) echo "checked" ?> /> | -
| : | -_enableGuestAutoLogin) echo "checked" ?> /> | -
| : | -_restricted) echo "checked" ?> /> | -
| : | -_enableUserImage) echo "checked" ?> /> | -
| : | -_disableSelfEdit) echo "checked" ?> /> | -
| : | -_enablePasswordForgotten) echo "checked" ?> /> | -
| : | -showTextField("passwordStrength", $settings->_passwordStrength); ?> | -
| : | -- - | -
| : | -showTextField("passwordExpiration", $settings->_passwordExpiration); ?> | -
| : | -showTextField("passwordHistory", $settings->_passwordHistory); ?> | -
| : | -showTextField("loginFailure", $settings->_loginFailure); ?> | -
| : | -showTextField("autoLoginUser", $settings->_autoLoginUser); ?> | -
| : | -showTextField("quota", $settings->_quota); ?> | -
| : | -showTextField("undelUserIds", $settings->_undelUserIds); ?> | -
| : | -showTextField("encryptionKey", $settings->_encryptionKey); ?> | -
| : | -showTextField("cookieLifetime", $settings->_cookieLifetime); ?> | -
| : | -- - | -
| : | -showTextField("dbDriver", $settings->_dbDriver); ?> | -
| : | -showTextField("dbHostname", $settings->_dbHostname); ?> | -
| : | -showTextField("dbDatabase", $settings->_dbDatabase); ?> | -
| : | -showTextField("dbUser", $settings->_dbUser); ?> | -
| : | -showTextField("dbPass", $settings->_dbPass, 'password'); ?> | -
| : | -showTextField("smtpServer", $settings->_smtpServer); ?> | -
| : | -showTextField("smtpPort", $settings->_smtpPort); ?> | -
| : | -showTextField("smtpSendFrom", $settings->_smtpSendFrom); ?> | -
| : | -showTextField("smtpUser", $settings->_smtpUser); ?> | -
| : | -- |
-contentContainerStart(); ?>
-
+ $this->showStartPaneContent('advanced', $currenttab == 'advanced');
+?>
-
-contentContainerEnd(); ?>
-
+ $this->showEndPaneContent('advanced', $currenttab);
- | : | -showTextField("siteDefaultPage", $settings->_siteDefaultPage); ?> | -
| : | -showTextField("rootFolderID", $settings->_rootFolderID); ?> | -
| : | -_titleDisplayHack) echo "checked" ?> /> | -
| : | -_showMissingTranslations) echo "checked" ?> /> | -
| : | -showTextField("guestID", $settings->_guestID); ?> | -
| : | -showTextField("adminIP", $settings->_adminIP); ?> | -
| : | -- - | -
| : | -showTextField("versioningFileName", $settings->_versioningFileName); ?> | -
| : | -showTextField("presetExpirationDate", $settings->_presetExpirationDate); ?> | -
| : | -_enableAdminRevApp) echo "checked" ?> /> | -
| : | -_enableOwnerRevApp) echo "checked" ?> /> | -
| : | -_enableSelfRevApp) echo "checked" ?> /> | -
| : | -_enableUpdateRevApp) echo "checked" ?> /> | -
| : | -_enableVersionDeletion) echo "checked" ?> /> | -
| : | -_enableVersionModification) echo "checked" ?> /> | -
| : | -_enableDuplicateDocNames) echo "checked" ?> /> | -
| : | -_overrideMimeType) echo "checked" ?> /> | -
| : | -_removeFromDropFolder) echo "checked" ?> /> | -
| : | -_enableOwnerNotification) echo "checked" ?> /> | -
| : | -_enableNotificationAppRev) echo "checked" ?> /> | -
| : | -_enableNotificationWorkflow) echo "checked" ?> /> | -
| : | -showTextField("coreDir", $settings->_coreDir); ?> | -
| : | -showTextField("luceneClassDir", $settings->_luceneClassDir); ?> | -
| : | -showTextField("extraPath", $settings->_extraPath); ?> | -
| : | -showTextField("contentOffsetDir", $settings->_contentOffsetDir); ?> | -
| : | -showTextField("maxDirID", $settings->_maxDirID); ?> | -
| : | -showTextField("updateNotifyTime", $settings->_updateNotifyTime); ?> | -
| : | -showTextField("maxExecutionTime", $settings->_maxExecutionTime); ?> | -
| : | -showTextField("cmdTimeout", $settings->_cmdTimeout); ?> | -
| : | -showTextField("converters[".$target."][".$mimetype."]", htmlspecialchars($cmd)); ?> | -
| showTextField("converters[".$target."][newmimetype]", "", '', getMLText('converter_new_mimetype')); ?>: | -showTextField("converters[".$target."][newcmd]", "", "", getMLText('converter_new_cmd')); ?> | -
-contentContainerStart(); ?>
-
_configFilePath)) {
diff --git a/views/bootstrap/class.Setup2Factor.php b/views/bootstrap/class.Setup2Factor.php
new file mode 100644
index 000000000..12311557f
--- /dev/null
+++ b/views/bootstrap/class.Setup2Factor.php
@@ -0,0 +1,114 @@
+
+ * @copyright Copyright (C) 2016 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include classes for 2-factor authentication
+ */
+require "vendor/autoload.php";
+
+/**
+ * Class which outputs the html page for ForcePasswordChange view
+ *
+ * @category DMS
+ * @package SeedDMS
+ * @author Markus Westphal, Malcolm Cowe, Uwe Steinmann '), + 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; + ev.preventDefault(); + }); +}); +params['dms']; + $user = $this->params['user']; + $sitename = $this->params['sitename']; + + $this->htmlStartPage(getMLText("2_factor_auth"), "forcepasswordchange"); + $this->globalNavigation(); + $this->contentStart(); + $this->pageNavigation(getMLText("my_account"), "my_account"); + $this->contentHeading(getMLText('2_factor_auth')); + echo "
".getMLText('2_factor_auth_info')."
";
+ echo '';
+ $this->contentContainerStart('span6');
+
+ $tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
+ $oldsecret = $user->getSecret();
+ $secret = $tfa->createSecret();
+?>
+
+contentContainerEnd();
+ $this->contentContainerStart('span6');
+ echo '.')
';
+?>
+contentContainerEnd();
+ echo '
';
+ $this->contentEnd();
+ $this->htmlEndPage();
+ } /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.Statistic.php b/views/bootstrap/class.Statistic.php
index a234b91c5..dd1ba1c68 100644
--- a/views/bootstrap/class.Statistic.php
+++ b/views/bootstrap/class.Statistic.php
@@ -179,17 +179,17 @@ class SeedDMS_View_Statistic extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("folders_and_documents_statistic"));
echo "'.$oldsecret.'
';
+ echo '\n";
echo "
\n";
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 11c121d03..4ab43fe2f 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -39,25 +39,42 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
private function __myTasks() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
- $tasks['review'] = array();
- $tasks['approval'] = array();
- $tasks['receipt'] = array();
- $tasks['revision'] = array();
- $resArr = $dms->getDocumentList('ApproveByMe', $user);
- if($resArr) {
- foreach ($resArr as $res) {
- $document = $dms->getDocument($res["id"]);
- if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
- $tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+ $workflowmode = $this->params['workflowmode'];
+ if($workflowmode == 'traditional')
+ $tasks['review'] = array();
+ elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
+ $tasks['approval'] = array();
+ elseif($workflowmode == 'advanced')
+ $tasks['workflow'] = array();
+
+ if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+ $resArr = $dms->getDocumentList('ApproveByMe', $user);
+ if($resArr) {
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+ }
}
}
- }
- $resArr = $dms->getDocumentList('ReviewByMe', $user);
- if($resArr) {
- foreach ($resArr as $res) {
- $document = $dms->getDocument($res["id"]);
- if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
- $tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+ } elseif($workflowmode == 'traditional') {
+ $resArr = $dms->getDocumentList('ReviewByMe', $user);
+ if($resArr) {
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+ }
+ }
+ }
+ } elseif($workflowmode == 'advanced') {
+ $resArr = $dms->getDocumentList('WorkflowByMe', $user);
+ if($resArr) {
+ foreach ($resArr as $res) {
+ $document = $dms->getDocument($res["id"]);
+ if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+ $tasks['workflow'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+ }
}
}
}
@@ -104,9 +121,20 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
$content = '';
// $content .= " \n";
echo $content;
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 0acc3e9cc..578309311 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -232,43 +232,50 @@ div.timeline-event-selected {
echo "\n";
- echo "
\n";
echo "\n";
+ $this->contentContainerStart();
print "
\n";
+ $this->contentContainerEnd();
echo "- \n";
$this->printFolder($rootfolder);
print "
\n";
- echo "
\n";
echo "\n";
+ $this->contentContainerStart();
print "\n";
print "
\n";
+ $this->contentContainerEnd();
echo "- \n";
print "
- ".getMLText("access_inheritance")." "; @@ -208,7 +208,7 @@ class SeedDMS_View_Statistic extends SeedDMS_Bootstrap_Style { print "
\n";
$this->contentHeading(getMLText("timeline"));
- echo "
\n";
+ $this->contentContainerStart();
?>
\n";
+ $this->contentContainerEnd();
echo "";
echo "
\n";
diff --git a/views/bootstrap/class.TransferDocument.php b/views/bootstrap/class.TransferDocument.php
index ab1bd58a8..941526dcc 100644
--- a/views/bootstrap/class.TransferDocument.php
+++ b/views/bootstrap/class.TransferDocument.php
@@ -44,37 +44,27 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
contentContainerEnd();
diff --git a/views/bootstrap/class.TransferObjects.php b/views/bootstrap/class.TransferObjects.php
index 1855f9a45..2baba8902 100644
--- a/views/bootstrap/class.TransferObjects.php
+++ b/views/bootstrap/class.TransferObjects.php
@@ -50,32 +50,26 @@ class SeedDMS_View_TransferObjects extends SeedDMS_Bootstrap_Style {
-
-
-
-
-
-
-
-
-
-
-
contentContainerEnd();
diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index b7880b997..05db1cc1b 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -107,19 +107,21 @@ $(document).ready(function() {
-
-
-
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 4133de761..ee94d8c6b 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -215,147 +215,153 @@ console.log(element);
$this->contentContainerStart();
?>
-
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 328d6d1dc..49761f06b 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -214,7 +214,7 @@ $(document).ready( function() {
$workflowmode = $this->params['workflowmode'];
$quota = $this->params['quota'];
?>
-
printTimelineJs('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
}
$this->printDocumentChooserJs("form1");
+ $this->printDeleteDocumentButtonJs();
} /* }}} */
function documentInfos() { /* {{{ */
@@ -356,7 +357,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
contentHeading(getMLText("preview"));
?>
-
+ contentContainerStart(); ?>
-
+ contentContainerEnd(); ?>
-
+ contentContainerStart(); ?>
-
+ contentContainerEnd(); ?>
getID()."\"" : "") ?>>
getID()."\"" : "") ?>>
-
+ contentContainerEnd(); ?>
+ contentContainerStart(); ?>
-getID()."\"" : "") ?>>