From 31d02f81147650fd68943da378c172f23bf809b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Feb 2016 17:47:05 +0100
Subject: [PATCH 01/22] add method getFilesize()

---
 SeedDMS_Preview/Preview/Previewer.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index a1a5d47e8..99f6345cf 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -282,6 +282,21 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	public function getFilesize($object, $width=0) { /* {{{ */
+		if($width == 0)
+			$width = $this->width;
+		else
+			$width = intval($width);
+		$target = $this->getFileName($object, $width);
+		if($target && file_exists($target.'.png')) {
+			return(filesize($target.'.png'));
+		} else {
+			return false;
+		}
+
+	} /* }}} */
+
+
 	public function deletePreview($document, $object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;

From 68d9e05931f6674ad9a1bcf5ac3c2a8c60a16e8a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Feb 2016 17:47:40 +0100
Subject: [PATCH 02/22] do not show values if not set, add type to list of
 attributes

---
 views/bootstrap/class.AttributeMgr.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 1bbc529a6..fcad81298 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -63,6 +63,9 @@ $(document).ready( function() {
 		if($selattrdef) {
 			$this->contentHeading(getMLText("attrdef_info"));
 			$res = $selattrdef->getStatistics(30);
+			if(!empty($res['frequencies']['document']) ||!empty($res['frequencies']['folder']) ||!empty($res['frequencies']['content'])) {
+
+
 ?>
     <div class="accordion" id="accordion1">
       <div class="accordion-group">
@@ -93,6 +96,7 @@ $(document).ready( function() {
       </div>
      </div>
 <?php
+			}
 			if($res['folders'] || $res['docs']) {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
@@ -278,7 +282,24 @@ $(document).ready( function() {
 						$ot = getMLText("version");
 						break;
 				}
-				print "<option value=\"".$attrdef->getID()."\" ".($selattrdef && $attrdef->getID()==$selattrdef->getID() ? 'selected' : '').">" . htmlspecialchars($attrdef->getName() ." (".$ot.")");
+				switch($attrdef->getType()) {
+					case SeedDMS_Core_AttributeDefinition::type_int:
+						$t = getMLText("attrdef_type_int");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_float:
+						$t = getMLText("attrdef_type_float");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_string:
+						$t = getMLText("attrdef_type_string");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_date:
+						$t = getMLText("attrdef_type_date");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_boolean:
+						$t = getMLText("attrdef_type_boolean");
+						break;
+				}
+				print "<option value=\"".$attrdef->getID()."\" ".($selattrdef && $attrdef->getID()==$selattrdef->getID() ? 'selected' : '').">" . htmlspecialchars($attrdef->getName() ." (".$ot.", ".$t.")");
 			}
 		}
 ?>

From 3c5e294d445ef1ef0c0dde1020479237b785c666 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Feb 2016 17:50:30 +0100
Subject: [PATCH 03/22] new version 1.1.5

---
 SeedDMS_Preview/package.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index e4a75a82f..3d47081a5 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2015-08-08</date>
+ <date>2016-02-11</date>
  <time>09:36:57</time>
  <version>
-  <release>1.1.4</release>
-  <api>1.1.0</api>
+  <release>1.1.5</release>
+  <api>1.1.5</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-command for creating the preview will be called with a given timeout
+add method getFilesize()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -131,5 +131,21 @@ create fixed width image with proportional height
 preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
    </notes>
   </release>
+  <release>
+   <date>2015-08-08</date>
+   <time>09:36:57</time>
+   <version>
+    <release>1.1.4</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+command for creating the preview will be called with a given timeout
+   </notes>
+  </release>
  </changelog>
 </package>

From fda21fc191e4f7655949ba54a559775f005a291c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 14 Feb 2016 16:26:08 +0100
Subject: [PATCH 04/22] fix sending test mail

---
 op/op.Ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index d328c557f..628826ba5 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -210,7 +210,7 @@ switch($command) {
 	case 'testmail': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($user->getEmail()) {
-				$emailobj = new SeedDMS_Email($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+				$emailobj = new SeedDMS_EmailNotify($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
 				$params = array();
 
 				if($emailobj->toIndividual($settings->_smtpSendFrom, $user, "testmail_subject", "testmail_body", $params)) {

From f12234b0bd5bd0fe2223408536d6b0851240f92e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 14 Feb 2016 19:13:06 +0100
Subject: [PATCH 05/22] add more requirements

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index aad302f08..1dfe92bb8 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,8 @@ Here is a detailed list of requirements:
 6. The Zend Framework (version 1) (optional, only needed for fulltext search)
 7. The pear Log package
 8. The pear HTTP_WebDAV_Server package (optional, only need for webdav)
+9. SLIM RestApi
+10. FeedWriter from https://github.com/mibe/FeedWriter
 
 
 BEFORE YOU START

From 3a47861a500004f6c94594d5f273ffc6fa955218 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 08:04:38 +0100
Subject: [PATCH 06/22] propperly returns false if operation fails in
 addGroup() and delGroup()

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 762a59fb8..f6f61d327 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -128,7 +128,7 @@ class SeedDMS_Core_Group {
 		$queryStr = "INSERT INTO tblGroupMembers (groupID, userID, manager) VALUES (".$this->_id.", ".$user->getID(). ", " . ($asManager?"1":"0") ." )";
 		$res = $db->getResult($queryStr);
 
-		if ($res) return false;
+		if (!$res) return false;
 
 		unset($this->_users);
 		return true;
@@ -140,7 +140,7 @@ class SeedDMS_Core_Group {
 		$queryStr = "DELETE FROM tblGroupMembers WHERE groupID = ".$this->_id." AND userID = ".$user->getID();
 		$res = $db->getResult($queryStr);
 
-		if ($res) return false;
+		if (!$res) return false;
 		unset($this->_users);
 		return true;
 	} /* }}} */

From fbf13b68069796aa6d60772532f6a9a954872fff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 08:23:32 +0100
Subject: [PATCH 07/22] lots of new functions

mostly for group and account management
---
 restapi/index.php | 422 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 422 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index 708544206..81161e7dd 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -838,6 +838,413 @@ function doSearchByAttr() { /* {{{ */
 	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
 } /* }}} */
 
+function checkIfAdmin()
+{
+    global $app, $dms, $userobj;
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
+    }
+    if(!$userobj->isAdmin()) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must be logged in with an administrator account to access this resource', 'data'=>''));
+        return;
+    }
+
+    return true;
+}
+
+
+function createAccount() { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    $userName = $app->request()->post('user');
+    $password = $app->request()->post('pass');
+    $fullname = $app->request()->post('name');
+    $email = $app->request()->post('email');
+    $language = $app->request()->post('language');
+    $theme = $app->request()->post('theme');
+    $comment = $app->request()->post('comment');
+    
+    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment);  
+    if ($newAccount === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Account could not be created, maybe it already exists', 'data'=>''));
+        return;
+    }
+
+    $result = array(
+                'id'=>$newAccount->getID()
+                );
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
+    return;
+} /* }}} */
+
+function getAccountById($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if(is_numeric($id))
+        $account = $dms->getUser($id);
+    else {
+        $account = $dms->getUserByLogin($id);
+    }
+    if($account) {
+        $data = array();
+        $data['id'] = $account->getId();
+        $data['login'] = $account->getLogin();
+        $data['fullname'] = $account->getFullName();
+        $data['email'] = $account->getEmail();
+        $data['language'] = $account->getLanguage();
+        $data['theme'] = $account->getTheme();
+        $data['role'] = $account->getRole();
+        $data['comment'] = $account->getComment();
+        $outputDisabled = ($account->isDisabled() === true || $account->isDisabled() === '1');
+        $data['isdisabled'] = $outputDisabled;
+        $data['isguest'] = $account->isGuest();
+        $data['isadmin'] = $account->isAdmin();
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function setDisabledAccount($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if ($app->request()->put('disable') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT a disabled state', 'data'=>''));
+        return; 
+    }
+    
+    $isDisabled = false;
+    $status = $app->request()->put('disable');
+    if ($status == 'true' || $status == '1')
+    {
+        $isDisabled = true;
+    }
+    
+    if(is_numeric($id))
+        $account = $dms->getUser($id);
+    else {
+        $account = $dms->getUserByLogin($id);
+    }
+    
+    if($account) {
+        $account->setDisabled($isDisabled);
+        $data = array();
+        $data['id'] = $account->getId();
+        $data['login'] = $account->getLogin();
+        $data['fullname'] = $account->getFullName();
+        $data['email'] = $account->getEmail();
+        $outputDisabled = ($account->isDisabled() === true || $account->isDisabled() === '1');
+        $data['isdisabled'] = $outputDisabled;
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function createGroup() { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    $groupName = $app->request()->post('name');
+    $comment = $app->request()->post('comment');
+    
+    $newGroup = $dms->addGroup($groupName, $comment);   
+    if ($newGroup === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Group could not be created, maybe it already exists', 'data'=>''));
+        return;
+    }
+
+    $result = array(
+                'id'=>$newGroup->getID()
+                );
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
+    return;
+} /* }}} */
+
+function getGroup($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if(is_numeric($id))
+        $group = $dms->getGroup($id);
+    else {
+        $group = $dms->getGroupByName($id);
+    }
+    if($group) {
+        $data = array();
+        $data['id'] = $group->getId();
+        $data['name'] = $group->getName();
+        $data['comment'] = $group->getComment();
+        $data['users'] = array();
+        foreach ($group->getUsers() as $user) {
+            $data['users'][] =  array('id' => $user->getID(), 'login' => $user->getLogin());
+        }
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function changeGroupMembership($id, $operationType) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    
+    if(is_numeric($id))
+        $group = $dms->getGroup($id);
+    else {
+        $group = $dms->getGroupByName($id);
+    }
+    
+    if ($app->request()->put('userid') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Please PUT the userid', 'data'=>''));
+        return; 
+    }
+    $userId = $app->request()->put('userid');
+    if(is_numeric($userId))
+        $user = $dms->getUser($userId);
+    else {
+        $user = $dms->getUserByLogin($userId);
+    }
+    
+    if (!($group && $user)) {
+        $app->response()->status(404);
+    }
+
+    $operationResult = false; 
+
+    if ($operationType == 'add')
+    {
+        $operationResult = $group->addUser($user);
+    }
+    if ($operationType == 'remove')
+    {
+        $operationResult = $group->removeUser($user);
+    }
+    
+    if ($operationResult === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        $message = 'Could not add user to the group.';
+        if ($operationType == 'remove')
+        {
+            $message = 'Could not remove user from group.';
+        }
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. ' . $message, 'data'=>''));
+        return;
+    }
+
+    $data = array();
+    $data['id'] = $group->getId();
+    $data['name'] = $group->getName();
+    $data['comment'] = $group->getComment();
+    $data['users'] = array();
+    foreach ($group->getUsers() as $userObj) {
+        $data['users'][] =  array('id' => $userObj->getID(), 'login' => $userObj->getLogin());
+    }
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
+function addUserToGroup($id) { /* {{{ */
+    changeGroupMembership($id, 'add');
+}
+
+function removeUserFromGroup($id) { /* {{{ */
+    changeGroupMembership($id, 'remove');   
+} /* }}} */
+
+function setFolderInheritsAccess($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if ($app->request()->put('enable') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT an "enable" value', 'data'=>''));
+        return; 
+    }
+    
+    $inherit = false;
+    $status = $app->request()->put('enable');
+    if ($status == 'true' || $status == '1')
+    {
+        $inherit = true;
+    }
+    
+    if(is_numeric($id))
+        $folder = $dms->getFolder($id);
+    else {
+        $folder = $dms->getFolderByName($id);
+    }
+    
+    if($folder) {
+        $folder->setInheritAccess($inherit);
+        $folderId = $folder->getId();
+        $folder = null;
+        // reread from db
+        $folder = $dms->getFolder($folderId);
+        $success = ($folder->inheritsAccess() == $inherit);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>$success, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function addUserAccessToFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'add', 'user');
+} /* }}} */
+
+function addGroupAccessToFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'add', 'group');
+} /* }}} */
+
+function removeUserAccessFromFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'remove', 'user');   
+} /* }}} */
+
+function removeGroupAccessFromFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'remove', 'group');   
+} /* }}} */
+
+function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    
+    if(is_numeric($id))
+        $folder = $dms->getfolder($id);
+    else {
+        $folder = $dms->getfolderByName($id);
+    }
+    if (!$folder) {
+        $app->response()->status(404);
+        return;
+    }
+    
+    if ($app->request()->put('id') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
+        return; 
+    }
+
+    if ($app->request()->put('mode') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
+        return; 
+    }
+
+    $userOrGroupIdInput = $app->request()->put('id');
+    $modeInput = $app->request()->put('mode');
+
+    $mode = M_NONE;
+    if ($modeInput == 'read')
+    {
+			$mode = M_READ;
+    }
+    if ($modeInput == 'readwrite')
+    {
+			$mode = M_READWRITE;
+    }
+    if ($modeInput == 'all')
+    {
+			$mode = M_ALL;
+    }
+
+
+    $userOrGroupId = $userOrGroupIdInput;
+    if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
+    {
+			$userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
+    }
+    if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
+    {
+			$userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
+    }
+    if (!$userOrGroupObj) {
+        $app->response()->status(404);
+        return;
+    } 
+	$userOrGroupId = $userOrGroupObj->getId();
+
+    $operationResult = false; 
+
+    if ($operationType == 'add' && $userOrGroup == 'user')
+    {
+        $operationResult = $folder->addAccess($mode, $userOrGroupId, true);
+    }
+    if ($operationType == 'remove' && $userOrGroup == 'user')
+    {
+        $operationResult = $folder->removeAccess($userOrGroupId, true);
+    }
+
+    if ($operationType == 'add' && $userOrGroup == 'group')
+    {
+        $operationResult = $folder->addAccess($mode, $userOrGroupId, false);
+    }
+    if ($operationType == 'remove' && $userOrGroup == 'group')
+    {
+        $operationResult = $folder->removeAccess($userOrGroupId, false);
+    }
+    
+    if ($operationResult === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        $message = 'Could not add user/group access to this folder.';
+        if ($operationType == 'remove')
+        {
+            $message = 'Could not remove user/group access from this folder.';
+        }
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. ' . $message, 'data'=>''));
+        return;
+    }
+
+    $data = array();
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
+
+function clearFolderAccessList($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+        
+    if(is_numeric($id))
+        $folder = $dms->getFolder($id);
+    else {
+        $folder = $dms->getFolderByName($id);
+    }
+    if (!$folder)
+    {
+			$app->response()->status(404);
+			return;
+    }
+    $operationResult = $folder->clearAccessList();
+    $data = array();
+    $app->response()->header('Content-Type', 'application/json');
+    if (!$operationResult)
+    {
+			echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));	
+    }
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
 //$app = new Slim(array('mode'=>'development', '_session.handler'=>null));
 $app = new \Slim\Slim(array('mode'=>'development', '_session.handler'=>null));
 
@@ -885,6 +1292,21 @@ $app->get('/document/:id/links', 'getDocumentLinks');
 $app->put('/account/fullname', 'setFullName');
 $app->put('/account/email', 'setEmail');
 $app->get('/account/locked', 'getLockedDocuments');
+$app->post('/accounts', 'createAccount');
+$app->get('/accounts/:id', 'getAccountById');
+$app->put('/accounts/:id/disable', 'setDisabledAccount');
+$app->post('/groups', 'createGroup');
+$app->get('/groups/:id', 'getGroup');
+$app->put('/groups/:id/addUser', 'addUserToGroup');
+$app->put('/groups/:id/removeUser', 'removeUserFromGroup'); 
+$app->put('/groups/:id/removeUser', 'removeUserFromGroup');
+$app->put('/folder/:id/setInherit', 'setFolderInheritsAccess');
+$app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); // 
+$app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); // 
+$app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder'); 
+$app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder'); 
+$app->put('/folder/:id/access/clear', 'clearFolderAccessList');
+
 $app->run();
 
 ?>

From 47a72cc2db396e86ffa6ad216aa9cfea71fcfa8f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 09:27:44 +0100
Subject: [PATCH 08/22] move js for sending test mail into view

---
 styles/bootstrap/application.js    | 19 -------------------
 views/bootstrap/class.Settings.php | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 912c709ae..11dacaaff 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -233,25 +233,6 @@ $(document).ready( function() {
 			'json'
 		);
 	});
-	$('a.sendtestmail').click(function(ev){
-		ev.preventDefault();
-		$.ajax({url: '../op/op.Ajax.php',
-			type: 'GET',
-			dataType: "json",
-			data: {command: 'testmail'},
-			success: function(data) {
-				console.log(data);
-				noty({
-					text: data.msg,
-					type: (data.error) ? 'error' : 'success',
-					dismissQueue: true,
-					layout: 'topRight',
-					theme: 'defaultTheme',
-					timeout: 1500,
-				});
-			}
-		}); 
-	});
 
 	$('a.movefolder').click(function(ev){
 		ev.preventDefault();
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 5833ff614..95ceb02e4 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -55,6 +55,26 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 			$('#settingstab li a').click(function(event) {
 				$('#currenttab').val($(event.currentTarget).data('target').substring(1));
 			});
+
+			$('a.sendtestmail').click(function(ev){
+				ev.preventDefault();
+				$.ajax({url: '../op/op.Ajax.php',
+					type: 'GET',
+					dataType: "json",
+					data: {command: 'testmail'},
+					success: function(data) {
+						console.log(data);
+						noty({
+							text: data.msg,
+							type: (data.error) ? 'error' : 'success',
+							dismissQueue: true,
+							layout: 'topRight',
+							theme: 'defaultTheme',
+							timeout: 1500,
+						});
+					}
+				}); 
+			});
 		});
 <?php
 	} /* }}} */
@@ -456,7 +476,7 @@ if(!is_writeable($settings->_configFilePath)) {
      <!--
         -- SETTINGS - SYSTEM - SMTP
       -->
-      <tr ><td><b> <?php printMLText("settings_SMTP");?></b></td><td><a class="btn sendtestmail">Send test mail</a></td> </tr>
+			<tr ><td><b> <?php printMLText("settings_SMTP");?></b></td><td><a class="btn sendtestmail"><?php printMLText('send_test_mail'); ?></a></td> </tr>
       <tr title="<?php printMLText("settings_smtpServer_desc");?>">
         <td><?php printMLText("settings_smtpServer");?>:</td>
         <td><?php $this->showTextField("smtpServer", $settings->_smtpServer); ?></td>

From 9e41bc80624c3b92c6c9d1bf3ceec90ffe8f71a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 09:32:29 +0100
Subject: [PATCH 09/22] add entry for 5.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1bd0efeea..ea764580a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.0.1
 --------------------------------------------------------------------------------
 - merged changes from 4.3.24
+- fixed sending test mail
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.0

From af4e6d46fbf1ebc71724e08804d6fc7e4dd968f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 09:33:02 +0100
Subject: [PATCH 10/22] add entry for 4.3.24

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 40b9963db..133f36d40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
 - further pages with content security policy turned on
 - various translation updates
 - check for document expiration when showing search result and folder content
+- more rest api functions
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.23

From 8bcca6a16a1c4504301693edce74199dfe69d678 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 10:38:27 +0100
Subject: [PATCH 11/22] timeout for external command can be passed to previewer

---
 SeedDMS_Preview/Preview/Previewer.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 99f6345cf..067b104b2 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -37,7 +37,13 @@ class SeedDMS_Preview_Previewer {
 	 */
 	protected $width;
 
-	function __construct($previewDir, $width=40) {
+	/**
+	 * @var integer $timeout maximum time for execution of external commands
+	 * @access protected
+	 */
+	protected $timeout;
+
+	function __construct($previewDir, $width=40, $timeout=5) {
 		if(!is_dir($previewDir)) {
 			if (!SeedDMS_Core_File::makeDir($previewDir)) {
 				$this->previewDir = '';
@@ -48,9 +54,10 @@ class SeedDMS_Preview_Previewer {
 			$this->previewDir = $previewDir;
 		}
 		$this->width = intval($width);
+		$this->timeout = intval($timeout);
 	}
 
-	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
+	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
 		$descriptorspec = array(
 			0 => array("pipe", "r"),
 			1 => array("pipe", "w"),
@@ -155,7 +162,7 @@ class SeedDMS_Preview_Previewer {
 			if($cmd) {
 				//exec($cmd);
 				try {
-					self::execWithTimeout($cmd);
+					self::execWithTimeout($cmd, $this->timeout);
 				} catch(Exception $e) {
 				}
 			}
@@ -216,7 +223,7 @@ class SeedDMS_Preview_Previewer {
 			if($cmd) {
 				//exec($cmd);
 				try {
-					self::execWithTimeout($cmd);
+					self::execWithTimeout($cmd, $this->timeout);
 				} catch(Exception $e) {
 				}
 			}

From 31ae8b34a956f75b40c4c28471e8e86935e7c6f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 10:38:52 +0100
Subject: [PATCH 12/22] add note for 1.1.5

---
 SeedDMS_Preview/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 3d47081a5..256ab3c75 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 add method getFilesize()
+timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From a7c8d36720a7d4ec85fe4a9235677a713a0c444d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 10:41:33 +0100
Subject: [PATCH 13/22] use same var name as for all other views

---
 out/out.DocumentVersionDetail.php               | 2 +-
 views/bootstrap/class.DocumentVersionDetail.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index 5e53fe702..2a9c0a64f 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -68,7 +68,7 @@ $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));
+$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));
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->show();
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 0ad987164..7a9c43a3c 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -40,7 +40,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableversionmodification = $this->params['enableversionmodification'];
 		$cachedir = $this->params['cachedir'];
-		$previewwidthdetail = $this->params['previewwidthdetail'];
+		$previewwidthdetail = $this->params['previewWidthDetail'];
 
 		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();

From 54df39ba8104967d4b69ee2ddd63ce3e6fdd32e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 10:57:37 +0100
Subject: [PATCH 14/22] pass timeout to view and previewer

---
 out/out.ApprovalSummary.php                     | 2 +-
 out/out.AttributeMgr.php                        | 1 +
 out/out.DocumentVersionDetail.php               | 2 +-
 out/out.DropFolderChooser.php                   | 1 +
 out/out.GroupMgr.php                            | 2 +-
 out/out.ManageNotify.php                        | 2 +-
 out/out.MyDocuments.php                         | 2 +-
 out/out.ReviewSummary.php                       | 2 +-
 out/out.Search.php                              | 1 +
 out/out.Timeline.php                            | 1 +
 out/out.ViewDocument.php                        | 1 +
 out/out.ViewFolder.php                          | 1 +
 out/out.WorkflowSummary.php                     | 2 +-
 views/bootstrap/class.ApprovalSummary.php       | 3 ++-
 views/bootstrap/class.AttributeMgr.php          | 5 +++--
 views/bootstrap/class.DocumentVersionDetail.php | 3 ++-
 views/bootstrap/class.DropFolderChooser.php     | 3 ++-
 views/bootstrap/class.GroupMgr.php              | 3 ++-
 views/bootstrap/class.ManageNotify.php          | 3 ++-
 views/bootstrap/class.MyDocuments.php           | 5 +++--
 views/bootstrap/class.ReviewSummary.php         | 3 ++-
 views/bootstrap/class.Search.php                | 3 ++-
 views/bootstrap/class.Timeline.php              | 4 +++-
 views/bootstrap/class.ViewDocument.php          | 3 ++-
 views/bootstrap/class.ViewFolder.php            | 3 ++-
 views/bootstrap/class.WorkflowSummary.php       | 3 ++-
 26 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index 7b0b49f4c..db2f0813d 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -34,7 +34,7 @@ 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));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php
index e440dece3..142a41d19 100644
--- a/out/out.AttributeMgr.php
+++ b/out/out.AttributeMgr.php
@@ -50,6 +50,7 @@ if($view) {
 	$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
 	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 }
 
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index 2a9c0a64f..e7ff437b4 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -68,7 +68,7 @@ $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));
+$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));
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->show();
diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php
index b5baf5e69..29477f4aa 100644
--- a/out/out.DropFolderChooser.php
+++ b/out/out.DropFolderChooser.php
@@ -41,6 +41,7 @@ $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'dropfold
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index bf425ca19..2ab0b2cd0 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -51,7 +51,7 @@ if(isset($_GET['groupid']) && $_GET['groupid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'workflowmode'=>$settings->_workflowMode));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'workflowmode'=>$settings->_workflowMode, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view($_GET);
 }
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index 0b7ee44ec..327ca07ad 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -32,7 +32,7 @@ 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));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view($_GET);
 	exit;
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 6650d2a15..bc9ae7df9 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -46,7 +46,7 @@ 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));
+$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));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index c49f89efc..919bc2cb4 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -35,7 +35,7 @@ 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));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.Search.php b/out/out.Search.php
index 8fa9c9add..8c75e0b70 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -434,6 +434,7 @@ if(count($entries) == 1) {
 		$view->setParam('workflowmode', $settings->_workflowMode);
 		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
 		$view->setParam('previewWidthList', $settings->_previewWidthList);
+		$view->setParam('timeout', $settings->_cmdTimeout);
 		$view($_GET);
 		exit;
 	}
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index 5ef48a368..2130ff2ad 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -62,6 +62,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 361a63d8f..f908d23ba 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -76,6 +76,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index f42e6baf0..1ff3e02f6 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -65,6 +65,7 @@ if($view) {
 	$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
 	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index c45889051..73423a49b 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -35,7 +35,7 @@ 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));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 69bb71ff9..6ae10d19d 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -36,8 +36,9 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index fcad81298..b87a90b1d 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -59,6 +59,7 @@ $(document).ready( function() {
 		$previewwidth = $this->params['previewWidthList'];
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
+		$timeout = $this->params['timeout'];
 
 		if($selattrdef) {
 			$this->contentHeading(getMLText("attrdef_info"));
@@ -108,7 +109,7 @@ $(document).ready( function() {
 				foreach($res['folders'] as $subFolder) {
 					echo $this->folderListRow($subFolder);
 				}
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 				foreach($res['docs'] as $document) {
 					echo $this->documentListRow($document, $previewer);
 				}
@@ -124,7 +125,7 @@ $(document).ready( function() {
 				print "<th>".getMLText("status")."</th>\n";
 				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 				foreach($res['contents'] as $content) {
 					$doc = $content->getDocument();
 					echo $this->documentListRow($doc, $previewer);
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 7a9c43a3c..b7507abbe 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -41,6 +41,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$enableversionmodification = $this->params['enableversionmodification'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$timeout = $this->params['timeout'];
 
 		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();
@@ -147,7 +148,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		print "<td><ul class=\"unstyled\">";
 
 		print "</ul>";
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 		$previewer->createPreview($version);
 		if($previewer->hasPreview($version)) {
 			print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 96e7016b3..c1223e23b 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -48,8 +48,9 @@ $('#fileselect').click(function(ev) {
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 //		$this->htmlStartPage(getMLText("choose_target_file"));
 //		$this->globalBanner();
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index d9858e8ae..cd985cf69 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -107,9 +107,10 @@ $(document).ready( function() {
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$workflowmode = $this->params['workflowmode'];
+		$timeout = $this->params['timeout'];
 
 		if($selgroup) {
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 			$this->contentHeading(getMLText("group_info"));
 			echo "<table class=\"table table-condensed\">\n";
 			if($workflowmode == "traditional") {
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index add47d6b2..31259a249 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -90,7 +90,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 			printMLText("empty_notify_list");
 		}
 		else {
-			$previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth);
+			$previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth, $this->timeout);
 
 			print "<table class=\"table-condensed\">";
 			print "<thead>\n<tr>\n";
@@ -147,6 +147,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->cachedir = $this->params['cachedir'];
 		$this->previewwidth = $this->params['previewWidthList'];
 		$this->db = $this->dms->getDB();
+		$this->timeout = $this->params['timeout'];
 
 		$this->htmlStartPage(getMLText("my_account"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 994df1fdc..333e0fd78 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -39,9 +39,10 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$db = $dms->getDB();
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -776,7 +777,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
 					$document->verifyLastestContentExpriry();
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 7ca1802a4..bfaf19d36 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -36,8 +36,9 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index a75510c6b..69187d43b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -89,6 +89,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$searchin = $this->params['searchin'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 
@@ -453,7 +454,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 			foreach ($entries as $entry) {
 				if(get_class($entry) == 'SeedDMS_Core_Document') {
 					$document = $entry;
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 7aaad57ef..748f5de65 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -38,8 +38,10 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$timeout = $this->params['timeout'];
+
 		if($document) {
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 			$previewer->createPreview($version);
 
 			$this->contentHeading(getMLText("timeline_selected_item"));
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 5db4a0e58..79da05dfd 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -132,6 +132,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$documentid = $document->getId();
 		$currenttab = $this->params['currenttab'];
+		$timeout = $this->params['timeout'];
 
 		$versions = $document->getContent();
 
@@ -365,7 +366,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "</ul>";
 		*/
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) {
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index ceb9178c0..889aa1863 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -113,6 +113,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$folderid = $folder->getId();
 
@@ -257,7 +258,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			echo $this->folderListRow($subFolder);
 		}
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		foreach($documents as $document) {
 			$document->verifyLastestContentExpriry();
 			echo $this->documentListRow($document, $previewer);
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 9c593b564..973637c5c 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -36,6 +36,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -48,7 +49,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		// Get document list for the current user.
 		$workflowStatus = $user->getWorkflowStatus();
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$printheader=true;
 		$iRev = array();

From b93e2fc13f1ef180c0d941a9f3110814dcd13b27 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 11:13:35 +0100
Subject: [PATCH 15/22] add phrase 'send_test_mail'

---
 languages/ar_EG/lang.inc | 1 +
 languages/bg_BG/lang.inc | 1 +
 languages/ca_ES/lang.inc | 1 +
 languages/cs_CZ/lang.inc | 1 +
 languages/de_DE/lang.inc | 3 ++-
 languages/en_GB/lang.inc | 3 ++-
 languages/es_ES/lang.inc | 1 +
 languages/fr_FR/lang.inc | 7 ++++---
 languages/hr_HR/lang.inc | 1 +
 languages/hu_HU/lang.inc | 1 +
 languages/it_IT/lang.inc | 1 +
 languages/ko_KR/lang.inc | 1 +
 languages/nl_NL/lang.inc | 1 +
 languages/pl_PL/lang.inc | 1 +
 languages/pt_BR/lang.inc | 1 +
 languages/ro_RO/lang.inc | 1 +
 languages/ru_RU/lang.inc | 1 +
 languages/sk_SK/lang.inc | 1 +
 languages/sv_SE/lang.inc | 1 +
 languages/tr_TR/lang.inc | 1 +
 languages/uk_UA/lang.inc | 1 +
 languages/zh_CN/lang.inc | 1 +
 languages/zh_TW/lang.inc | 1 +
 23 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 45e0dbd48..41b8ade05 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -890,6 +890,7 @@ URL: [url]',
 'select_one' => 'اختر واحد',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_workflow' => 'اختر مسار العمل',
+'send_test_mail' => '',
 'september' => 'سبتمبر',
 'sequence' => 'تتابع',
 'seq_after' => 'بعد "[prevname]"',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 194433e47..6b3e39cd5 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -755,6 +755,7 @@ $text = array(
 'select_one' => 'Избери един',
 'select_users' => 'Кликни да избереш потребители',
 'select_workflow' => 'Избери процес',
+'send_test_mail' => '',
 'september' => 'септември',
 'sequence' => 'Последователност',
 'seq_after' => 'След "[prevname]"',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 39ec657f3..36914e827 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -760,6 +760,7 @@ URL: [url]',
 'select_one' => 'Seleccionar un',
 'select_users' => '',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => 'Setembre',
 'sequence' => 'Seqüència',
 'seq_after' => 'Després "[prevname]"',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 29f344212..14065b80e 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -899,6 +899,7 @@ URL: [url]',
 'select_one' => 'Vyberte jeden',
 'select_users' => 'Kliknutím vyberte uživatele',
 'select_workflow' => 'Vyberte postup práce',
+'send_test_mail' => '',
 'september' => 'Září',
 'sequence' => 'Posloupnost',
 'seq_after' => 'Po "[prevname]"',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 8ea1b70be..5ff610342 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 (2170), dgrutsch (21)
+//    Translators: Admin (2171), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -936,6 +936,7 @@ URL: [url]',
 'select_one' => 'Bitte wählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_workflow' => 'Workflow auswählen',
+'send_test_mail' => 'Sende Test-Email',
 'september' => 'September',
 'sequence' => 'Reihenfolge',
 'seq_after' => 'Nach "[prevname]"',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 47661f8d6..0a8938963 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 (1305), dgrutsch (7), netixw (14)
+//    Translators: Admin (1306), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -936,6 +936,7 @@ URL: [url]',
 'select_one' => 'Select one',
 'select_users' => 'Click to select users',
 'select_workflow' => 'Select workflow',
+'send_test_mail' => 'Send test mail',
 'september' => 'September',
 'sequence' => 'Sequence',
 'seq_after' => 'After "[prevname]"',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index b41dbd8c7..9d1732ce8 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -905,6 +905,7 @@ URL: [url]',
 'select_one' => 'Seleccionar uno',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_workflow' => 'Selecionar Flujo de Trabajo',
+'send_test_mail' => '',
 'september' => 'Septiembre',
 'sequence' => 'Secuencia',
 'seq_after' => 'Después "[prevname]"',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 37e2ea03f..4d15440d8 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 (1009), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1011), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -881,6 +881,7 @@ URL: [url]',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
+'send_test_mail' => '',
 'september' => 'Septembre',
 'sequence' => 'Position dans le répertoire',
 'seq_after' => 'Après "[prevname]"',
@@ -936,7 +937,7 @@ URL: [url]',
 'settings_dbVersion' => 'Schéma de base de données trop ancien',
 'settings_defaultSearchMethod' => '',
 'settings_defaultSearchMethod_desc' => '',
-'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valdatabase' => 'base de données',
 'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Pour utiliser SeedDMS, vous devez supprimer le fichier ENABLE_INSTALL_TOOL dans le répertoire de configuration',
 'settings_disableSelfEdit' => 'Désactiver auto modification',
@@ -970,7 +971,7 @@ URL: [url]',
 'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
 'settings_enableGuestLogin_desc' => 'Si vous voulez vous connecter en tant qu\'invité, cochez cette option. Remarque: l\'utilisateur invité ne doit être utilisé que dans un environnement de confiance',
-'settings_enableHelp' => '',
+'settings_enableHelp' => 'Activer l\'aide',
 'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activer la sélection de langue',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 17ad0bbee..a2d4accce 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -926,6 +926,7 @@ Internet poveznica: [url]',
 'select_one' => 'Odaberite jednog',
 'select_users' => 'Kliknite za odabir korisnika',
 'select_workflow' => 'Odaberite tok rada',
+'send_test_mail' => '',
 'september' => 'Rujan',
 'sequence' => 'Redoslijed',
 'seq_after' => 'Nakon "[prevname]"',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 4a9ccb155..565cbcef5 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -904,6 +904,7 @@ URL: [url]',
 'select_one' => 'Vßlasszon egyet',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_workflow' => 'Munkafolyamat választás',
+'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Sorrend',
 'seq_after' => '"[prevname]" utßn',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index a11e5606d..1e40259e5 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -928,6 +928,7 @@ URL: [url]',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
+'send_test_mail' => '',
 'september' => 'Settembre',
 'sequence' => 'Posizione',
 'seq_after' => 'Dopo "[prevname]"',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 60cb87dff..a056e1f2c 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -919,6 +919,7 @@ URL : [url]',
 'select_one' => '선택',
 'select_users' => '사용자를 선택합니다',
 'select_workflow' => '선택 워크플로우',
+'send_test_mail' => '',
 'september' => '9월',
 'sequence' => '순서',
 'seq_after' => '"[prevname] "후',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index fc91b72dd..8b7ab6eab 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -901,6 +901,7 @@ URL: [url]',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
+'send_test_mail' => '',
 'september' => 'september',
 'sequence' => 'Volgorde',
 'seq_after' => 'Na "[prevname]"',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 930badc38..a1b093496 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -884,6 +884,7 @@ URL: [url]',
 'select_one' => 'Wybierz',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_workflow' => 'Wybierz proces',
+'send_test_mail' => '',
 'september' => 'Wrzesień',
 'sequence' => 'Kolejność',
 'seq_after' => 'Za "[prevname]"',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7f28b86ea..c0963f59a 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -902,6 +902,7 @@ URL: [url]',
 'select_one' => 'Selecione um',
 'select_users' => 'Clique para selecionar os usuários',
 'select_workflow' => 'Selecione o fluxo de trabalho',
+'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Sequência',
 'seq_after' => 'Depois "[prevname]"',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index a0b54b2ba..680ee7167 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -927,6 +927,7 @@ URL: [url]',
 'select_one' => 'Selectați unul',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_workflow' => 'Selectați workflow',
+'send_test_mail' => '',
 'september' => 'Septembrie',
 'sequence' => 'Poziție',
 'seq_after' => 'După "[prevname]"',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 652d9770a..b7657d409 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -895,6 +895,7 @@ URL: [url]',
 'select_one' => 'Выберите',
 'select_users' => 'Выберите пользователей',
 'select_workflow' => 'Выберите процесс',
+'send_test_mail' => '',
 'september' => 'Сентябрь',
 'sequence' => 'Позиция',
 'seq_after' => 'После «[prevname]»',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a91a6dff9..b801d38aa 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -759,6 +759,7 @@ URL: [url]',
 'select_one' => 'Vyberte jeden',
 'select_users' => '',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Postupnosť',
 'seq_after' => 'Po "[prevname]"',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 206248005..3bfe9ae95 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -890,6 +890,7 @@ URL: [url]',
 'select_one' => 'Välj',
 'select_users' => 'Välj användare',
 'select_workflow' => 'Välj arbetsflöde',
+'send_test_mail' => '',
 'september' => 'september',
 'sequence' => 'Position',
 'seq_after' => 'efter "[prevname]"',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 58b155b6a..91145156e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -906,6 +906,7 @@ URL: [url]',
 'select_one' => 'Birini seçiniz',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_workflow' => 'İş akışı seç',
+'send_test_mail' => '',
 'september' => 'Eylül',
 'sequence' => 'Sıralama',
 'seq_after' => 'Şundan sonra: "[prevname]"',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 92d01c11d..f18969624 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -917,6 +917,7 @@ URL: [url]',
 'select_one' => 'Виберіть',
 'select_users' => 'Виберіть користувачів',
 'select_workflow' => 'Виберіть процес',
+'send_test_mail' => '',
 'september' => 'Вересень',
 'sequence' => 'Позиція',
 'seq_after' => 'Після «[prevname]»',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 38dcb3fd7..f261ec4b4 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -761,6 +761,7 @@ URL: [url]',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => '九 月',
 'sequence' => '次序',
 'seq_after' => '在"[prevname]"之后',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 4cf697891..208d583bd 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -759,6 +759,7 @@ URL: [url]',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => '九 月',
 'sequence' => '次序',
 'seq_after' => '在"[prevname]"之後',

From 69e0ae0b3d8b4fcfc7e0cb6adbcb074de7237c75 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 15:14:42 +0100
Subject: [PATCH 16/22] get getDocumentsLocked() sets locking user in document

---
 SeedDMS_Core/Core/inc.ClassUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 3ae0cfbe1..5be16c4c6 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -780,7 +780,7 @@ class SeedDMS_Core_User {
 	function getDocumentsLocked() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "SELECT `tblDocuments`.* ".
+		$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser` ".
 			"FROM `tblDocumentLocks` LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentLocks`.`document` ".
 			"WHERE `tblDocumentLocks`.`userID` = '".$this->_id."' ".
 			"ORDER BY `id` DESC";

From 0005d9ffafdba4c9eaec77dbebefada41373d18c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 15:14:57 +0100
Subject: [PATCH 17/22] another changelog entry for 4.3.24

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 7152aa68b..e31a3be40 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -32,6 +32,7 @@
 SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
 - add SeedDMS_Core_Group::getWorkflowStatus()
+- SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From e9f185533c540af98f608a07c0ce0ddb1bca2984 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 15:22:41 +0100
Subject: [PATCH 18/22] do not show substitute user button if not admin or same
 user

---
 views/bootstrap/class.UsrMgr.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 5a9429f13..c4c2f5aa4 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -80,6 +80,7 @@ $(document).ready( function() {
 
 	function info() { /* {{{ */
 		$dms = $this->params['dms'];
+		$user = $this->params['user'];
 		$seluser = $this->params['seluser'];
 		$quota = $this->params['quota'];
 		$workflowmode = $this->params['workflowmode'];
@@ -134,7 +135,8 @@ $(document).ready( function() {
 			}
 			echo "</table>";
 
-			echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
+			if($user->isAdmin() && $seluser->getID() != $user->getID())
+				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
 		}
 	} /* }}} */
 

From 444dc412bf610833355ecfb08a19111232787604 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 16:56:23 +0100
Subject: [PATCH 19/22] check if requested file is available

---
 op/op.Download.php | 73 +++++++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/op/op.Download.php b/op/op.Download.php
index 29e793ddc..f5fee8a30 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -58,7 +58,11 @@ if (isset($_GET["version"])) {
 	if (!is_object($content)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 	}
-	
+
+	if(!file_exists($dms->contentDir . $content->getPath())) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("missing_file"));
+	}
+
 	//header("Content-Type: application/force-download; name=\"" . mydmsDecodeString($content->getOriginalFileName()) . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir . $content->getPath() ));
@@ -104,6 +108,10 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_file_id"));
 	}
 
+	if(!file_exists($dms->contentDir . $file->getPath())) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("missing_file"));
+	}
+
 	header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
@@ -126,10 +134,14 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!isset($filename) || !file_exists($settings->_contentDir.$filename) ) {
+	if (!isset($filename)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
+	if (!file_exists($settings->_contentDir.$filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+	}
+
 	header('Content-Description: File Transfer');
 	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
 	//header("Content-Type: application/octet-stream");
@@ -156,10 +168,14 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!isset($filename) || !file_exists($settings->_contentDir.$filename) ) {
+	if (!isset($filename)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
+	if (!file_exists($settings->_contentDir.$filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+	}
+
 	header("Content-Type: text/plain; name=\"" . $filename . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
@@ -207,10 +223,14 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!isset($filename) || !file_exists($settings->_contentDir.$filename) ) {
+	if (!isset($filename)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
+	if (!file_exists($settings->_contentDir.$filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+	}
+
 	header("Content-Type: application/zip; name=\"" . $filename . "\"");
 	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
 	header("Content-Transfer-Encoding: binary");
@@ -244,17 +264,20 @@ if (isset($_GET["version"])) {
 	}
 
 	$filename = $dms->contentDir . $document->getDir().'r'.(int) $_GET['reviewlogid'];
-	if(file_exists($filename)) {
-		$finfo = finfo_open(FILEINFO_MIME_TYPE);
-		$mimetype = finfo_file($finfo, $filename);
-
-		header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-		header("Content-Transfer-Encoding: binary");
-		header("Content-Length: " . filesize($filename ));
-		header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-		header("Cache-Control: must-revalidate");
-		readfile($filename);
+	if (!file_exists($filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
+
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$mimetype = finfo_file($finfo, $filename);
+
+	header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+	header("Content-Transfer-Encoding: binary");
+	header("Content-Length: " . filesize($filename ));
+	header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+	header("Cache-Control: must-revalidate");
+	readfile($filename);
+
 } elseif (isset($_GET["approvelogid"])) {
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -275,17 +298,19 @@ if (isset($_GET["version"])) {
 	}
 
 	$filename = $dms->contentDir . $document->getDir().'a'.(int) $_GET['approvelogid'];
-	if(file_exists($filename)) {
-		$finfo = finfo_open(FILEINFO_MIME_TYPE);
-		$mimetype = finfo_file($finfo, $filename);
-
-		header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-		header("Content-Transfer-Encoding: binary");
-		header("Content-Length: " . filesize($filename ));
-		header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-		header("Cache-Control: must-revalidate");
-		readfile($filename);
+	if (!file_exists($filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
+
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$mimetype = finfo_file($finfo, $filename);
+
+	header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+	header("Content-Transfer-Encoding: binary");
+	header("Content-Length: " . filesize($filename ));
+	header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+	header("Cache-Control: must-revalidate");
+	readfile($filename);
 }
 
 add_log_line();

From b59d414adbfdcb173b2abe9ab84dc7425e959449 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 17:03:13 +0100
Subject: [PATCH 20/22] fix some bugs in changeFolderAccess.

---
 restapi/index.php | 79 ++++++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 81161e7dd..1cb64a9e3 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1136,46 +1136,57 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
         return;
     }
     
-    if ($app->request()->put('id') == null)
-    {
-        $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
-        return; 
-    }
-
-    if ($app->request()->put('mode') == null)
-    {
-        $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
-        return; 
-    }
-
     $userOrGroupIdInput = $app->request()->put('id');
-    $modeInput = $app->request()->put('mode');
+    if ($operationType == 'add')
+    {
+	    if ($app->request()->put('id') == null)
+	    {
+	        $app->response()->header('Content-Type', 'application/json');
+	        echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
+	        return; 
+	    }
 
-    $mode = M_NONE;
-    if ($modeInput == 'read')
-    {
-			$mode = M_READ;
-    }
-    if ($modeInput == 'readwrite')
-    {
-			$mode = M_READWRITE;
-    }
-    if ($modeInput == 'all')
-    {
-			$mode = M_ALL;
-    }
+	    if ($app->request()->put('mode') == null)
+	    {
+	        $app->response()->header('Content-Type', 'application/json');
+	        echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
+	        return; 
+	    }
+
+	    $modeInput = $app->request()->put('mode');
+
+	    $mode = M_NONE;
+	    if ($modeInput == 'read')
+	    {
+	    	$mode = M_READ;
+	    }
+	    if ($modeInput == 'readwrite')
+	    {
+	    	$mode = M_READWRITE;
+	    }
+	    if ($modeInput == 'all')
+	    {
+	    	$mode = M_ALL;
+	    }
+	}
 
 
     $userOrGroupId = $userOrGroupIdInput;
     if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
     {
-			$userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
+    	$userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
     }
     if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
     {
-			$userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
+    	$userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
+    }
+    if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
+    {
+    	$userOrGroupObj = $dms->getUser($userOrGroupIdInput);
+    }
+    if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
+    {
+    	$userOrGroupObj = $dms->getGroup($userOrGroupIdInput);
     }
     if (!$userOrGroupObj) {
         $app->response()->status(404);
@@ -1232,15 +1243,15 @@ function clearFolderAccessList($id) { /* {{{ */
     }
     if (!$folder)
     {
-			$app->response()->status(404);
-			return;
+    	$app->response()->status(404);
+    	return;
     }
     $operationResult = $folder->clearAccessList();
     $data = array();
     $app->response()->header('Content-Type', 'application/json');
     if (!$operationResult)
     {
-			echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));	
+    	echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));	
     }
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
@@ -1298,7 +1309,6 @@ $app->put('/accounts/:id/disable', 'setDisabledAccount');
 $app->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');
-$app->put('/groups/:id/removeUser', 'removeUserFromGroup'); 
 $app->put('/groups/:id/removeUser', 'removeUserFromGroup');
 $app->put('/folder/:id/setInherit', 'setFolderInheritsAccess');
 $app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); // 
@@ -1306,7 +1316,6 @@ $app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); //
 $app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder'); 
 $app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder'); 
 $app->put('/folder/:id/access/clear', 'clearFolderAccessList');
-
 $app->run();
 
 ?>

From 9b1faa429f07bf9250169e307d06a9d968e8237a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 17:44:56 +0100
Subject: [PATCH 21/22] propperly set timeout of noty message if not passed

---
 styles/bootstrap/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 3812410a8..cfbfa30a7 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -674,7 +674,7 @@ $(document).ready(function() {
 			dismissQueue: true,
 			layout: 'topRight',
 			theme: 'defaultTheme',
-			timeout: (timeout == 'undefined' ? 1500 : timeout),
+			timeout: (typeof timeout == 'undefined' ? 1500 : timeout),
 		});
 	});
 }); 

From 086cfedf4b152a54f19a0e1e6f5f90c0614602d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2016 18:10:44 +0100
Subject: [PATCH 22/22] add phrase 'missing_file'

---
 languages/ar_EG/lang.inc | 1 +
 languages/bg_BG/lang.inc | 1 +
 languages/ca_ES/lang.inc | 1 +
 languages/cs_CZ/lang.inc | 1 +
 languages/de_DE/lang.inc | 3 ++-
 languages/en_GB/lang.inc | 3 ++-
 languages/es_ES/lang.inc | 1 +
 languages/fr_FR/lang.inc | 1 +
 languages/hr_HR/lang.inc | 1 +
 languages/hu_HU/lang.inc | 1 +
 languages/it_IT/lang.inc | 1 +
 languages/ko_KR/lang.inc | 1 +
 languages/nl_NL/lang.inc | 1 +
 languages/pl_PL/lang.inc | 1 +
 languages/pt_BR/lang.inc | 1 +
 languages/ro_RO/lang.inc | 1 +
 languages/ru_RU/lang.inc | 1 +
 languages/sk_SK/lang.inc | 1 +
 languages/sv_SE/lang.inc | 1 +
 languages/tr_TR/lang.inc | 1 +
 languages/uk_UA/lang.inc | 1 +
 languages/zh_CN/lang.inc | 1 +
 languages/zh_TW/lang.inc | 1 +
 23 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 41b8ade05..9d6a23783 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -584,6 +584,7 @@ URL: [url]',
 'minutes' => 'دقائق',
 'misc' => 'متنوعات',
 'missing_checksum' => 'فحص اخطاء مفقود',
+'missing_file' => '',
 'missing_filesize' => 'حجم ملف مفقود',
 'missing_transition_user_group' => 'مستخدم/مجموعة مفقودة للتحول',
 'monday' => 'الاثنين',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 6b3e39cd5..5d55a69a2 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -515,6 +515,7 @@ $text = array(
 'minutes' => 'минути',
 'misc' => 'Разни',
 'missing_checksum' => 'липсва контролна сума',
+'missing_file' => '',
 'missing_filesize' => 'липсва размер на файла',
 'missing_transition_user_group' => 'липсва потребител или група за преход',
 'monday' => 'понеделник',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 36914e827..4eca594da 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -520,6 +520,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => '',
 'missing_checksum' => '',
+'missing_file' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Dilluns',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 14065b80e..afcf25803 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -591,6 +591,7 @@ URL: [url]',
 'minutes' => 'minuty',
 'misc' => 'Různé',
 'missing_checksum' => 'Chybějící kontrolní součet',
+'missing_file' => '',
 'missing_filesize' => 'Chybějící velikost souboru',
 'missing_transition_user_group' => 'Chybějící uživatel/skupina pro změnu',
 'monday' => 'Pondělí',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 5ff610342..c350d430d 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 (2171), dgrutsch (21)
+//    Translators: Admin (2172), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -596,6 +596,7 @@ URL: [url]',
 'minutes' => 'Minuten',
 'misc' => 'Sonstiges',
 'missing_checksum' => 'Fehlende Check-Summe',
+'missing_file' => 'Datei fehlt',
 'missing_filesize' => 'Fehlende Dateigröße',
 'missing_transition_user_group' => 'Fehlende/r Benutzer/Gruppe für Transition',
 'monday' => 'Montag',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 0a8938963..3519d296a 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 (1306), dgrutsch (7), netixw (14)
+//    Translators: Admin (1307), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -596,6 +596,7 @@ URL: [url]',
 'minutes' => 'minutes',
 'misc' => 'Misc',
 'missing_checksum' => 'Missing checksum',
+'missing_file' => 'Missing file',
 'missing_filesize' => 'Missing filesize',
 'missing_transition_user_group' => 'Missing user/group for transition',
 'monday' => 'Monday',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 9d1732ce8..4a98a4c66 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -591,6 +591,7 @@ URL: [url]',
 'minutes' => 'minutos',
 'misc' => 'Misc',
 'missing_checksum' => 'Falta checksum',
+'missing_file' => '',
 'missing_filesize' => 'Falta tamaño fichero',
 'missing_transition_user_group' => 'Falta usuario/grupo para transición',
 'monday' => 'Lunes',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 4d15440d8..e26d77ca3 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -591,6 +591,7 @@ URL: [url]',
 'minutes' => 'minutes',
 'misc' => 'Divers',
 'missing_checksum' => 'Checksum manquante',
+'missing_file' => '',
 'missing_filesize' => 'Taille de fichier manquante',
 'missing_transition_user_group' => 'Utilisateur/groupe manquant pour transition',
 'monday' => 'Lundi',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index a2d4accce..d70fa1d94 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -596,6 +596,7 @@ Internet poveznica: [url]',
 'minutes' => 'minute',
 'misc' => 'Razno',
 'missing_checksum' => 'Nedostaje kontrolna suma',
+'missing_file' => '',
 'missing_filesize' => 'Nedostaje veličina datoteke',
 'missing_transition_user_group' => 'Nedostaje korisnik/grupa za promjenu',
 'monday' => 'Ponedjeljak',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 565cbcef5..375376e89 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -591,6 +591,7 @@ URL: [url]',
 'minutes' => 'perc',
 'misc' => 'Vegyes',
 'missing_checksum' => 'Hiányzó ellenőrzőösszeg',
+'missing_file' => '',
 'missing_filesize' => 'Hiányzó állomány méret',
 'missing_transition_user_group' => 'Hiányzó felhasználó/csoport az átvezetéshez',
 'monday' => 'Hétfő',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 1e40259e5..abd3f1468 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -597,6 +597,7 @@ URL: [url]',
 'minutes' => 'minuti',
 'misc' => 'Varie',
 'missing_checksum' => 'Checksum mancante',
+'missing_file' => '',
 'missing_filesize' => 'Dimensione mancante',
 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti',
 'monday' => 'Lunedì',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index a056e1f2c..d62db9cbe 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -596,6 +596,7 @@ URL: [url]',
 'minutes' => '분',
 'misc' => '기타',
 'missing_checksum' => '검사 누락',
+'missing_file' => '',
 'missing_filesize' => '누락 된 파일 크기',
 'missing_transition_user_group' => '변화에 대한 사용자 / 그룹을 누락',
 'monday' => '월요일',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 8b7ab6eab..f23345365 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -589,6 +589,7 @@ URL: [url]',
 'minutes' => 'Minuten',
 'misc' => 'Diversen',
 'missing_checksum' => 'Mis controlesom',
+'missing_file' => '',
 'missing_filesize' => 'ontbrekende bestandsgrootte',
 'missing_transition_user_group' => 'Gebruiker / groep ontbreekt voor de overdracht',
 'monday' => 'Maandag',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index a1b093496..dc21fa666 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -584,6 +584,7 @@ URL: [url]',
 'minutes' => 'minut',
 'misc' => 'Różne',
 'missing_checksum' => 'Brak sumy kontrolnej',
+'missing_file' => '',
 'missing_filesize' => 'Brakujący rozmiar pliku',
 'missing_transition_user_group' => 'Brak użytkownika / grupy dla przejścia',
 'monday' => 'Poniedziałek',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index c0963f59a..d5ad4b1b9 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -590,6 +590,7 @@ URL: [url]',
 'minutes' => 'minutos',
 'misc' => 'Miscelânia',
 'missing_checksum' => 'Falta de verificação',
+'missing_file' => '',
 'missing_filesize' => 'Falta tamanho do arquivo',
 'missing_transition_user_group' => 'Falta usuário/grupo para transição',
 'monday' => 'Monday',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 680ee7167..cd57491d0 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -596,6 +596,7 @@ URL: [url]',
 'minutes' => 'minute',
 'misc' => 'Diverse',
 'missing_checksum' => 'Lipsește suma de control(checksum)',
+'missing_file' => '',
 'missing_filesize' => 'Lipsește dimensiunea fișierului',
 'missing_transition_user_group' => 'Lipsește utilizatorul/grupul pentru tranziție',
 'monday' => 'Luni',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index b7657d409..f7fa3bd57 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -584,6 +584,7 @@ URL: [url]',
 'minutes' => 'минуты',
 'misc' => 'Прочее',
 'missing_checksum' => 'Отсутствует контрольная сумма',
+'missing_file' => '',
 'missing_filesize' => 'Отсутствует размер файла',
 'missing_transition_user_group' => 'Отсутствует пользователь/группа для изменения.',
 'monday' => 'Понедельник',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index b801d38aa..4a5083159 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -519,6 +519,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => 'Rôzne',
 'missing_checksum' => '',
+'missing_file' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Pondelok',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 3bfe9ae95..4cd23537a 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -584,6 +584,7 @@ URL: [url]',
 'minutes' => 'minuter',
 'misc' => 'Diverse',
 'missing_checksum' => 'Checksumma saknas',
+'missing_file' => '',
 'missing_filesize' => 'Filstorlek saknas',
 'missing_transition_user_group' => 'Användare/grupp saknas för övergång',
 'monday' => 'måndag',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 91145156e..cedcf31c7 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -590,6 +590,7 @@ URL: [url]',
 'minutes' => 'dakika',
 'misc' => 'Diğer',
 'missing_checksum' => 'Sağlama toplamı eksik',
+'missing_file' => '',
 'missing_filesize' => 'Dosya boyutu eksik',
 'missing_transition_user_group' => 'Geçiş için kullanıcı/grup bilgisi eksik',
 'monday' => 'Pazartesi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index f18969624..7f07948cf 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -596,6 +596,7 @@ URL: [url]',
 'minutes' => 'хвилини',
 'misc' => 'Інше',
 'missing_checksum' => 'Відсутня контрольна сума',
+'missing_file' => '',
 'missing_filesize' => 'Відсутній розмір файлу',
 'missing_transition_user_group' => 'Відсутній користувач/група для зміни.',
 'monday' => 'Понеділок',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index f261ec4b4..531447e30 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -521,6 +521,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => '其他',
 'missing_checksum' => '缺失校验',
+'missing_file' => '',
 'missing_filesize' => '缺失文件大小',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 208d583bd..83896c358 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -519,6 +519,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => '其他',
 'missing_checksum' => '',
+'missing_file' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',