\n";
+ echo "
\n";
$this->contentContainerStart();
print "\n";
$this->contentContainerEnd();
+ echo "
\n";
+ echo "
\n";
+ if($log) {
+ echo "
\n";
+ echo "| ".getMLText('id')." | \n";
+ echo "".getMLText('message')." |
\n";
+ foreach($log as $item) {
+ $class = $item['type'] == 'success' ? 'success' : 'error';
+ echo "| ".$item['id']." | ".$item['msg']." |
\n";
+ }
+ echo "
";
+ }
+ echo "
\n";
+ echo "
\n";
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */
diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php
index 66b9659ba..a733fef90 100644
--- a/views/bootstrap/class.Info.php
+++ b/views/bootstrap/class.Info.php
@@ -114,12 +114,6 @@ class SeedDMS_View_Info extends SeedDMS_Bootstrap_Style {
contentContainerStart();
- echo $version->banner();
- $this->contentContainerEnd();
-// $this->contentContainerStart();
-// phpinfo();
-// $this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 5ffa237ae..a38901f71 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -145,7 +145,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
$this->user = $this->params['user'];
$this->cachedir = $this->params['cachedir'];
$this->previewwidth = $this->params['previewWidthList'];
- $this->previewconverters = $this->params['previewconverters'];
+ $this->previewconverters = $this->params['previewConverters'];
$this->db = $this->dms->getDB();
$this->timeout = $this->params['timeout'];
$this->xsendfile = $this->params['xsendfile'];
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 1bd5a13b9..64e610b31 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -113,7 +113,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -145,7 +145,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -175,7 +175,7 @@ $(document).ready( function() {
$workflowmode = $this->params['workflowmode'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -225,7 +225,7 @@ $(document).ready( function() {
$cachedir = $this->params['cachedir'];
$showtree = $this->params['showtree'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -256,7 +256,7 @@ $(document).ready( function() {
$cachedir = $this->params['cachedir'];
$showtree = $this->params['showtree'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -287,7 +287,7 @@ $(document).ready( function() {
$cachedir = $this->params['cachedir'];
$showtree = $this->params['showtree'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -317,7 +317,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -419,7 +419,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -452,7 +452,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -483,7 +483,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -516,7 +516,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -547,7 +547,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -578,7 +578,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -609,7 +609,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -640,7 +640,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -671,7 +671,7 @@ $(document).ready( function() {
$orderdir = $this->params['orderdir'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
@@ -703,7 +703,7 @@ $(document).ready( function() {
$cachedir = $this->params['cachedir'];
$workflowmode = $this->params['workflowmode'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index ce86b23c5..0ab02b195 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -382,7 +382,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
$docsinrevision = $this->params['docsinrevision'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
@@ -402,7 +402,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
$docsinreception = $this->params['docsinreception'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
@@ -422,7 +422,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
$processwithoutusergroup = $this->params['processwithoutusergroup'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$repair = $this->params['repair'];
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 5d8fc68ab..4876c9342 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
$user = $this->params['user'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 6c87569cc..fa003d596 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
$user = $this->params['user'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
index 30557151f..adfc54b55 100644
--- a/views/bootstrap/class.RevisionSummary.php
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
$user = $this->params['user'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
- $previewconverters = $this->params['previewconverters'];
+ $previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 1c5cec700..8e7c51802 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -99,8 +99,7 @@ $(document).ready( function() {
$user = $this->params['user'];
$extname = $this->params['extname'];
$taskname = $this->params['taskname'];
- if($extname && $taskname) {
- $taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname];
+ if($extname && $taskname && is_object($taskobj = resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname]))) {
if(method_exists($taskobj, 'getAdditionalParams'))
$additionalparams = $taskobj->getAdditionalParams();
else
@@ -135,6 +134,13 @@ $(document).ready( function() {