'.getMLText('do_object_repair').'';
+ }
} /* }}} */
function listReceiptWithoutGroup() { /* {{{ */
@@ -435,6 +442,16 @@ $(document).ready( function() {
$('#kkkk.ajax').data('action', $(this).data('action'));
$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
});
+ $('body').on('click', 'div.repair a', function(ev){
+ ev.preventDefault();
+ $('#kkkk.ajax').data('action', $(this).data('action'));
+ $('#kkkk.ajax').trigger('update', {repair: 1});
+ });
+ $('body').on('click', 'a.repair', function(ev){
+ ev.preventDefault();
+ $('#kkkk.ajax').data('action', $(this).data('action'));
+ $('#kkkk.ajax').trigger('update', {repair: 1, required: $(this).data('required')});
+ });
$('body').on('click', 'table th a', function(ev){
ev.preventDefault();
$('#kkkk.ajax').data('action', $(this).data('action'));
diff --git a/views/bootstrap/class.SendLoginData.php b/views/bootstrap/class.SendLoginData.php
new file mode 100644
index 000000000..cb7e50655
--- /dev/null
+++ b/views/bootstrap/class.SendLoginData.php
@@ -0,0 +1,72 @@
+
+ * @copyright Copyright (C) 2017 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for SendLoginData view
+ *
+ * @category DMS
+ * @package SeedDMS
+ * @author Uwe Steinmann
+ * @copyright Copyright (C) 2017 Uwe Steinmann
+ * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ * 2010-2012 Uwe Steinmann
+ * @version Release: @package_version@
+ */
+class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
+
+ function show() { /* {{{ */
+ $dms = $this->params['dms'];
+ $user = $this->params['user'];
+ $newuser = $this->params['newuser'];
+
+ $this->htmlStartPage(getMLText("admin_tools"));
+ $this->globalNavigation();
+ $this->contentStart();
+ $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+ $this->contentHeading(getMLText("send_login_data"));
+
+ $this->contentContainerStart();
+?>
+
+contentContainerEnd();
+ $this->contentEnd();
+ $this->htmlEndPage();
+ } /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.TransferObjects.php b/views/bootstrap/class.TransferObjects.php
index 70f97ab91..1855f9a45 100644
--- a/views/bootstrap/class.TransferObjects.php
+++ b/views/bootstrap/class.TransferObjects.php
@@ -7,9 +7,7 @@
* @license GPL 2
* @version @version@
* @author Uwe Steinmann
- * @copyright Copyright (C) 2002-2005 Markus Westphal,
- * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- * 2010-2012 Uwe Steinmann
+ * @copyright Copyright (C) 2017 Uwe Steinmann
* @version Release: @package_version@
*/
@@ -23,10 +21,8 @@ require_once("class.Bootstrap.php");
*
* @category DMS
* @package SeedDMS
- * @author Markus Westphal, Malcolm Cowe, Uwe Steinmann
- * @copyright Copyright (C) 2002-2005 Markus Westphal,
- * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- * 2010-2012 Uwe Steinmann
+ * @author Uwe Steinmann
+ * @copyright Copyright (C) 2017 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_TransferObjects extends SeedDMS_Bootstrap_Style {
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 7288ba361..c7ec6bf4d 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -192,6 +192,7 @@ $(document).ready( function() {
$quota = $this->params['quota'];
$workflowmode = $this->params['workflowmode'];
$undeluserids = $this->params['undeluserids'];
+ $enableemail = $this->params['enableemail'];
if($seluser) {
?>
@@ -209,6 +210,8 @@ $(document).ready( function() {
echo ' '.getMLText("transfer_objects").'';
if($user->isAdmin() && $seluser->getID() != $user->getID())
echo "getID()."&formtoken=".createFormKey('substituteuser')."\"> ".getMLText("substitute_user")."\n";
+ if($enableemail)
+ echo ' '.getMLText("send_login_data").'';
?>
diff --git a/webdav/webdav.php b/webdav/webdav.php
index e2ebd9790..716c6cfb7 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -43,6 +43,14 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
*/
var $user = "";
+ /**
+ * Set to true if original file shall be used instead of document name
+ *
+ * @access private
+ * @var boolean
+ */
+ var $useorgfilename = false;
+
/**
* Serve a webdav request
*
@@ -184,7 +192,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
$this->logger->log('reverseLookup: found folder '.$root->getName().' ('.$root->getID().')', PEAR_LOG_DEBUG);
return $root;
} else {
- if($document = $this->dms->getDocumentByName($docname, $root)) {
+ if($this->useorgfilename)
+ $document = $this->dms->getDocumentByOriginalFilename($docname, $root);
+ else
+ $document = $this->dms->getDocumentByName($docname, $root);
+ if($document) {
if($this->logger)
$this->logger->log('reverseLookup: found document '.$document->getName().' ('.$document->getID().')', PEAR_LOG_DEBUG);
return $document;
@@ -201,7 +213,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
}
if($folder) {
if($docname) {
- if($document = $this->dms->getDocumentByName($docname, $folder)) {
+ if($this->useorgfilename)
+ $document = $this->dms->getDocumentByOriginalFilename($docname, $folder);
+ else
+ $document = $this->dms->getDocumentByName($docname, $folder);
+ if($document) {
if($this->logger)
$this->logger->log('reverseLookup: found document '.$document->getName().' ('.$document->getID().')', PEAR_LOG_DEBUG);
return $document;
@@ -341,8 +357,13 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
// $path .= rawurlencode($pathseg->getName()).'/';
$path .= $pathseg->getName().'/';
// $info["path"] = htmlspecialchars($path.rawurlencode($obj->getName()));
- $info["path"] = $path.$obj->getName();
- $info["props"][] = $this->mkprop("displayname", $obj->getName());
+ if($this->useorgfilename) {
+ $info["path"] = $path.$content->getOriginalFileName();
+ $info["props"][] = $this->mkprop("displayname", $content->getOriginalFileName());
+ } else {
+ $info["path"] = $path.$obj->getName();
+ $info["props"][] = $this->mkprop("displayname", $obj->getName());
+ }
$info["props"][] = $this->mkprop("resourcetype", "");
if (1 /*is_readable($fspath)*/) {
@@ -495,6 +516,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
$fspath = $this->dms->contentDir.'/'.$content->getPath();
$filesize = filesize($fspath);
+ if($this->useorgfilename)
+ $filename = $content->getOriginalFileName();;
}
// $name = htmlspecialchars($filename);
$name = $filename;
@@ -562,7 +585,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
else $fileType = substr($name, $lastDotIndex);
}
/* First check whether there is already a file with the same name */
- if($document = $this->dms->getDocumentByName($name, $folder)) {
+ if($this->useorgfilename)
+ $document = $this->dms->getDocumentByOriginalFilename($name, $folder);
+ else
+ $document = $this->dms->getDocumentByName($name, $folder);
+ if($document) {
if ($document->getAccessMode($this->user) < M_READWRITE) {
unlink($tmpFile);
return "403 Forbidden";