Merge branch 'seeddms-5.0.x' into develop

2025-10-31 13:18:06 +00:00 · 2016-04-28 12:24:47 +02:00 · 2016-04-28 12:24:47 +02:00 · 8a4948085a
commit 8a4948085a
parent 51ca23085a eb3f20c78b
28 changed files with 125 additions and 37 deletions
--- a/12
+++ b/12
@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.4
+--------------------------------------------------------------------------------
+- merged changes from 4.3.27
+- much better dependency checking for extensions, turn off extensions which
+  do not match seeddms version dependency
+
 --------------------------------------------------------------------------------
                     Changes in version 5.0.3
 --------------------------------------------------------------------------------
@ -24,6 +31,10 @@
 - add .xml to online file types by default
 - add home folder for users

+--------------------------------------------------------------------------------
+                     Changes in version 4.3.27
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                     Changes in version 4.3.26
 --------------------------------------------------------------------------------
@ -34,6 +45,7 @@
 - fix error in utils/indexer.php when new documents were indexed
 - set url in approval request email after reviewing a document (Closes #259)
 - inform groups and users watching a new document too (Closes #260)
+- use bootstrap theme for all steps in install tool

 --------------------------------------------------------------------------------
                     Changes in version 4.3.25
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@ -13,6 +13,8 @@

 require "inc.ClassExtensionMgr.php";
 require_once "inc.ClassExtBase.php";
+require_once "inc.Version.php";
+require_once "inc.Utils.php";

 $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 $extconffile = $extMgr->getExtensionsConfFile();
@ -22,7 +24,17 @@ if(!file_exists($extconffile)) {
 $EXT_CONF = array();
 include($extconffile);

+$version = new SeedDMS_Version;
+
 foreach($EXT_CONF as $extname=>$extconf) {
+	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
+		/* check for requirements */
+		if(!empty($extconf['constraints']['depends']['seeddms'])) {
+			$t = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
+			if(cmpVersion($t[0], $version->version()) > 0 || ($t[1] && cmpVersion($t[1], $version->version()) < 0))
+				$extconf['disable'] = true;
+		}
+	}
 	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 		$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
 		if(file_exists($classfile)) {
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'وافق',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'دخول غير مصرح به.',
 'access_inheritance' => 'صلاحيات موروثة',
 'access_mode' => 'نوع الدخول',
@ -785,6 +786,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'صفحة النتائج',
 'return_from_subworkflow' => 'العودة من مسار العمل الفرعي',
 'return_from_subworkflow_email_body' => 'عودة من مسار عمل فرعي
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Приеми',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'достъп забранен',
 'access_inheritance' => 'Наследване на достъпа',
 'access_mode' => 'Режим на достъп',
@ -677,6 +678,7 @@ $text = array(
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Страница с резултати',
 'return_from_subworkflow' => 'Връщане от под-процес',
 'return_from_subworkflow_email_body' => '',
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Acceptar',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Accés denegat',
 'access_inheritance' => 'Accés heretat',
 'access_mode' => 'Mode d\'accés',
@ -682,6 +683,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Pàgina de resultats',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Přijmout',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Přístup zamítnut.',
 'access_inheritance' => 'Dědičnost přístupu',
 'access_mode' => 'Režim přístupu',
@ -795,6 +796,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Stránka s výsledky',
 'return_from_subworkflow' => 'Návrat z vedlejšího pracovního postupu',
 'return_from_subworkflow_email_body' => 'Návrat z vedlejšího pracovního postupu
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@ -19,11 +19,12 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2227), dgrutsch (21)
+//    Translators: Admin (2229), dgrutsch (21)

 $text = array(
 'accept' => 'Übernehmen',
 'access_control' => 'Zugriffskontrolle',
+'access_control_is_off' => 'Erweiterte Zugriffskontrolle ist ausgeschaltet',
 'access_denied' => 'Zugriff verweigert',
 'access_inheritance' => 'Zugriff vererben',
 'access_mode' => 'Berechtigung',
@ -816,6 +817,7 @@ Benutzer: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Workflow-Aktion benötigt',
 'reset_checkout' => 'Auschecken beenden',
+'restrict_access' => 'Kein Zugriff auf',
 'results_page' => 'Ergebnis-Seite',
 'return_from_subworkflow' => 'Rückkehr aus Sub-Workflow',
 'return_from_subworkflow_email_body' => 'Rückkehr vom Subworkflow
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@ -19,11 +19,12 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1373), dgrutsch (7), netixw (14)
+//    Translators: Admin (1375), dgrutsch (7), netixw (14)

 $text = array(
 'accept' => 'Accept',
 'access_control' => 'Access control',
+'access_control_is_off' => 'Advanced access control is turned off',
 'access_denied' => 'Access denied.',
 'access_inheritance' => 'Access Inheritance',
 'access_mode' => 'Access mode',
@ -817,6 +818,7 @@ User: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Workflow action required',
 'reset_checkout' => 'Finish Check out',
+'restrict_access' => 'No access to',
 'results_page' => 'Results Page',
 'return_from_subworkflow' => 'Return from sub workflow',
 'return_from_subworkflow_email_body' => 'Return from subworkflow
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Aceptar',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Acceso denegado',
 'access_inheritance' => 'Acceso heredado',
 'access_mode' => 'Tipo de acceso',
@ -800,6 +801,7 @@ nURL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Página de resultados',
 'return_from_subworkflow' => 'Regreso a sub Flujo de trabajo',
 'return_from_subworkflow_email_body' => 'Retorno del subflujo de trabajo
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Accepter',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Accès refusé.',
 'access_inheritance' => 'Héritage d\'accès',
 'access_mode' => 'Droits d\'accès',
@ -796,6 +797,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Page de résultats',
 'return_from_subworkflow' => 'Revenir du sous-workflow',
 'return_from_subworkflow_email_body' => '',
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Prihvati',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Odbijen pristup.',
 'access_inheritance' => 'Nasljedivost razine pristupa',
 'access_mode' => 'Način pristupa',
@ -811,6 +812,7 @@ Korisnik: [username]
 URL poveznica: [url]',
 'request_workflow_action_email_subject' => 'Zahtijeva se aktivnost po poslovnom toku',
 'reset_checkout' => 'Dovršite odjavu',
+'restrict_access' => '',
 'results_page' => 'Stranica rezultata',
 'return_from_subworkflow' => 'Povratak iz pod-toka rada',
 'return_from_subworkflow_email_body' => 'Povratak iz toka rada
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Elfogad',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Hozzáférés megtagadva.',
 'access_inheritance' => 'Hozzáférés öröklés',
 'access_mode' => 'Hozzáférési mód',
@ -800,6 +801,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Találati oldal',
 'return_from_subworkflow' => 'Visszatérés a segéd munkafolyamatból',
 'return_from_subworkflow_email_body' => 'Visszatérés segéd munkafolyamatból
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Accetta',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Accesso negato',
 'access_inheritance' => 'Permessi ereditari',
 'access_mode' => 'Permessi',
@ -813,6 +814,7 @@ Utente: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Richiesta di azione in un flusso di lavoro',
 'reset_checkout' => 'Check Out terminato',
+'restrict_access' => '',
 'results_page' => 'Pagina dei risultati',
 'return_from_subworkflow' => 'Ritorno dal sotto-flusso di lavoro',
 'return_from_subworkflow_email_body' => 'Ritorno dal sotto-flusso di lavoro
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => '동의',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => '접근가 거부되었습니다.',
 'access_inheritance' => '접근 상속',
 'access_mode' => '접근 모드',
@ -804,6 +805,7 @@ URL: [url]',
 URL: [url]',
 'request_workflow_action_email_subject' => '워크플로우 작업 필요',
 'reset_checkout' => '체크아웃 마감',
+'restrict_access' => '',
 'results_page' => '결과 페이지',
 'return_from_subworkflow' => '서브 워크플로우에서 반환',
 'return_from_subworkflow_email_body' => '서브 워크플로우에서 복귀
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Accept',
 'access_control' => 'Toegangscontrole',
+'access_control_is_off' => '',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overgeërfd',
 'access_mode' => 'Toegang modus',
@ -809,6 +810,7 @@ Gebruiker: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Workflow – actie vereist',
 'reset_checkout' => 'Beëindig het gebruik van het document',
+'restrict_access' => '',
 'results_page' => 'Resultaten pagina',
 'return_from_subworkflow' => 'Terug uit subworkflow',
 'return_from_subworkflow_email_body' => 'Terug uit subworkflow
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Akceptuj',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Dostęp zabroniony.',
 'access_inheritance' => 'Dziedziczenie dostępu',
 'access_mode' => 'Tryb dostępu',
@ -793,6 +794,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Strona z wynikami',
 'return_from_subworkflow' => 'Powróć z sub procesu',
 'return_from_subworkflow_email_body' => 'Powrót z sub procesu dokumentu: [name] Wersja: [version] Proces: [workflow] Sub proces: [subworkflow] folderu nadrzędnego: [folder_path] Użytkownik: [username] URL: [url]',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Aceitar',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Acesso Negado.',
 'access_inheritance' => 'access Inheritance',
 'access_mode' => 'Modo de acesso',
@ -798,6 +799,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Results Page',
 'return_from_subworkflow' => 'Retorno de sub fluxo de trabalho',
 'return_from_subworkflow_email_body' => 'Retorno de sub fluxo de trabalho
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Accept',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Acces interzis.',
 'access_inheritance' => 'Mostenire acces',
 'access_mode' => 'Mod de acces',
@ -812,6 +813,7 @@ Utilizator: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Actiune workflow necesara',
 'reset_checkout' => 'Termina verificarea',
+'restrict_access' => '',
 'results_page' => 'Pagina rezultate',
 'return_from_subworkflow' => 'Întoarcere din subworkflow',
 'return_from_subworkflow_email_body' => 'Întoarcere din subworkflow
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Принять',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Доступ запрещён',
 'access_inheritance' => 'Наследование доступа',
 'access_mode' => 'Режим доступа',
@ -814,6 +815,7 @@ URL: [url]',
 URL: [url]',
 'request_workflow_action_email_subject' => 'Требуется действие по процессу',
 'reset_checkout' => 'Завершить проверку',
+'restrict_access' => '',
 'results_page' => 'Страница результатов',
 'return_from_subworkflow' => 'Выход из подпроцесса',
 'return_from_subworkflow_email_body' => 'Выход из подпроцесса
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -19,11 +19,12 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (492), destinqo (19)
+//    Translators: Admin (493), destinqo (19)

 $text = array(
 'accept' => 'Prijať',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Prístup zamietnutý.',
 'access_inheritance' => 'Dedičnosť prístupu',
 'access_mode' => 'Režim prístupu',
@ -154,7 +155,7 @@ URL: [url]',
 'backup_tools' => 'Zálohovacie nástroje',
 'between' => 'medzi',
 'bg_BG' => 'Bulharsky',
-'browse' => '',
+'browse' => 'Prehľadávať',
 'calendar' => 'Kalendár',
 'calendar_week' => '',
 'cancel' => 'Zrušiť',
@ -681,6 +682,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Výsledky',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -19,11 +19,12 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1117), tmichelfelder (106)
+//    Translators: Admin (1127), tmichelfelder (106)

 $text = array(
 'accept' => 'Godkänn',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Åtkomst nekas.',
 'access_inheritance' => 'Ärv åtkomst',
 'access_mode' => 'Åtkomstnivå',
@ -785,6 +786,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Resultatsida',
 'return_from_subworkflow' => 'Tillbaka från under-arbetsflöde',
 'return_from_subworkflow_email_body' => 'Tillbaka från underliggande arbetsflöde
@ -975,10 +977,10 @@ URL: [url]',
 'settings_dbUser' => 'Användarnamn',
 'settings_dbUser_desc' => 'Användarnamnet för tillgång till databasen. Användarnamnet angavs under installationsprocessen.',
 'settings_dbVersion' => 'Databasschemat för gammalt',
-'settings_defaultSearchMethod' => '',
-'settings_defaultSearchMethod_desc' => '',
-'settings_defaultSearchMethod_valdatabase' => '',
-'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultSearchMethod' => 'Standard sökmetod',
+'settings_defaultSearchMethod_desc' => 'Standard sökmetod, när en sökning startas i sökformuläret i huvudmenyn.',
+'settings_defaultSearchMethod_valdatabase' => 'databas',
+'settings_defaultSearchMethod_valfulltext' => 'fulltext',
 'settings_delete_install_folder' => 'För att kunna använda LetoDMS måste du ta bort filen ENABLE_INSTALL_TOOL som finns i konfigurationsmappen.',
 'settings_disableSelfEdit' => 'Inaktivera själveditering',
 'settings_disableSelfEdit_desc' => 'Om utvald, kan användare inte ändra sin egen profil.',
@ -987,8 +989,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Mapp för mellanlagring av filer',
 'settings_dropFolderDir_desc' => 'Denna mapp kan användas för att mellanlagra filer på serverns filsystem och den kan importeras därifrån istället för att filen laddas upp via webbläsaren. Mappen måste innehålla en undermapp för varje användare som har tillstånd att importera filer denna vägen.',
 'settings_Edition' => 'Redigeringsinställningar',
-'settings_editOnlineFileTypes' => '',
-'settings_editOnlineFileTypes_desc' => '',
+'settings_editOnlineFileTypes' => 'Redigera online-filtyper',
+'settings_editOnlineFileTypes_desc' => 'Filer med en av följande filtyper kan redigeras online OBS! ANVÄND BARA SMÅ BOKSTÄVER)',
 'settings_enableAcknowledgeWorkflow' => '',
 'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Visa Admin i listan granska/godkänna',
@ -1315,7 +1317,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Version [version]: [status]',
 'to' => 'till',
 'toggle_manager' => 'Byt manager',
 'to_before_from' => 'Slutdatum får inte vara innan startdatum',
@ -1337,7 +1339,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Vänligen vänta tills dokumentträdet laddats',
 'trigger_workflow' => 'Arbetsflöde',
 'tr_TR' => 'Turkiska',
 'tuesday' => 'tisdag',
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Kabul',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Erişim engellendi.',
 'access_inheritance' => 'Devredilen Erişim',
 'access_mode' => 'Erişim modu',
@ -801,6 +802,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => 'Sonuç Sayfası',
 'return_from_subworkflow' => 'Alt iş akış dönüşü',
 'return_from_subworkflow_email_body' => 'Alt iş akış dönüşü
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => 'Прийняти',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => 'Доступ заборонений',
 'access_inheritance' => 'Наслідування доступу',
 'access_mode' => 'Режим доступу',
@ -807,6 +808,7 @@ URL: [url]',
 'request_workflow_action_email_body' => 'Запит дії по процесу',
 'request_workflow_action_email_subject' => 'Запит дії для процесу',
 'reset_checkout' => 'Зняти стан опрацювання',
+'restrict_access' => '',
 'results_page' => 'Сторінка результатів',
 'return_from_subworkflow' => 'Вихід з підпроцесу',
 'return_from_subworkflow_email_body' => 'Вихід з підпроцесу
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => '接受',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => '拒绝访问',
 'access_inheritance' => '继承访问权限',
 'access_mode' => '访问模式',
@ -683,6 +684,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => '结果页面',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@ -24,6 +24,7 @@
 $text = array(
 'accept' => '接受',
 'access_control' => '',
+'access_control_is_off' => '',
 'access_denied' => '拒絕訪問',
 'access_inheritance' => '繼承存取權限',
 'access_mode' => '訪問模式',
@ -681,6 +682,7 @@ URL: [url]',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
 'reset_checkout' => '',
+'restrict_access' => '',
 'results_page' => '結果頁面',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@ -47,24 +47,40 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		print "</tr></thead>\n";
 		$errmsgs = array();
 		foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) {
+			$errmsgs = array();
 			if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 				/* check dependency on specific seeddms version */
-				if(isset($extconf['constraints']['depends']['seeddms'])) {
-					$tmp = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
-					if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
-						$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
-				} else {
+				if(!isset($extconf['constraints']['depends']['seeddms']))
 					$errmsgs[] = "Missing dependency on SeedDMS";
+				if(!isset($extconf['constraints']['depends']['php']))
+					$errmsgs[] = "Missing dependency on PHP";
+
+				if(isset($extconf['constraints']['depends'])) {
+					foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
+						switch($dkey) {
+						case 'seeddms':
+							$tmp = explode('-', $dval, 2);
+							if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
+								$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
+							break;
+						case 'php':
+							$tmp = explode('-', $dval, 2);
+							if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
+								$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
+							break;
+						default:
+							$tmp = explode('-', $dval, 2);
+							if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
+								if(cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
+									$errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
+							} else {
+								$errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
+							}
+							break;
+						}
+					}
 				}

-				/* check dependency on specific php version */
-				if(isset($extconf['constraints']['depends']['php'])) {
-					$tmp = explode('-', $extconf['constraints']['depends']['php'], 2);
-					if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
-						$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
-				} else {
-					$errmsgs[] = "Missing dependency on PHP";
-				}
 				if($errmsgs)
 					echo "<tr class=\"error\">";
 				else
@ -77,7 +93,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>".$extconf['title']."<br /><small>".$extconf['description']."</small>";
 			if($errmsgs)
-				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br />', $errmsgs)."</div>";
+				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
 			echo "</td>";
 			echo "<td>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small></td>";
 			echo "<td><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@ -296,17 +296,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 		}
 		if($user->isAdmin()) {
+			echo "<tr>";
+			echo "<td>".getMLText('default_access').":</td>";
+			echo "<td>".$this->getAccessModeText($document->getDefaultAccess())."</td>";
+			echo "</tr>";
 			if($document->inheritsAccess()) {
 				echo "<tr>";
 				echo "<td>".getMLText("access_mode").":</td>\n";
 				echo "<td>";
-				echo getMLText("inherited");
+				echo getMLText("inherited")."<br />";
+				$this->printAccessList($document);
 				echo "</tr>";
 			} else {
-				echo "<tr>";
-				echo "<td>".getMLText('default_access').":</td>";
-				echo "<td>".$this->getAccessModeText($document->getDefaultAccess())."</td>";
-				echo "</tr>";
 				echo "<tr>";
 				echo "<td>".getMLText('access_mode').":</td>";
 				echo "<td>";
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@ -208,17 +208,18 @@ function folderSelected(id, name) {
 			}

 			if($user->isAdmin()) {
+				echo "<tr>";
+				echo "<td>".getMLText('default_access').":</td>";
+				echo "<td>".$this->getAccessModeText($folder->getDefaultAccess())."</td>";
+				echo "</tr>";
 				if($folder->inheritsAccess()) {
 					echo "<tr>";
 					echo "<td>".getMLText("access_mode").":</td>\n";
 					echo "<td>";
-					echo getMLText("inherited");
+					echo getMLText("inherited")."<br />";
+					$this->printAccessList($folder);
 					echo "</tr>";
 				} else {
-					echo "<tr>";
-					echo "<td>".getMLText('default_access').":</td>";
-					echo "<td>".$this->getAccessModeText($folder->getDefaultAccess())."</td>";
-					echo "</tr>";
 					echo "<tr>";
 					echo "<td>".getMLText('access_mode').":</td>";
 					echo "<td>";