Merge branch 'seeddms-5.1.x' into seeddms-5.2.x

CHANGELOG

@@ -9,6 +9,7 @@
                      Changes in version 5.1.2
 --------------------------------------------------------------------------------
 - merge changes up to 5.0.9
+- filter documents by status 'draft' on search page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
@@ -99,6 +100,21 @@
                      Changes in version 4.3.32
 --------------------------------------------------------------------------------
 - fix saving new mimetype for fulltext search, available languages
+- put access rights of folder into popup box if more than 3 exists
+- define apache_request_headers() if it does not exists, makes webdav
+  work in fast cgi mode or on webservers other than apache
+- clean up of distribution created by makefile
+- order groups in select boxes by name
+- javascript added by addToFooterJS() will be written to a temp. file
+  which can then be read without violating the CSP
+- clearing cache can just remove temp. js files or preview images
+- new mimetype of preview command may contain a '.' now
+- fix incorrect calls of $app->response()->header() in restapi.php
+- set filetype propperly after uploadind a new document with the restapi
+- add new method getDocumentPreview() to restapi
+- replace lots of tables in forms by bootstraps control-group
+- add remove button to folder selector
+- editing of an exiting review/approval can be turned off
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.31

Makefile

@@ -1,8 +1,8 @@
 VERSION=5.1.2
-SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles TODO LICENSE Makefile webdav install restapi pdfviewer
+SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
-NODISTFILES=Makefile utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean
+NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean
 
 EXTENSIONS := \
 	dynamic_content.tar.gz\
@@ -15,7 +15,8 @@ PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc
 dist:
 	mkdir -p tmp/seeddms-$(VERSION)
 	cp -a $(SRC) tmp/seeddms-$(VERSION)
