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

CHANGELOG

@@ -97,8 +97,8 @@
 --------------------------------------------------------------------------------
 - 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
+- do not execute code which uses 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

languages/ar_EG/lang.inc

@@ -307,6 +307,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
 'document_already_checkedout' => '',

languages/bg_BG/lang.inc

@@ -292,6 +292,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
 'document_already_checkedout' => '',

languages/ca_ES/lang.inc

@@ -297,6 +297,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
 'document_already_checkedout' => '',

languages/cs_CZ/lang.inc

@@ -314,6 +314,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
 'document_already_checkedout' => '',

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 (2355), dgrutsch (22)
+//    Translators: Admin (2356), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -319,6 +319,7 @@ URL: [url]',
 'documents_to_receipt' => 'Empfangsbestätigung erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_user_reception' => 'Dokumente mit Empfangsbestätigung',
 'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',

languages/el_GR/lang.inc

@@ -292,6 +292,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => '',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '',
 'document_already_checkedout' => '',

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 (1484), dgrutsch (9), netixw (14)
+//    Translators: Admin (1485), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -319,6 +319,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents awaiting your revision',
+'documents_user_reception' => 'Documents awaiting reception',
 'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
 'document_already_checkedout' => 'This document is already checked out',

languages/es_ES/lang.inc

@@ -314,6 +314,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
 'document_already_checkedout' => '',

languages/fr_FR/lang.inc

@@ -319,6 +319,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'document_already_checkedout' => 'Ce document est déjà débloqué',

languages/hr_HR/lang.inc

@@ -319,6 +319,7 @@ Internet poveznica: [url]',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
+'documents_user_reception' => '',
 'documents_user_rejected' => 'Odbijeni dokumenti',
 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju',
 'document_already_checkedout' => 'Ovaj dokument je već odjavljen',

languages/hu_HU/lang.inc

@@ -314,6 +314,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
 'document_already_checkedout' => '',

languages/it_IT/lang.inc

@@ -320,6 +320,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
+'documents_user_reception' => '',
 'documents_user_rejected' => 'Documenti rifiutati',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
 'document_already_checkedout' => 'Questo documento è già approvato',

languages/ko_KR/lang.inc

@@ -321,6 +321,7 @@ URL: [url]',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
+'documents_user_reception' => '',
 'documents_user_rejected' => '거부된 문서',
 'documents_user_requiring_attention' => '주의가 필요한 당신 소유의 문서',
 'document_already_checkedout' => '이문서는 이미 체크아웃 되었습니다',

languages/nl_NL/lang.inc

@@ -312,6 +312,7 @@ URL: [url]',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
+'documents_user_reception' => '',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
 'document_already_checkedout' => 'Al in behandeling genomen documenten',

languages/pl_PL/lang.inc

@@ -307,6 +307,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
 'document_already_checkedout' => '',

languages/pt_BR/lang.inc

@@ -314,6 +314,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
 'document_already_checkedout' => '',

languages/ro_RO/lang.inc

@@ -319,6 +319,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
 'document_already_checkedout' => 'Acest document este deja verificat',

languages/ru_RU/lang.inc

@@ -319,6 +319,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => 'Документы на ревизии',
+'documents_user_reception' => '',
 'documents_user_rejected' => 'Отклоненные документы',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
 'document_already_checkedout' => 'Этот документ уже проверен',

languages/sk_SK/lang.inc

@@ -296,6 +296,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
 'document_already_checkedout' => '',

languages/sv_SE/lang.inc

@@ -307,6 +307,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
 'document_already_checkedout' => '',

languages/tr_TR/lang.inc

@@ -313,6 +313,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
 'document_already_checkedout' => '',

languages/uk_UA/lang.inc

@@ -319,6 +319,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_reception' => '',
 'documents_user_rejected' => 'Документи, які відхилили',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
 'document_already_checkedout' => 'Цей документ вже на опрацюванні',

languages/zh_CN/lang.inc

@@ -298,6 +298,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您关注的文档',
 'document_already_checkedout' => '',

languages/zh_TW/lang.inc

@@ -296,6 +296,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
 'document_already_checkedout' => '',

webdav/webdav.php

@@ -6,31 +6,6 @@ if(!empty($settings->_coreDir))
 else
 	require_once('SeedDMS/Core.php');
 
-/* Set apache_request_headers() in case it doesn't exists, like
- * when using fastcgi (patch by christopher täufert taken from http://php.net/)
- */
-if( !function_exists('apache_request_headers') ) {
-	function apache_request_headers() {
-		$arh = array();
-		$rx_http = '/\AHTTP_/';
-		foreach($_SERVER as $key => $val) {
-			if( preg_match($rx_http, $key) ) {
-				$arh_key = preg_replace($rx_http, '', $key);
-				$rx_matches = array();
-				// do some nasty string manipulations to restore the original letter case
-				// this should work in most cases
-				$rx_matches = explode('_', $arh_key);
-				if( count($rx_matches) > 0 and strlen($arh_key) > 2 ) {
-					foreach($rx_matches as $ak_key => $ak_val) $rx_matches[$ak_key] = ucfirst($ak_val);
-					$arh_key = implode('-', $rx_matches);
-				}
-				$arh[$arh_key] = $val;
-			}
-		}
-		return( $arh );
-	}
-}
-
 /**
  * SeedDMS access using WebDAV
  *
@@ -79,10 +54,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		// special treatment for litmus compliance test
 		// reply on its identifier header
 		// not needed for the test itself but eases debugging
-		foreach (apache_request_headers() as $key => $value) {
-			if (stristr($key, "litmus")) {
-				error_log("Litmus test $value");
-				header("X-Litmus-reply: ".$value);
+		if( function_exists('apache_request_headers') ) {
+			foreach (apache_request_headers() as $key => $value) {
+				if (stristr($key, "litmus")) {
+					error_log("Litmus test $value");
+					header("X-Litmus-reply: ".$value);
+				}
 			}
 		}