\n";
@@ -347,10 +241,15 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
}
}
- $this->contentContainerEnd();
+ } /* }}} */
+
+ function listMissingChecksum() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $folder = $this->params['folder'];
+ $nochecksumversions = $this->params['nochecksumversions'];
$this->contentHeading(getMLText("missing_checksum"));
- $this->contentContainerStart();
if($nochecksumversions) {
print "";
@@ -375,14 +274,18 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
echo ''.getMLText('do_object_setchecksum').'
';
}
}
+ } /* }}} */
- $this->contentContainerEnd();
+ function listDuplicateContent() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $folder = $this->params['folder'];
+ $duplicateversions = $this->params['duplicateversions'];
$this->contentHeading(getMLText("duplicate_content"));
- $this->contentContainerStart();
if($duplicateversions) {
- print "";
+ print "";
print "\n\n";
print "| ".getMLText("document")." | \n";
print "".getMLText("version")." | \n";
@@ -403,8 +306,125 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
}
print "
\n";
}
+} /* }}} */
+
+ function listDocsInRevisionNoAccess() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $folder = $this->params['folder'];
+ $docsinrevision = $this->params['docsinrevision'];
+ $cachedir = $this->params['cachedir'];
+ $previewwidth = $this->params['previewWidthList'];
+ $previewconverters = $this->params['previewconverters'];
+ $timeout = $this->params['timeout'];
+
+ $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+ $previewer->setConverters($previewconverters);
+
+ $this->contentHeading(getMLText("docs_in_revision_no_access"));
+
+ if($docsinrevision) {
+ $this->printList($docsinrevision, $previewer);
+ }
+ } /* }}} */
+
+ function listDocsInReceptionNoAccess() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $folder = $this->params['folder'];
+ $docsinreception = $this->params['docsinreception'];
+ $cachedir = $this->params['cachedir'];
+ $previewwidth = $this->params['previewWidthList'];
+ $previewconverters = $this->params['previewconverters'];
+ $timeout = $this->params['timeout'];
+
+ $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+ $previewer->setConverters($previewconverters);
+
+ $this->contentHeading(getMLText("docs_in_revision_no_access"));
+
+ if($docsinreception) {
+ $this->printList($docsinreception, $previewer, 'listDocsInReceptionNoAccess');
+ }
+ } /* }}} */
+
+ function js() { /* {{{ */
+ $user = $this->params['user'];
+ $folder = $this->params['folder'];
+
+ header('Content-Type: application/javascript; charset=UTF-8');
+
+ $this->printDeleteFolderButtonJs();
+ $this->printDeleteDocumentButtonJs();
+?>
+$(document).ready( function() {
+ $('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
+ ev.preventDefault();
+ $('#kkkk.ajax').data('action', $(this).data('action'));
+ $('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
+ });
+ $('body').on('click', 'table th a', function(ev){
+ ev.preventDefault();
+ $('#kkkk.ajax').data('action', $(this).data('action'));
+ $('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby'), orderdir: $(this).data('orderdir')});
+ });
+});
+params['dms'];
+ $user = $this->params['user'];
+ $folder = $this->params['folder'];
+ $listtype = $this->params['listtype'];
+ $unlinkedcontent = $this->params['unlinkedcontent'];
+ $unlinkedfolders = $this->params['unlinkedfolders'];
+ $unlinkeddocuments = $this->params['unlinkeddocuments'];
+ $nofilesizeversions = $this->params['nofilesizeversions'];
+ $nochecksumversions = $this->params['nochecksumversions'];
+ $duplicateversions = $this->params['duplicateversions'];
+ $docsinrevision = $this->params['docsinrevision'];
+ $docsinreception = $this->params['docsinreception'];
+ $repair = $this->params['repair'];
+ $unlink = $this->params['unlink'];
+ $setfilesize = $this->params['setfilesize'];
+ $setchecksum = $this->params['setchecksum'];
+ $rootfolder = $this->params['rootfolder'];
+ $repairobjects = $this->params['repairobjects'];
+ $this->enableClipboard = $this->params['enableclipboard'];
+
+ $this->htmlAddHeader(''."\n", 'js');
+
+ $this->htmlStartPage(getMLText("admin_tools"));
+ $this->globalNavigation();
+ $this->contentStart();
+ $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+
+ echo '';
+ echo '
';
+ $this->contentHeading(getMLText("object_check_critical"));
+ echo '
';
+ $this->contentHeading(getMLText("object_check_warning"));
+ echo '
';
+ echo '
';
+ echo '
';
+
+ echo '
';
+
+ echo '
';
+ echo '
';
- $this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */
diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index e7d285858..7b15b77ed 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -127,16 +127,17 @@ $(document).ready(function() {
print "
";
}
?>
-
>
+
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a08b8a9b7..923a4ec6e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -85,6 +85,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
function show() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
+ $users = $this->params['allusers'];
+ $groups = $this->params['allgroups'];
$settings = $this->params['settings'];
$currenttab = $this->params['currenttab'];
@@ -509,6 +511,17 @@ if(!is_writeable($settings->_configFilePath)) {
| : |
showTextField("cookieLifetime", $settings->_cookieLifetime); ?> |
+ ">
+ | : |
+
+
+ |
+
@@ -666,6 +679,10 @@ if(!is_writeable($settings->_configFilePath)) {
: |
_enableOwnerReceipt) echo "checked" ?> /> |
+ ">
+ | : |
+ _enableUpdateReceipt) echo "checked" ?> /> |
+
">
| : |
_enableVersionDeletion) echo "checked" ?> /> |
@@ -803,6 +820,32 @@ if(!is_writeable($settings->_configFilePath)) {
" value="1" _extensions[$extname][$confkey]) && $settings->_extensions[$extname][$confkey]) echo 'checked'; ?> />
_extensions[$extname][$confkey]))
+ $selusers = explode(',', $settings->_extensions[$extname][$confkey]);
+ else
+ $selusers = array();
+ echo '';
+ break;
+ case 'groups':
+ if(isset($settings->_extensions[$extname][$confkey]))
+ $selgroups = explode(',', $settings->_extensions[$extname][$confkey]);
+ else
+ $selgroups = array();
+ echo '';
+ break;
+ }
+ break;
default:
?>
" title="" value="_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" size="" />
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index a54b43831..5e2e8b8e5 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -142,7 +142,7 @@ $(document).ready( function() {
echo "
";
if($user->isAdmin() && $seluser->getID() != $user->getID())
- echo "getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."\n";
+ echo "getID())."&formtoken=".createFormKey('substituteuser')."\"> ".getMLText('substitute_user')." ";
}
} /* }}} */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 875745055..a8e5f107a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1195,10 +1195,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "";
if($accessop->mayReceipt($document)) {
- if ($is_recipient && $r["status"]==0) {
- print "- ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
";
- }else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
- print "- ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
";
+ if ($is_recipient) {
+ if($r["status"]==0) {
+ print "- ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."
";
+ } elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))) {
+ print "- ".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."
";
+ }
}
}
diff --git a/webdav/webdav.php b/webdav/webdav.php
index 71a5cc184..dd58d7868 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -6,31 +6,6 @@ if(!empty($settings->_coreDir))
else
require_once('SeedDMS/Core.php');
-/* Set apache_request_headers() in case it doesn't exists, like
- * when using fastcgi (patch by christopher täufert taken from http://php.net/)
- */
-if( !function_exists('apache_request_headers') ) {
- function apache_request_headers() {
- $arh = array();
- $rx_http = '/\AHTTP_/';
- foreach($_SERVER as $key => $val) {
- if( preg_match($rx_http, $key) ) {
- $arh_key = preg_replace($rx_http, '', $key);
- $rx_matches = array();
- // do some nasty string manipulations to restore the original letter case
- // this should work in most cases
- $rx_matches = explode('_', $arh_key);
- if( count($rx_matches) > 0 and strlen($arh_key) > 2 ) {
- foreach($rx_matches as $ak_key => $ak_val) $rx_matches[$ak_key] = ucfirst($ak_val);
- $arh_key = implode('-', $rx_matches);
- }
- $arh[$arh_key] = $val;
- }
- }
- return( $arh );
- }
-}
-
/**
* SeedDMS access using WebDAV
*
@@ -79,10 +54,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
// special treatment for litmus compliance test
// reply on its identifier header
// not needed for the test itself but eases debugging
- foreach (apache_request_headers() as $key => $value) {
- if (stristr($key, "litmus")) {
- error_log("Litmus test $value");
- header("X-Litmus-reply: ".$value);
+ if( function_exists('apache_request_headers') ) {
+ foreach (apache_request_headers() as $key => $value) {
+ if (stristr($key, "litmus")) {
+ error_log("Litmus test $value");
+ header("X-Litmus-reply: ".$value);
+ }
}
}
|