-	(cd tmp; rm -rf $(NODISTFILES); tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION))
+	(cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES))
+	(cd tmp;  tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION))
 	rm -rf tmp
 
 pear:

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -309,13 +309,29 @@ class SeedDMS_Core_DMS {
 	 *
 	 * @param array $links list of objects of type SeedDMS_Core_DocumentLink
 	 * @param object $user user for which access is being checked
+	 * @param string $access set if source or target of link shall be checked
+	 * for sufficient access rights. Set to 'source' if the source document
+	 * of a link is to be checked, set to 'target' for the target document.
+	 * If not set, then access right aren't checked at all.
 	 * @return array filtered list of links
 	 */
-	static function filterDocumentLinks($user, $links) { /* {{{ */
+	static function filterDocumentLinks($user, $links, $access='') { /* {{{ */
 		$tmp = array();
-		foreach ($links as $link)
+		foreach ($links as $link) {
-			if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin())
+			if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin()){
+				if($access == 'source') {
+					$obj = $link->getDocument();
+					if ($obj->getAccessMode($user) >= M_READ)
 						array_push($tmp, $link);
+				} elseif($access == 'target') {
+					$obj = $link->getTarget();
+					if ($obj->getAccessMode($user) >= M_READ)
+						array_push($tmp, $link);
+				} else {
+					array_push($tmp, $link);
+				}
+			}
+		}
 		return $tmp;
 	} /* }}} */
 

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -2517,16 +2517,16 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			if ($defAccess < M_READ) {
 				if (strlen($groupIDs)>0) {
 					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` ".
-						"WHERE `tblGroups`.`id` IN (". $groupIDs .")";
+						"WHERE `tblGroups`.`id` IN (". $groupIDs .") ORDER BY `name`";
 				}
 			}
 			else {
 				if (strlen($groupIDs)>0) {
 					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` ".
-						"WHERE `tblGroups`.`id` NOT IN (". $groupIDs .")";
+						"WHERE `tblGroups`.`id` NOT IN (". $groupIDs .") ORDER BY `name`";
 				}
 				else {
-					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups`";
+					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` ORDER BY `name`";
 				}
 			}
 			if (strlen($queryStr)>0) {

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -1596,16 +1596,16 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			if ($defAccess < M_READ) {
 				if (strlen($groupIDs)>0) {
 					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` ".
-						"WHERE `tblGroups`.`id` IN (". $groupIDs .")";
+						"WHERE `tblGroups`.`id` IN (". $groupIDs .") ORDER BY `name`";
 				}
 			}
 			else {
 				if (strlen($groupIDs)>0) {
 					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` ".
-						"WHERE `tblGroups`.`id` NOT IN (". $groupIDs .")";
+						"WHERE `tblGroups`.`id` NOT IN (". $groupIDs .") ORDER BY `name`";
 				}
 				else {
-					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups`";
+					$queryStr = "SELECT `tblGroups`.* FROM `tblGroups` ORDER BY `name`";
 				}
 			}
 			if (strlen($queryStr)>0) {

SeedDMS_Core/package.xml

@@ -15,8 +15,8 @@
  <date>2016-11-08</date>
  <time>14:06:06</time>
  <version>
-  <release>5.1.2</release>
+  <release>5.0.9</release>
-  <api>5.1.2</api>
+  <api>5.0.9</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- all changes from 5.0.7 merged
+- all changes from 5.0.8 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1132,6 +1132,23 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - add check for cycles in workflow SeedDMS_Core_Workflow::checkForCycles()
    </notes>
   </release>
+  <release>
+   <date>2017-01-12</date>
+   <time>10:18:59</time>
+   <version>
+    <release>4.3.32</release>
+    <api>4.3.32</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- order groups by name returned by getReadAccessList()
+- add optional parameter to SeedDMS_Core_DMS::filterDocumentLinks()
+   </notes>
+  </release>
   <release>
    <date>2016-01-22</date>
    <time>14:34:58</time>
@@ -1177,39 +1194,6 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-- all changes from 4.3.26 merged
-   </notes>
-  </release>
-  <release>
-   <date>2016-04-26</date>
-   <time>12:04:59</time>
-   <version>
-    <release>5.0.2</release>
-    <api>5.0.2</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- all changes from 4.3.25 merged
-	 </notes>
-  </release>
-  <release>
-   <date>2016-04-04</date>
-   <time>08:56:33</time>
-   <version>
-    <release>5.0.3</release>
-    <api>5.0.3</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
 - all changes from 4.3.26 merged
    </notes>
   </release>
@@ -1235,7 +1219,6 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    <version>
     <release>5.0.5</release>
     <api>5.0.5</api>
-    <release>5.0.5</release>
    </version>
    <stability>
     <release>stable</release>
@@ -1276,23 +1259,6 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - all changes from 4.3.30 merged
-- better attribute value checking
-   </notes>
-  </release>
-  <release>
-   <date>2016-10-07</date>
-   <time>06:23:34</time>
-   <version>
-    <release>5.0.7</release>
-    <api>5.0.7</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- all changes from 4.3.30 merged
 - better attribute value checking
    </notes>
   </release>

inc/inc.ClassAccessOperation.php

@@ -286,6 +286,36 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if a review maybe edited
+	 *
+	 * A review may only be updated by the user who originaly addedd the
+	 * review and if it is allowed in the settings
+	 */
+	function mayUpdateReview($document, $updateUser) { /* {{{ */
+		if(get_class($document) == 'SeedDMS_Core_Document') {
+			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && !$document->hasExpired()) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
+	/**
+	 * Check if a approval maybe edited
+	 *
+	 * An approval may only be updated by the user who originaly addedd the
+	 * approval and if it is allowed in the settings
+	 */
+	function mayUpdateApproval($document, $updateUser) { /* {{{ */
+		if(get_class($document) == 'SeedDMS_Core_Document') {
+			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && !$document->hasExpired()) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check if document content may be approved
 	 *

inc/inc.ClassSettings.php

@@ -141,6 +141,8 @@ class Settings { /* {{{ */
 	var $_enableOwnerRevApp = false;
 	// enable/disable listing logged in user as reviewer/approver
 	var $_enableSelfRevApp = false;
+	// enable/disable update of a review/approval by the reviewer/approver
+	var $_enableUpdateRevApp = false;
 	// enable/disable listing administrator as recipient
 	var $_enableAdminReceipt = false;
 	// enable/disable listing owner as recipient
@@ -591,6 +593,7 @@ class Settings { /* {{{ */
 		$this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]);
 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
+		$this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]);
 		$this->_enableAdminReceipt = Settings::boolval($tab["enableAdminReceipt"]);
 		$this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]);
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
@@ -892,6 +895,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp);
     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
+    $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp);
     $this->setXMLAttributValue($node, "enableAdminReceipt", $this->_enableAdminReceipt);
     $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);

languages/ar_EG/lang.inc

@@ -295,6 +295,7 @@ URL: [url]',
 'disclaimer' => 'هذه المنطقة محظورة. الدخول فقط مسموح للموظفين المعتمدين. اي اختراق سيتم التعامل معه وفقا للقوانين المحلية والدولية.',
 'discspace' => '',
 'document' => 'المستند',
+'documentcontent' => '',
 'documents' => 'المستندات',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'مستندات رهن المعالجة',
@@ -613,6 +614,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل <a href="%s">صفحة التحميل</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'ملف محلي',
@@ -1107,6 +1110,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',

languages/bg_BG/lang.inc

@@ -280,6 +280,7 @@ $text = array(
 'disclaimer' => 'Работим аккуратно и задълбочено. От това зависи бъдeщето на нашата страна и благополучието на народа.nПетилетката за три години!nДа не оставим неодрусана слива в наше село!',
 'discspace' => '',
 'document' => 'Документ',
+'documentcontent' => '',
 'documents' => 'Документи',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документи в процес на работа',
@@ -544,6 +545,8 @@ $text = array(
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг <a href="%s">начин</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Локален файл',
@@ -972,6 +975,8 @@ $text = array(
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Включи аватари',
 'settings_enableUserImage_desc' => 'Включи аватари на потребителите',
 'settings_enableUsersView' => 'Включи преглед на потребителите',

languages/ca_ES/lang.inc

@@ -285,6 +285,7 @@ URL: [url]',
 'disclaimer' => 'Aquesta és una àrea restringida. Només es permet l\'accés a usuaris autoritzats. Qualsevol intrusió es perseguirà d\'acord amb les lleis internacionals.',
 'discspace' => '',
 'document' => 'Document',
+'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en procés',
@@ -549,6 +550,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Arxiu local',
@@ -977,6 +980,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',

languages/cs_CZ/lang.inc

@@ -302,6 +302,7 @@ URL: [url]',
 'disclaimer' => 'Toto je neveřejná oblast. Přístup povolen pouze oprávněným uživatelům. Jakékoliv narušení bude stíháno podle platných právních norem.',
 'discspace' => 'Místo na disku',
 'document' => 'Dokument',
+'documentcontent' => '',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
@@ -620,6 +621,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Hodláte-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím <a href="%s">alternativní stránku</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokální soubor',
@@ -1116,6 +1119,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu',
 'settings_enableThemeSelector' => 'Volba tématu',
 'settings_enableThemeSelector_desc' => 'Volba témat na přihlašovací stránce.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',

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 (2349), dgrutsch (22)
+//    Translators: Admin (2355), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -307,6 +307,7 @@ URL: [url]',
 'disclaimer' => 'Dies ist ein geschützter Bereich. Nur authorisiertes Personal hat Zugriff. Jegliche Verstöße werden nach geltendem Recht (Englisch und International) verfolgt.',
 'discspace' => 'Plattenplatz',
 'document' => 'Dokument',
+'documentcontent' => 'Dokumentenversion',
 'documents' => 'Dokumente',
 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => 'Mit dem Dokument verknüpft',
 'linked_to_this_version' => 'Mit dieser Version verknüpft',
 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative <a href="%s">Upload-Seite</a>.',
+'link_to_version' => 'Version',
+'list_access_rights' => 'Alle Zugriffsrechte auflisten ...',
 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.',
 'list_hooks' => 'Liste interne Aufrufe',
 'local_file' => 'Lokale Datei',
@@ -1159,6 +1162,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.',
 'settings_enableThemeSelector' => 'Auswahl des Themas',
 'settings_enableThemeSelector_desc' => 'Schaltet das Auswahlmenü für die Themenauswahl in der Anmeldemaske ein oder aus.',
+'settings_enableUpdateRevApp' => 'Erlaube die Änderung einer Prüfung/Freigabe',
+'settings_enableUpdateRevApp_desc' => 'Anwählen, um dem Benutzer, der die Prüfung/Freigabe durchgeführt hat, die Änderung der Entscheidung zu erlauben, solange das Dokument den Workflow-Schritt noch nicht verlassen hat.',
 'settings_enableUserImage' => 'Benutzerbilder einschalten',
 'settings_enableUserImage_desc' => 'Foto der Benutzer ein-/ausschalten',
 'settings_enableUsersView' => 'Benutzeransicht aktivieren',

languages/el_GR/lang.inc

@@ -280,6 +280,7 @@ $text = array(
 'disclaimer' => '',
 'discspace' => '',
 'document' => 'Έγγραφο',
+'documentcontent' => '',
 'documents' => 'Έγγραφα',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '',
@@ -544,6 +545,8 @@ $text = array(
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => '',
@@ -983,6 +986,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',

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 (1479), dgrutsch (9), netixw (14)
+//    Translators: Admin (1484), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -307,6 +307,7 @@ URL: [url]',
 'disclaimer' => 'This is a classified area. Access is permitted only to authorized personnel. Any violation will be prosecuted according to the national and international laws.',
 'discspace' => 'Disc space',
 'document' => 'Document',
+'documentcontent' => 'Document content',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents checked out by you',
 'documents_in_process' => 'Documents In Process',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => 'Linked to document',
 'linked_to_this_version' => 'Linked to this version',
 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative <a href="%s">upload page</a>.',
+'link_to_version' => 'Version',
+'list_access_rights' => 'List all access rights ...',
 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.',
 'list_hooks' => 'List hooks',
 'local_file' => 'Local file',
@@ -1160,6 +1163,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
 'settings_enableThemeSelector' => 'Theme selection',
 'settings_enableThemeSelector_desc' => 'Turns on/off the theme selector on the login page.',
+'settings_enableUpdateRevApp' => 'Allow editing of exting review/approval',
+'settings_enableUpdateRevApp_desc' => 'Enable this, if the user who has made a review/approval may change the decission as long as the current workflow step has not been finished.',
 'settings_enableUserImage' => 'Enable User Image',
 'settings_enableUserImage_desc' => 'Enable users images',
 'settings_enableUsersView' => 'Enable Users View',

languages/es_ES/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: acabello (20), Admin (1006), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1008), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -302,6 +302,7 @@ URL: [url]',
 'disclaimer' => 'Esta es un área restringida. Se permite el acceso únicamente a personal autorizado. Cualquier intrusión se perseguirá conforme a las leyes internacionales.',
 'discspace' => 'Espacio en disco',
 'document' => 'Documento',
+'documentcontent' => '',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos en proceso',
@@ -620,6 +621,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Fichero local',
@@ -1029,7 +1032,7 @@ URL: [url]',
 'settings_contentDir_desc' => 'Donde se almacenan los archivos subidos (es preferible seleccionar una carpeta que no sea accesible a través del servidor web)',
 'settings_contentOffsetDir' => 'Carpeta de contenidos de desplazamiento',
 'settings_contentOffsetDir_desc' => 'Para tratar las limitaciones del sistema de ficheros subyacentes, se ha ideado una estructura de carpetas dentro de la carpeta de contenido. Esto requiere una carpeta base desde la que comenzar. Normalmente puede dejar este valor por defecto, 1048576, pero puede ser cualquier número o cadena que no exista ya dentro de ella (carpeta de contenido).',
-'settings_convertToPdf' => '',
+'settings_convertToPdf' => 'Convertir documento en PDF para pervisualización',
 'settings_convertToPdf_desc' => '',
 'settings_cookieLifetime' => 'Tiempo de vida de las cookies',
 'settings_cookieLifetime_desc' => 'Tiempo de vida de las cookies en segundos. Si asigna 0 la cookie será eliminada cuando el navegador se cierre.',
@@ -1122,6 +1125,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Habilitar esto si quiere que el usuario identificado sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.',
 'settings_enableThemeSelector' => 'Selección de temas (skins)',
 'settings_enableThemeSelector_desc' => 'Habilitar/deshabilitar la selección de temas en la página de login',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Habilitar imágenes de usuario',
 'settings_enableUserImage_desc' => 'Habilitar imágenes de usuario',
 'settings_enableUsersView' => 'Habilitar vista de usuarios',
@@ -1233,7 +1238,7 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID de la carpeta raíz (normalmente no es necesario cambiar)',
 'settings_SaveError' => 'Error guardando archivo de configuración',
 'settings_Server' => 'Configuración del servidor',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Visualizar documento completo',
 'settings_showFullPreview_desc' => '',
 'settings_showMissingTranslations' => 'Mostrar traducciones faltantes',
 'settings_showMissingTranslations_desc' => 'Listar todos los términos pendientes de traducción de esta página al final de la misma. En entorno productivo no activar esta función',

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 (1055), jeromerobert (50), lonnnew (9), Oudiceval (171)
+//    Translators: Admin (1058), jeromerobert (50), lonnnew (9), Oudiceval (171)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -255,7 +255,7 @@ URL: [url]',
 'clear_password' => 'Sans mot de passe',
 'clipboard' => 'Presse-papier',
 'close' => 'Fermer',
-'command' => '',
+'command' => 'Commande',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
@@ -307,6 +307,7 @@ URL: [url]',
 'disclaimer' => 'Cet espace est protégé. Son accès est strictement réservé aux utilisateurs autorisés.<br/>Tout accès non autorisé est punissable par les lois internationales.',
 'discspace' => 'Espace disque',
 'document' => 'Document',
+'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents bloqués par vous',
 'documents_in_process' => 'Documents en cours',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Fichier local',
@@ -807,7 +810,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'possible_substitutes' => '',
 'preview' => 'Aperçu',
 'preview_converters' => '',
-'preview_images' => '',
+'preview_images' => 'Prévisualisation des images',
 'preview_markdown' => '',
 'preview_plain' => 'Texte',
 'previous_state' => 'État précédent',
@@ -1104,6 +1107,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.',
 'settings_enableThemeSelector' => 'Sélection du thème',
 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Activer image utilisateurs',
 'settings_enableUserImage_desc' => 'Activer les images utilisateurs',
 'settings_enableUsersView' => 'Activer Vue des Utilisateurs',
@@ -1376,7 +1381,7 @@ URL: [url]',
 'takeOverIndApprover' => 'Récupérer les approbateurs de la dernière version.',
 'takeOverIndReviewer' => 'Récupérer les examinateurs de la dernière version.',
 'tasks' => 'Tâches',
-'temp_jscode' => '',
+'temp_jscode' => 'Code javascript temporaire',
 'testmail_body' => 'Ce message est un test pour vérifier la configuration mail de SeedDMS.',
 'testmail_subject' => 'E-mail test',
 'theme' => 'Thème',

languages/hr_HR/lang.inc

@@ -307,6 +307,7 @@ Internet poveznica: [url]',
 'disclaimer' => 'Ovo je klasificirano područje. Pristup je omogućen samo ovlaštenim osobama. Sa svakim kršenjem bit će postupano sukladno nacionalnim i međunarodnim zakonima.',
 'discspace' => 'Prostor na disku',
 'document' => 'Dokument',
+'documentcontent' => '',
 'documents' => 'Dokumenti',
 'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili',
 'documents_in_process' => 'Dokumenti u postupku',
@@ -625,6 +626,8 @@ Internet poveznica: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ako želite prenijeti datoteke veće od trenutne maksimalne veličine prijenosa, molimo koristite alternativu <a href="%s">upload page</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokalna datoteka',
@@ -1143,6 +1146,8 @@ Internet poveznica: [url]',
 'settings_enableSelfRevApp_desc' => 'Omogući ovo ako želite da trenutno prijavljeni korisnik bude naveden kao recezent/validator i za promjenu toka rada.',
 'settings_enableThemeSelector' => 'Odabir teme',
 'settings_enableThemeSelector_desc' => 'Uključuje/isključuje izbornik tema na stranici prijave.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Omogući sliku korisnika',
 'settings_enableUserImage_desc' => 'Omogući slike korisnika',
 'settings_enableUsersView' => 'Omogući pregled korisnika',

languages/hu_HU/lang.inc

@@ -302,6 +302,7 @@ URL: [url]',
 'disclaimer' => 'Ez egy bizalmas terület. Hozzáférés kizárólag a meghatalmazott személyek részére engedélyezett. Bárminemű megsértését a nemzeti, illetve a nemzetközi jog szerint fogják büntetni.',
 'discspace' => 'Lemezterület',
 'document' => 'Dokumentum',
+'documentcontent' => '',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
@@ -620,6 +621,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív <a href="%s">feltöltő oldalt</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Helyi állomány',
@@ -1121,6 +1124,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Engedélyezze, a azt szeretné, hogy a bejelentkezett felhasználó listázásra kerüljön felülvizsgálóként/jóváhagyóként és a munkamenet átmeneteknél.',
 'settings_enableThemeSelector' => 'Téma választása',
 'settings_enableThemeSelector_desc' => 'Kapcsolja be/ki a témaválasztót a bejelentkező oldalon',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Felhasználói kép engedélyezése',
 'settings_enableUserImage_desc' => 'Engedélyezi a felhasználók képeit',
 'settings_enableUsersView' => 'Felhasználók nézetének engedélyezése',

languages/it_IT/lang.inc

@@ -308,6 +308,7 @@ URL: [url]',
 'disclaimer' => 'Questa è un\'area riservata. L\'accesso è consentito solo agli utenti autorizzati. Qualunque violazione sarà perseguita a norma delle leggi italiane ed internazionali.',
 'discspace' => 'Spazio su disco',
 'document' => 'Documento',
+'documentcontent' => '',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
@@ -626,6 +627,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la <a href="%s">pagina alternativa di upload</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => 'Lista ganci',
 'local_file' => 'File locale',
@@ -1155,6 +1158,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.',
 'settings_enableThemeSelector' => 'Selezione tema grafico',
 'settings_enableThemeSelector_desc' => 'Abilita/disabilita il selettore di tema grafico nella finestra di login',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Abilita immagine utente',
 'settings_enableUserImage_desc' => 'L\'opzione permette di attribuire un\'immagine a ciascun utente',
 'settings_enableUsersView' => 'Abilita visualizzazione  utenti',

languages/ko_KR/lang.inc

@@ -309,6 +309,7 @@ URL: [url]',
 'disclaimer' => '본 사이트는 접근이 허가된 자에게만 사용이 허용된 곳 입니다. 허가받지 않은 접근이나 불법행위는 국내 및 국제법에 따라 기소 될 것입니다.',
 'discspace' => '디스크 공간',
 'document' => '문서',
+'documentcontent' => '',
 'documents' => '문서',
 'documents_checked_out_by_you' => '당신으로 부터 문서가 체크아웃 되었습니다.',
 'documents_in_process' => '진행중인 문서',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '최대 업로드 크기보다 큰 파일을 업로드하려는 경우, 대체 업로드 페이지를 <a href="%s">upload page</a> 사용하십시오.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => '로컬 파일',
@@ -1136,6 +1139,8 @@ URL : [url]',
 'settings_enableSelfRevApp_desc' => '검토 / 승인자로 워크 플로우 전환을 위해 나열되어있는 것이 현재 로그인 한 사용자가 필요한 경우이를 활성화합니다.',
 'settings_enableThemeSelector' => '테마 선택',
 'settings_enableThemeSelector_desc' => '로그인 페이지의 테마 선택기를 켜기/끄기로 전환합니다.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '사용자 이미지 사용',
 'settings_enableUserImage_desc' => '사용자 이미지 사용',
 'settings_enableUsersView' => '사용자보기 사용',

languages/nl_NL/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 (722), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (723), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -300,6 +300,7 @@ URL: [url]',
 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.',
 'discspace' => 'Schijfruimte',
 'document' => 'Document',
+'documentcontent' => '',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
 'documents_in_process' => 'Documenten in behandeling',
@@ -535,7 +536,7 @@ URL: [url]',
 'hu_HU' => 'Hongaars',
 'id' => 'ID',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
-'import' => '',
+'import' => 'Importeer',
 'importfs' => '',
 'import_fs' => 'Importeer van bestandssysteem',
 'import_fs_warning' => '',
@@ -618,6 +619,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokaal bestand',
@@ -1149,6 +1152,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Schakel in indien the huidig ingelogde gebruiker wordt toegewezen als goedkeurder/ beoordelaar en voor workflow overgangen.',
 'settings_enableThemeSelector' => 'Selecteer thema',
 'settings_enableThemeSelector_desc' => 'Schakel thema selectie op de aanmeldpagina uit',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Inschakelen Gebruikersplaatjes',
 'settings_enableUserImage_desc' => 'Inschakelen Gebruikerplaatjes',
 'settings_enableUsersView' => 'Inschakelen Gebruikers overzicht',

languages/pl_PL/lang.inc

@@ -295,6 +295,7 @@ URL: [url]',
 'disclaimer' => 'To jest zastrzeżona strefa. Dostęp do niej ma wyłącznie wyznaczony personel. Wszelkie naruszenia będą ścigane zgodnie z prawem krajowym i międzynarodowym.',
 'discspace' => 'Miejsce na dysku',
 'document' => 'Dokument',
+'documentcontent' => '',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty procesowane',
@@ -613,6 +614,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej <a href="%s">strony wczytywania</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokalny plik',
@@ -1101,6 +1104,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Włącz obrazy użytkowników',
 'settings_enableUserImage_desc' => 'Zezwól na indywidualne obrazki użytkowników',
 'settings_enableUsersView' => 'Włącz podgląd użytkownika',

languages/pt_BR/lang.inc

@@ -302,6 +302,7 @@ URL: [url]',
 'disclaimer' => 'Esta é uma área restrita, o acesso é permitido apenas ao pessoal autorizado. Qualquer violação será tratado de acordo com as normas internas e leis vigentes.',
 'discspace' => 'Espaço em Disco',
 'document' => 'Documento',
+'documentcontent' => '',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos em Processo',
@@ -619,6 +620,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de <a href="%s">envio</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Arquivo local',
@@ -1119,6 +1122,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.',
 'settings_enableThemeSelector' => 'Seleção de tema',
 'settings_enableThemeSelector_desc' => 'Liga/desliga o seletor de tema na página de login.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Ativar Imagem de Usuário',
 'settings_enableUserImage_desc' => 'Ativar Imagens de Usuários',
 'settings_enableUsersView' => 'Ativar Usuários Visualizar',

languages/ro_RO/lang.inc

@@ -307,6 +307,7 @@ URL: [url]',
 'disclaimer' => 'Aceasta este o zonă clasificată. Accesul este permis numai personalului autorizat. Orice încălcare va fi urmărită penal în conformitate cu legile naționale și internaționale.',
 'discspace' => 'Spațiu pe disc',
 'document' => 'Document',
+'documentcontent' => '',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
 'documents_in_process' => 'Documente în procesare',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa <a href="%s">pagină de încărcare</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Fișier local',
@@ -1144,6 +1147,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Activați această opțiune dacă doriți ca utilizatorul autentificat să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.',
 'settings_enableThemeSelector' => 'Selecție Temă',
 'settings_enableThemeSelector_desc' => 'Activare/dezactivare selector temă pe pagina de login.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Activați Imaginea utilizatorului',
 'settings_enableUserImage_desc' => 'Activați Imagini utilizatori',
 'settings_enableUsersView' => 'Activați Vizualizarea utilizatorilor',

languages/ru_RU/lang.inc

@@ -307,6 +307,7 @@ URL: [url]',
 'disclaimer' => 'Работник, помни! От тебя зависит успех фирмы и всей страны!',
 'discspace' => 'Дисковое пространство',
 'document' => 'Документ',
+'documentcontent' => '',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документ проверен вами',
 'documents_in_process' => 'Документы в работе',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте <a href="%s">другой способ</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => 'Список хуков',
 'local_file' => 'Локальный файл',
@@ -1151,6 +1154,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Включите для того, чтобы пользователи, в настоящее время выполнившие вход в систему, были в списке рецензентов/утверждающих и в изменении процесса.',
 'settings_enableThemeSelector' => 'Выбор темы',
 'settings_enableThemeSelector_desc' => 'Включить или отключить возможность выбора темы на странице входа.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Включить аватары',
 'settings_enableUserImage_desc' => 'Включить аватары пользователей.',
 'settings_enableUsersView' => 'Включить просмотр пользователей',

languages/sk_SK/lang.inc

@@ -284,6 +284,7 @@ URL: [url]',
 'disclaimer' => 'Toto je zabezpečená zóna. Prístup je povolený len autorizovaným osobám.',
 'discspace' => '',
 'document' => 'Dokument',
+'documentcontent' => '',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty v spracovaní',
@@ -548,6 +549,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokálny súbor',
@@ -976,6 +979,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',

languages/sv_SE/lang.inc

@@ -295,6 +295,7 @@ URL: [url]',
 'disclaimer' => 'Detta är ett sekretessbelagt område. Bara auktoriserade personer äger tillträde. Vid överträdelse kommer åtal att väckas i enlighet med nationella och internationella lagar.',
 'discspace' => '',
 'document' => 'Dokument',
+'documentcontent' => '',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokument i bearbetning',
@@ -613,6 +614,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer <a href="%s">Alternativ uppladdning</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokal fil',
@@ -1107,6 +1110,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.',
 'settings_enableThemeSelector' => 'Tema urval',
 'settings_enableThemeSelector_desc' => 'Stäng på/av tema urval vid inloggningssidan.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Aktivera användarbilder',
 'settings_enableUserImage_desc' => 'Aktivera användarbilder',
 'settings_enableUsersView' => 'Aktivera visning av användare',

languages/tr_TR/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 (1045), aydin (83)
+//    Translators: Admin (1046), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -249,7 +249,7 @@ URL: [url]',
 'clear_password' => '',
 'clipboard' => 'Pano',
 'close' => 'Kapat',
-'command' => '',
+'command' => 'komut',
 'comment' => 'Açıklama',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Versiyon açıklaması',
@@ -301,6 +301,7 @@ URL: [url]',
 'disclaimer' => 'Bu sisteme sadece yetkilendirilmiş personel yetki seviyesine göre erişebilir. Herhangi bir ihlalde veya ihlal girişiminde, ulusal ve uluslararası yasalara göre takibat yapılacaktır.',
 'discspace' => 'Disk alanı',
 'document' => 'Doküman',
+'documentcontent' => '',
 'documents' => 'Dokümanlar',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
@@ -619,6 +620,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız <a href="%s">alternatif yükleme sayfası için tıklayın</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Yerel dosya',
@@ -1123,6 +1126,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'O an giriş yapmış olan kullanıcıları kontrol eden/onaylayan olarak listelemek ve iş akışına dahil etmek için bunu seçebilirsiniz.',
 'settings_enableThemeSelector' => 'Tema seçimini aç/kapat',
 'settings_enableThemeSelector_desc' => 'Giriş sayfasında tema seçimini aç/kapat',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Kullanıcı Resmine İzin Ver',
 'settings_enableUserImage_desc' => 'Kullanıcı resimlerine izin ver',
 'settings_enableUsersView' => 'Kullanıcı Görüntülemeyi Etkinleştir',

languages/uk_UA/lang.inc

@@ -307,6 +307,7 @@ URL: [url]',
 'disclaimer' => 'Авторизована зона. Несанкціонований доступ переслідується згідно національного законодавства.',
 'discspace' => 'Дисковий простір',
 'document' => 'Документ',
+'documentcontent' => '',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документи на Опрацюванні у вас',
 'documents_in_process' => 'Документи в роботі',
@@ -625,6 +626,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте <a href="%s">інший метод</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Локальний файл',
@@ -1144,6 +1147,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => 'Увімкніть для того, щоб користувачі, в даний момент авторизовані у системі, були в списку рецензентів/затверджувачів і в зміні процесу.',
 'settings_enableThemeSelector' => 'Вибір теми',
 'settings_enableThemeSelector_desc' => 'Увімкнути/вимкнути можливість вибору теми на сторінці авторизації.',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => 'Увімкнути аватари',
 'settings_enableUserImage_desc' => 'Увімкнути аватари користувачів.',
 'settings_enableUsersView' => 'Увімкнути перегляд користувачів',

languages/zh_CN/lang.inc

@@ -286,6 +286,7 @@ URL: [url]',
 'disclaimer' => '警告：这是机密区.只有授权用户才被允许访问.任何违反行为将受到法律制裁',
 'discspace' => '磁盘空间',
 'document' => '文档',
+'documentcontent' => '',
 'documents' => '文档',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待处理文档',
@@ -550,6 +551,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => '本地文件',
@@ -978,6 +981,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '开启用户视图',

languages/zh_TW/lang.inc

@@ -284,6 +284,7 @@ URL: [url]',
 'disclaimer' => '警告：這是機密區.只有授權使用者才被允許訪問.任何違反行為將受到法律制裁',
 'discspace' => '',
 'document' => '文檔',
+'documentcontent' => '',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待處理文檔',
@@ -548,6 +549,8 @@ URL: [url]',
 'linked_to_document' => '',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => '超過20M大檔，請選擇<a href="%s">上傳大檔</a>.',
+'link_to_version' => '',
+'list_access_rights' => '',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => '本地檔',
@@ -976,6 +979,8 @@ URL: [url]',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
 'settings_enableThemeSelector_desc' => '',
+'settings_enableUpdateRevApp' => '',
+'settings_enableUpdateRevApp_desc' => '',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',

op/op.Settings.php

@@ -173,6 +173,7 @@ if ($action == "saveSettings")
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
+  $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp");
   $settings->_enableAdminReceipt = getBoolValue("enableAdminReceipt");
   $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt");
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");

out/out.Search.php

@@ -289,6 +289,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// status
 	$status = array();
+	if (isset($_GET["draft"])){
+		$status[] = S_DRAFT;
+	}
 	if (isset($_GET["pendingReview"])){
 		$status[] = S_DRAFT_REV;
 	}

styles/bootstrap/application.css

@@ -250,6 +250,20 @@ i.rejected {color: #b00000;}
 i.in-workflow {color: #11479e;}
 i.workflow-action {color: #91479e;}
 
+span.openpopupbox {
+	cursor: pointer;
+}
+
+div.popupbox {
+	background-color: #fff;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	padding: 15px;
+	display: none;
+	position: absolute;
+	width: 200px;
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;

styles/bootstrap/application.js

@@ -989,6 +989,12 @@ $(document).ready(function() { /* {{{ */
 			timeout: (typeof timeout == 'undefined' ? 1500 : timeout),
 		});
 	});
+
+	$('span.openpopupbox').on('click', function(e) {
+		$('div.popupbox').toggle();
+		console.log('Hallo');
+	});
+
 }); /* }}} */
 
 	var approval_count, review_count, receipt_count, revision_count;
@@ -1015,8 +1021,4 @@ $(document).ready(function() { /* {{{ */
 		}); 
 		timeOutId = setTimeout(checkTasks, 10000);
 	}
-$(document).ready(function() {
-//$("#menu-tasks > ul > li").checkTasks();
-	checkTasks();
-}); 
 

views/bootstrap/class.AttributeMgr.php

@@ -70,50 +70,41 @@ $(document).ready( function() {
 			$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">
-        <div class="accordion-heading">
-          <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseOne">
-						<?php printMLText('attribute_value'); ?>
-          </a>
-        </div>
-        <div id="collapseOne" class="accordion-body collapse" style="height: 0px;">
-          <div class="accordion-inner">
-<?php
 				foreach(array('document', 'folder', 'content') as $type) {
+					$content = '';
 					if(isset($res['frequencies'][$type]) && $res['frequencies'][$type]) {
-					print "<table class=\"table table-condensed\">";
+						$content .= "<table class=\"table table-condensed\">";
-					print "<thead>\n<tr>\n";
+						$content .= "<thead>\n<tr>\n";
-					print "<th>".getMLText("attribute_value")."</th>\n";
+						$content .= "<th>".getMLText("attribute_value")."</th>\n";
-					print "<th>".getMLText("attribute_count")."</th>\n";
+						$content .= "<th>".getMLText("attribute_count")."</th>\n";
-					print "<th></th>\n";
+						$content .= "<th></th>\n";
-					print "</tr></thead>\n<tbody>\n";
+						$content .= "</tr></thead>\n<tbody>\n";
 						foreach($res['frequencies'][$type] as $entry) {
 							$value = $selattrdef->parseValue($entry['value']);
-						echo "<tr>";
+							$content .= "<tr>";
-						echo "<td>".implode(';', $value)."</td><td>".$entry['c']."</td>";
+							$content .= "<td>".implode(';', $value)."</td><td>".$entry['c']."</td>";
 							/* various checks, if the value is valid */
-						echo "<td>";
-						/* Check if value is in value set */
 							if(!$selattrdef->validate($entry['value'])) {
-							echo getAttributeValidationText($selattrdef->getValidationError(), $selattrdef->getName(), $entry['value']);
+								$content .= getAttributeValidationText($selattrdef->getValidationError(), $selattrdef->getName(), $entry['value']);
 							}
-						echo "</td>";
+							$content .= "<td>";
-						echo "</tr>";
+							/* Check if value is in value set */
-					}
+							if($selattrdef->getValueSet()) {
-					print "</tbody></table>";
+								foreach($values as $v) {
+									if(!in_array($value, $selattrdef->getValueSetAsArray()))
+										$content .= getMLText("attribute_value_not_in_valueset");
 								}
 							}
-?>
+							$content .= "</td>";
-          </div>
+							$content .= "</tr>";
-        </div>
-      </div>
-     </div>
-<?php
 						}
+						$content .= "</tbody></table>";
+					}
+					if($content)
+						$this->printAccordion(getMLText('attribute_value')." (".getMLText($type).")", $content);
+				}
+			}
+
 			if($res['folders'] || $res['docs']) {
 				print "<table id=\"viewfolder-table\" class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
@@ -194,7 +185,7 @@ $(document).ready( function() {
 							<?php printMLText("attrdef_objtype");?>:
 						</label>
 						<div class="controls">
-						<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>"><?php printMLText('all'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>><?php printMLText('folder'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>><?php printMLText('document'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>><?php printMLText('version'); ?></option></select>
+						<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>"><?php printMLText('all'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>><?php printMLText('folder'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>><?php printMLText('document'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>><?php printMLText('documentcontent'); ?></option></select>
 						</div>
 					</div>
 
@@ -311,7 +302,7 @@ $(document).ready( function() {
 						$ot = getMLText("document");
 						break;
 					case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
-						$ot = getMLText("version");
+						$ot = getMLText("documentcontent");
 						break;
 				}
 				switch($attrdef->getType()) {

views/bootstrap/class.Bootstrap.php

@@ -133,6 +133,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo '<script src="../styles/'.$this->theme.'/chosen/js/chosen.jquery.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
+		if(isset($this->params['user']) && $this->params['user']) {
+			$this->addFooterJS('checkTasks();');
+		}
 		if($this->footerjs) {
 			$jscode = "$(document).ready(function () {\n";
 			foreach($this->footerjs as $script) {
@@ -2881,5 +2884,36 @@ mayscript>
 		echo "</script>";
 		$this->printTimelineHtml($height);
 	} /* }}} */
+
+	protected function printPopupBox($title, $content) { /* {{{ */
+?>
+		<span class="openpopupbox"><?php echo $title; ?></span>
+		<div class="popupbox" style="display: none;">
+			<?php echo $content; ?>
+		</div>
+<?php
+	} /* }}} */
+
+	protected function printAccordion($title, $content) { /* {{{ */
+		$id = substr(md5(uniqid()), 0, 4);
+?>
+		<div class="accordion" id="accordion<?php echo $id; ?>">
+      <div class="accordion-group">
+        <div class="accordion-heading">
+					<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion<?php echo $id; ?>" href="#collapse<?php echo $id; ?>">
+						<?php echo $title; ?>
+          </a>
+        </div>
+				<div id="collapse<?php echo $id; ?>" class="accordion-body collapse" style="height: 0px;">
+          <div class="accordion-inner">
+<?php
+		echo $content;
+?>
+          </div>
+        </div>
+      </div>
+    </div>
+<?php
+	} /* }}} */
 }
 ?>

views/bootstrap/class.Search.php

@@ -392,6 +392,7 @@ $(document).ready( function() {
 <td><?php printMLText("status");?>:</td>
 <td>
 <?php if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { ?>
+<label class="checkbox" for='draft'><input type="checkbox" id="draft" name="draft" value="1" <?php echo in_array(S_DRAFT, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_DRAFT);?></label>
 <?php if($workflowmode == 'traditional') { ?>
 <label class="checkbox" for='pendingReview'><input type="checkbox" id="pendingReview" name="pendingReview" value="1" <?php echo in_array(S_DRAFT_REV, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_DRAFT_REV);?></label>
 <?php } ?>

views/bootstrap/class.Settings.php

@@ -654,6 +654,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableSelfRevApp");?>:</td>
         <td><input name="enableSelfRevApp" type="checkbox" <?php if ($settings->_enableSelfRevApp) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableUpdateRevApp_desc");?>">
+        <td><?php printMLText("settings_enableUpdateRevApp");?>:</td>
+        <td><input name="enableUpdateRevApp" type="checkbox" <?php if ($settings->_enableUpdateRevApp) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableAdminReceipt_desc");?>">
         <td><?php printMLText("settings_enableAdminReceipt");?>:</td>
         <td><input name="enableAdminReceipt" type="checkbox" <?php if ($settings->_enableAdminReceipt) echo "checked" ?> /></td>

views/bootstrap/class.UsrMgr.php

@@ -138,7 +138,7 @@ $(document).ready( function() {
 				$session = array_shift($sessions);
 				echo "<tr><td>".getMLText('lastaccess')."</td><td>".getLongReadableDate($session->getLastAccess())."</td></tr>\n";
 			}
-			echo "<tr><td>".getMLText('network_drive')."</td><td><a href=\"http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot.'checkout/'.preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."\">".preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."</a></td></tr>\n";
+			// echo "<tr><td>".getMLText('network_drive')."</td><td><a href=\"http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot.'checkout/'.preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."\">".preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."</a></td></tr>\n";
 			echo "</table>";
 
 			if($user->isAdmin() && $seluser->getID() != $user->getID())

views/bootstrap/class.ViewDocument.php

@@ -455,11 +455,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		/* Retrieve linked documents */
 		$links = $document->getDocumentLinks();
-		$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links);
+		$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links, 'target');
 
 		/* Retrieve reverse linked documents */
 		$reverselinks = $document->getReverseDocumentLinks();
-		$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks);
+		$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source');
 
 		/* Retrieve latest content */
 		$latestContent = $document->getLatestContent();
@@ -800,12 +800,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td><ul class=\"unstyled\">";
 
 				if($accessop->mayReview($document)) {
-					if ($is_reviewer && $r["status"]==0) {
+					if ($is_reviewer) {
+						if ($r["status"]==0) {
 							print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
-					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+						} elseif ($accessop->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
 							print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 						}
 					}
+				}
 
 				print "</ul></td>\n";	
 				print "</tr>\n";
@@ -871,12 +873,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td><ul class=\"unstyled\">";
 
 				if($accessop->mayApprove($document)) {
-					if ($is_approver && $a['status'] == 0 /*$status["status"]==S_DRAFT_APP*/) {
+					if ($is_approver) {
+						if ($a['status'] == 0) {
 							print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
-					}else if (($updateUser==$user)&&(($a["status"]==1)||($a["status"]==-1))&&(!$document->hasExpired())){
+						} elseif ($accessop->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
 							print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 						}
 					}
+				}
 
 				print "</ul>";
 				print "</td>\n";	

views/bootstrap/class.ViewFolder.php

@@ -58,21 +58,28 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0)
 			return;
 
+		$content = '';
 		for ($i = 0; $i < count($accessList["groups"]); $i++)
 		{
 			$group = $accessList["groups"][$i]->getGroup();
 			$accesstext = $this->getAccessModeText($accessList["groups"][$i]->getMode());
-			print $accesstext.": ".htmlspecialchars($group->getName());
+			$content .= $accesstext.": ".htmlspecialchars($group->getName());
 			if ($i+1 < count($accessList["groups"]) || count($accessList["users"]) > 0)
-				print "<br />";
+				$content .= "<br />";
 		}
 		for ($i = 0; $i < count($accessList["users"]); $i++)
 		{
 			$user = $accessList["users"][$i]->getUser();
 			$accesstext = $this->getAccessModeText($accessList["users"][$i]->getMode());
-			print $accesstext.": ".htmlspecialchars($user->getFullName());
+			$content .= $accesstext.": ".htmlspecialchars($user->getFullName());
 			if ($i+1 < count($accessList["users"]))
-				print "<br />";
+				$content .= "<br />";
+		}
+
+		if(count($accessList["groups"]) + count($accessList["users"]) > 3) {
+			$this->printPopupBox(getMLText('list_access_rights'), $content);
+		} else {
+			echo $content;
 		}
 	} /* }}} */
 

webdav/webdav.php

@@ -6,6 +6,31 @@ if(!empty($settings->_coreDir))
 else
 	require_once('SeedDMS/Core.php');
 
+/* Set apache_request_headers() in case it doesn't exists, like
+ * when using fastcgi (patch by christopher täufert taken from http://php.net/)
+ */
+if( !function_exists('apache_request_headers') ) {
+	function apache_request_headers() {
+		$arh = array();
+		$rx_http = '/\AHTTP_/';
+		foreach($_SERVER as $key => $val) {
+			if( preg_match($rx_http, $key) ) {
+				$arh_key = preg_replace($rx_http, '', $key);
+				$rx_matches = array();
+				// do some nasty string manipulations to restore the original letter case
+				// this should work in most cases
+				$rx_matches = explode('_', $arh_key);
+				if( count($rx_matches) > 0 and strlen($arh_key) > 2 ) {
+					foreach($rx_matches as $ak_key => $ak_val) $rx_matches[$ak_key] = ucfirst($ak_val);
+					$arh_key = implode('-', $rx_matches);
+				}
+				$arh[$arh_key] = $val;
+			}
+		}
+		return( $arh );
+	}
+}
+
 /**
  * SeedDMS access using WebDAV
  *