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

CHANGELOG

@@ -326,6 +326,12 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.41
+--------------------------------------------------------------------------------
+- action when clicking on a thumbnail can be set (download or view online)
+- major update of polish translation
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.40
 --------------------------------------------------------------------------------

inc/inc.ClassSettings.php

@@ -362,6 +362,8 @@ class Settings { /* {{{ */
 	var $_previewWidthDetail = 100;
 	// Preview image width in drop folder list
 	var $_previewWidthDropFolderList = 100;
+	// download or view online when clicking on preview image
+	var $_defaultThumbnailClick = 'download';
 	// show full preview on document details page
 	var $_showFullPreview = false;
 	// convert to pdf for preview on document details page
@@ -596,6 +598,7 @@ class Settings { /* {{{ */
 			$this->_previewWidthDetail = intval($tab["previewWidthDetail"]);
 		if(isset($tab["previewWidthDropFolderList"]))
 			$this->_previewWidthDropFolderList = intval($tab["previewWidthDropFolderList"]);
+		$this->_defaultThumbnailClick = strval($tab["defaultThumbnailClick"]);
 		$this->_showFullPreview = Settings::boolVal($tab["showFullPreview"]);
 		$this->_convertToPdf = Settings::boolVal($tab["convertToPdf"]);
 		if(isset($tab["maxItemsPerPage"]))
@@ -1037,6 +1040,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "previewWidthMenuList", $this->_previewWidthMenuList);
     $this->setXMLAttributValue($node, "previewWidthDetail", $this->_previewWidthDetail);
     $this->setXMLAttributValue($node, "previewWidthDropFolderList", $this->_previewWidthDropFolderList);
+    $this->setXMLAttributValue($node, "defaultThumbnailClick", $this->_defaultThumbnailClick);
     $this->setXMLAttributValue($node, "showFullPreview", $this->_showFullPreview);
     $this->setXMLAttributValue($node, "convertToPdf", $this->_convertToPdf);
     $this->setXMLAttributValue($node, "maxItemsPerPage", $this->_maxItemsPerPage);

languages/ar_EG/lang.inc

@@ -1617,6 +1617,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => 'طريقة البحث الافتراضية',
 'settings_defaultSearchMethod_valdatabase' => 'طريقة البحث الافتراضية في قاعدة البيانات',
 'settings_defaultSearchMethod_valfulltext' => 'طريقة البحث الافتراضية في جمل كاملة',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'مسح مثبت المجلد',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/bg_BG/lang.inc

@@ -1459,6 +1459,10 @@ $text = array(
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => '',
 'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Изтрийте ENABLE_INSTALL_TOOL в папка конфигурация, за да започнете да използвате системата',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/ca_ES/lang.inc

@@ -1464,6 +1464,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => '',
 'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => '',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/cs_CZ/lang.inc

@@ -1689,6 +1689,10 @@ Jméno: [username]
 'settings_defaultSearchMethod_desc' => 'Výchozí metoda vyhledávání, když je vyhledávací formulář spuštěn v hlavním menu.',
 'settings_defaultSearchMethod_valdatabase' => 'databáze',
 'settings_defaultSearchMethod_valfulltext' => 'fulltext',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Chcete-li použít SeedDMS, musíte v konfiguračním adresáři odstranit soubor ENABLE_INSTALL_TOOL',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

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 (3444), dgrutsch (22)
+//    Translators: Admin (3448), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -2080,6 +2080,10 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_defaultSearchMethod_desc' => 'Voreingestellte Suchmethode, wenn über das Suchfeld in der Menüleiste gesucht wird.',
 'settings_defaultSearchMethod_valdatabase' => 'Datenbank',
 'settings_defaultSearchMethod_valfulltext' => 'Volltext',
+'settings_defaultThumbnailClick' => 'Aktion nach Anklicken eines Vorschaubildes',
+'settings_defaultThumbnailClick_desc' => 'Diese Aktion wird ausgeführt, wenn auf ein Vorschaubild geklickt wird.',
+'settings_defaultThumbnailClick_valdownload' => 'Dokument herunterladen',
+'settings_defaultThumbnailClick_valviewonline' => 'Dokument online anschauen',
 'settings_delete_install_folder' => 'Um SeedDMS nutzen zu können, müssen Sie die Datei ENABLE_INSTALL_TOOL aus dem Konfigurationsverzeichnis löschen.',
 'settings_disableChangePassword' => 'Kein Ändern des eigenen Passworts',
 'settings_disableChangePassword_desc' => 'Anwählen, um das Ändern des eigenen Passworts zu unterbinden. Schalten Sie dies ein, wenn LDAP-Authentifizierung verwendet wird. Es verhindert, dass Benutzer ein Passwort in der Datenbank setzen und damit die LDAP-Authentifizierung umgehen.',

languages/el_GR/lang.inc

@@ -1470,6 +1470,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => '',
 'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => '',
 'settings_disableChangePassword' => 'Disable changing password',
 'settings_disableChangePassword_desc' => '',

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 (2547), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2551), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -2082,6 +2082,10 @@ If you did not receive a password, please use the password forgotten function on
 'settings_defaultSearchMethod_desc' => 'Default search method, when a search is started by the search form in the main menu.',
 'settings_defaultSearchMethod_valdatabase' => 'database',
 'settings_defaultSearchMethod_valfulltext' => 'fulltext',
+'settings_defaultThumbnailClick' => 'Action when clicking on thumbnail',
+'settings_defaultThumbnailClick_desc' => 'This action will be executed when a thumbnail is clicked.',
+'settings_defaultThumbnailClick_valdownload' => 'Download document',
+'settings_defaultThumbnailClick_valviewonline' => 'View document online',
 'settings_delete_install_folder' => 'In order to use SeedDMS, you must delete the file ENABLE_INSTALL_TOOL in the configuration directory',
 'settings_disableChangePassword' => 'Disallow changing own password',
 'settings_disableChangePassword_desc' => 'If checked the user cannot change his/her password. Turn this on if LDAP authentication is used. It prevents setting a database password and circumvent LDAP authentication.',

languages/es_ES/lang.inc

@@ -1640,6 +1640,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => 'Método de búsqueda por defecto, cuando se inicia una búsqueda mediante el formulario en el menú principal',
 'settings_defaultSearchMethod_valdatabase' => 'base de datos',
 'settings_defaultSearchMethod_valfulltext' => 'Todo el texto',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Para utilizar SeedDMS, debe eliminar el archivo ENABLE_INSTALL_TOOL de la carpeta de configuración',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/fr_FR/lang.inc

@@ -2027,6 +2027,10 @@ Nom : [username]
 'settings_defaultSearchMethod_desc' => 'Méthode de recherche par défaut, lorsque la recherche est exécutée depuis le moteur de recherche du menu principal',
 'settings_defaultSearchMethod_valdatabase' => 'base de données',
 'settings_defaultSearchMethod_valfulltext' => 'Plein texte (contenu)',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Pour utiliser SeedDMS, vous devez supprimer le fichier ENABLE_INSTALL_TOOL dans le répertoire de configuration',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/hr_HR/lang.inc

@@ -1653,6 +1653,10 @@ Internet poveznica: [url]',
 'settings_defaultSearchMethod_desc' => 'Zadana metoda pretrage, kada se pretraživanje pokreće putem formulara iz glavnog izbornika',
 'settings_defaultSearchMethod_valdatabase' => 'baza podataka',
 'settings_defaultSearchMethod_valfulltext' => 'puni tekst',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Da bi koristili ProsperaDMS, morate izbrisati datoteku ENABLE_INSTALL_TOOL u mapi konfiguracije',
 'settings_disableChangePassword' => 'postavke onemogućiPromijeni lozinku',
 'settings_disableChangePassword_desc' => 'postavke onemogućiPromijeni lozinku desc',

languages/hu_HU/lang.inc

@@ -1630,6 +1630,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => 'adatbázis',
 'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'A SeedDMS használatához törölnie kell a konfigurációs könyvtárban található ENABLE_INSTALL_TOOL állományt.',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/id_ID/lang.inc

@@ -1720,6 +1720,10 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'settings_defaultSearchMethod_desc' => 'Metode pencarian default, ketika pencarian dimulai dengan formulir pencarian di menu utama.',
 'settings_defaultSearchMethod_valdatabase' => 'basis data',
 'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Untuk menggunakan SeedDMS, Anda harus menghapus file ENABLE_INSTALL_TOOL di direktori konfigurasi',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/it_IT/lang.inc

@@ -1676,6 +1676,10 @@ Name: [username]
 'settings_defaultSearchMethod_desc' => 'Metodo di ricerca predefinito, quando la ricerca viene avviata dal modulo di ricerca nel menu principale.',
 'settings_defaultSearchMethod_valdatabase' => 'database',
 'settings_defaultSearchMethod_valfulltext' => 'Testo intero',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/ko_KR/lang.inc

@@ -1647,6 +1647,10 @@ URL : [url]',
 'settings_defaultSearchMethod_desc' => '기본 검색 설정',
 'settings_defaultSearchMethod_valdatabase' => '기본 검색 방법 설정',
 'settings_defaultSearchMethod_valfulltext' => '기본 검색 방법 설정',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'SeedDMS을 사용하려면 구성 디렉토리의 파일 ENABLE_INSTALL_TOOL을 삭제해야합니다',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/lo_LA/lang.inc

@@ -1673,6 +1673,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => 'ວິທີການຄົ້ນຫາແບບເລີ້ມຕົ້ນ ເມືອການຄົ້ນຫາເລີ່ມຈາກແບບຟອມການຄົ້ນຫາໃນເມນູ',
 'settings_defaultSearchMethod_valdatabase' => 'ຖານຂໍ້ມູນ',
 'settings_defaultSearchMethod_valfulltext' => 'ຂໍ້ຄວາມເຕັມ',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'ໃນການໄຊ້ SeedDMS, ເຈົ້າຈະຕ້ອງລົບໄຟລ ເປີດໄຊ້ງານ_ຕິດຕັ້ງ_ເຄື່ອງມືໃນການບໍລິຫານ ການກຳນົດຄ່າ',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/nb_NO/lang.inc

@@ -1686,6 +1686,10 @@ Bruker: [username]
 'settings_defaultSearchMethod_desc' => 'Standard søkemetode, når et søk startes av søkeskjemaet i hovedmenyen.',
 'settings_defaultSearchMethod_valdatabase' => 'database',
 'settings_defaultSearchMethod_valfulltext' => 'fulltekst',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'For å bruke SeedDMS, må du slette filen ENABLE_INSTALL_TOOL i konfigurasjonsmappen',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/nl_NL/lang.inc

@@ -1685,6 +1685,10 @@ Name: [username]
 'settings_defaultSearchMethod_desc' => 'Default zoekmethode = op documentnaam / fulltext-search',
 'settings_defaultSearchMethod_valdatabase' => 'Default zoekmethode (Documentnaam)',
 'settings_defaultSearchMethod_valfulltext' => 'Default fulltext-zoeken',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Om SeedDMS te kunnen gebruiken moet het bestand ENABLE_INSTALL_TOOL uit de configuratiemap verwijderd worden.',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/pt_BR/lang.inc

@@ -1692,6 +1692,10 @@ Nome: [username]
 'settings_defaultSearchMethod_desc' => 'Método de pesquisa padrão, quando uma pesquisa é iniciada pelo formulário de pesquisa no menu principal.',
 'settings_defaultSearchMethod_valdatabase' => 'Banco de Dados',
 'settings_defaultSearchMethod_valfulltext' => 'texto completo',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Para utilizar Sistema GED, você deve excluir o arquivo ENABLE_INSTALL_TOOL do diretório de configuração',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/ro_RO/lang.inc

@@ -1654,6 +1654,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => 'Metoda de cautare implicita cand cautarea a fost initiata prin formularul de cautare din meniul principal',
 'settings_defaultSearchMethod_valdatabase' => 'baza de date',
 'settings_defaultSearchMethod_valfulltext' => 'Text complet',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Pentru a utiliza SeedDMS, trebuie să ștergeți fișierul ENABLE_INSTALL_TOOL din directorul de configurare',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/ru_RU/lang.inc

@@ -1661,6 +1661,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => 'Метод поиска по умолчанию, когда поиск начинается с поисковой формы главного меню.',
 'settings_defaultSearchMethod_valdatabase' => 'база данных',
 'settings_defaultSearchMethod_valfulltext' => 'полнотекстовый',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Удалите ENABLE_INSTALL_TOOL в каталоге конфигурации, для того что бы начать использовать систему',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/sk_SK/lang.inc

@@ -1694,6 +1694,10 @@ Meno: [username]
 'settings_defaultSearchMethod_desc' => 'Default search method, when a search is started by the search form in the main menu.',
 'settings_defaultSearchMethod_valdatabase' => 'databáza',
 'settings_defaultSearchMethod_valfulltext' => 'fulltext',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'In order to use SeedDMS, you must delete the file ENABLE_INSTALL_TOOL in the configuration directory',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/sv_SE/lang.inc

@@ -1667,6 +1667,10 @@ Kommentar: [comment]',
 '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_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 '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_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/tr_TR/lang.inc

@@ -1631,6 +1631,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => 'veritabanı',
 'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'SeedDMS kullanabilmeniz için konfigürasyon (conf) dizini içindeki ENABLE_INSTALL_TOOL dosyasını silmelisiniz',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/uk_UA/lang.inc

@@ -1653,6 +1653,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => 'Метод пошуку за замовчуванням, коли пошук починається з пошукової форми головного меню.',
 'settings_defaultSearchMethod_valdatabase' => 'база даних',
 'settings_defaultSearchMethod_valfulltext' => 'повнотекстовий',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => 'Видаліть ENABLE_INSTALL_TOOL в каталозі конфігурації для того, щоби почати використовувати систему',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/zh_CN/lang.inc

@@ -1641,6 +1641,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => '在主菜单中启动检索时，设置默认的搜索方式',
 'settings_defaultSearchMethod_valdatabase' => '数据库',
 'settings_defaultSearchMethod_valfulltext' => '全文',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => '在使用 DMS 前，您必须先删除配置目录（config）下的 ENABLE_INSTALL_TOOL 文件',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

languages/zh_TW/lang.inc

@@ -1692,6 +1692,10 @@ URL: [url]',
 'settings_defaultSearchMethod_desc' => '默認搜索方法，當通過主菜單中的搜索表單開始搜索時。',
 'settings_defaultSearchMethod_valdatabase' => '資料庫',
 'settings_defaultSearchMethod_valfulltext' => '全文',
+'settings_defaultThumbnailClick' => '',
+'settings_defaultThumbnailClick_desc' => '',
+'settings_defaultThumbnailClick_valdownload' => '',
+'settings_defaultThumbnailClick_valviewonline' => '',
 'settings_delete_install_folder' => '為了使用SeedDMS，必須在配置目錄中刪除文件ENABLE_INSTALL_TOOL',
 'settings_disableChangePassword' => '',
 'settings_disableChangePassword_desc' => '',

op/op.SetRevisors.php

@@ -58,14 +58,14 @@ if (!is_object($content)) {
 $ts = null;
 if (!empty($_POST["startdate"])) {
 	$ts = makeTsFromDate($_POST["startdate"]);
-}
+	if(!$ts) {
-if(!$ts) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_revision_date"));
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_revision_date"));
+	}
-}
+	$startdate = date('Y-m-d', $ts);
-$startdate = date('Y-m-d', $ts);
 
-if(!$content->setRevisionDate($startdate)) {
+	if(!$content->setRevisionDate($startdate)) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+	}
 }
 
 $folder = $document->getFolder();

op/op.Settings.php

@@ -104,6 +104,7 @@ if ($action == "saveSettings")
 	setIntValue('previewWidthMenuList');
 	setIntValue('previewWidthDropFolderList');
 	setIntValue('previewWidthDetail');
+	setStrValue('defaultThumbnailClick');
 	setBoolValue('showFullPreview');
 	setBoolValue('convertToPdf');
 	setIntValue('maxItemsPerPage');

out/out.Clipboard.php

@@ -33,6 +33,7 @@ require_once("inc/inc.ClassUI.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 
 $folder = null;
 if (isset($_GET["folderid"]) && is_numeric($_GET["folderid"])) {
@@ -42,6 +43,7 @@ if (isset($_GET["folderid"]) && is_numeric($_GET["folderid"])) {
 
 
 if($view) {
+	$view->setParam('accessobject', $accessop);
 	$view->setParam('folder', $folder);
 	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);

out/out.Search.php

@@ -58,6 +58,10 @@ $skipdefaultcols = false;
 if (isset($get["skipdefaultcols"]) && $get["skipdefaultcols"])
 	$skipdefaultcols = true;
 
+$exportoptions = [];
+if (isset($get["export_options"]) && $get["export_options"])
+	$exportoptions = $get["export_options"];
+
 $newowner = null;
 if (isset($get["newowner"]) && is_numeric($get["newowner"]) && $get['newowner'] > 0) {
 	$newowner = $dms->getUser((int) $get['newowner']);
@@ -671,6 +675,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('query', $query);
 		$view->setParam('includecontent', $includecontent);
 		$view->setParam('skipdefaultcols', $skipdefaultcols);
+		$view->setParam('exportoptions', $exportoptions);
 		$view->setParam('marks', isset($get['marks']) ? $get['marks'] : array());
 		$view->setParam('newowner', $newowner);
 		$view->setParam('newreviewer', $newreviewer);

views/bootstrap/class.Bootstrap.php

@@ -3392,6 +3392,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		$enableClipboard = $this->params['enableclipboard'];
 		$accessop = $this->params['accessobject'];
 		$onepage = $this->params['onepage'];
+		$defaultthumbnailclick = $this->params['settings']->_defaultThumbnailClick ?? 'download';
 
 		$content = '';
 
@@ -3426,14 +3427,15 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				if(is_string($previewhtml))
 					$content .= $previewhtml;
 				else {
-					if($accessop->check_controller_access('Download', array('action'=>'version')))
+					$previewmode = $defaultthumbnailclick == 'viewonline' ? 'ViewOnline' : 'Download';
-						$content .= "<a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."op/op.Download.php?documentid=".$docID."&version=".$version."\">";
+					if($accessop->check_controller_access($previewmode, array('action'=>'version')))
+						$content .= "<a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."op/op.".$previewmode.".php?documentid=".$docID."&version=".$version."\">";
 					if($previewer && $previewer->hasPreview($latestContent)) {
 						$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->params['settings']->_httpRoot."op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 					} else {
 						$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 					}
-					if($accessop->check_controller_access('Download', array('action'=>'version')))
+					if($accessop->check_controller_access($previewmode, array('action'=>'version')))
 						$content .= "</a>";
 				}
 			} else

views/bootstrap/class.Clipboard.php

@@ -111,6 +111,8 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 	 */
 	public function documentClipboardRow($document, $previewer) { /* {{{ */
 		$dms = $this->params['dms'];
+		$accessop = $this->params['accessobject'];
+		$defaultthumbnailclick = $this->params['settings']->_defaultThumbnailClick ?? 'download';
 
 		$content = '';
 		$comment = $document->getComment();
@@ -125,16 +127,22 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 			
 			$content .= $this->documentListRowStart($document);
 
+			$content .= '<td>';
 			if (file_exists($dms->contentDir . $latestContent->getPath())) {
-				$content .= "<td><a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."op/op.Download.php?documentid=".$document->getID()."&version=".$version."\">";
+				$previewmode = $defaultthumbnailclick == 'viewonline' ? 'ViewOnline' : 'Download';
+				if($accessop->check_controller_access($previewmode, array('action'=>'version')))
+					$content .= "<a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."op/op.".$previewmode.".php?documentid=".$document->getID()."&version=".$version."\">";
 				if($previewer->hasPreview($latestContent)) {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"".$this->params['settings']->_httpRoot."op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				} else {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				}
-				$content .= "</a></td>";
+				if($accessop->check_controller_access($previewmode, array('action'=>'version')))
-			} else
+					$content .= "</a>";
-				$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
+			} else {
+				$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+			}
+			$content .= '</td>';
 
 			$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$document->getID()."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
 			/*

views/bootstrap/class.Search.php

@@ -63,6 +63,12 @@ $(document).ready( function() {
 			if(this.checked)
 				values[this.name] = 1;
 		});
+		$('input[name^=\"export_options\"]').each(function() {
+			values[this.name] = this.value;
+		});
+		$('select[name^=\"export_options\"]').each(function() {
+			values[this.name] = this.value;
+		});
 		url += '&'+$.param(values);
 		window.location.href = url;
 	});
@@ -1551,6 +1557,10 @@ $(document).ready(function() {
 					'value'=>1,
 				)
 			);
+			$txt = $this->callHook('searchExportOptions');
+			if(is_string($txt)) {
+				echo $txt;
+			}
 			//$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
 			print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("batch_export"), false, true)."\n";
 			$content = ob_get_clean();

views/bootstrap/class.Settings.php

@@ -647,6 +647,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigText('settings_previewWidthMenuList', 'previewWidthMenuList'); ?>
 <?php $this->showConfigText('settings_previewWidthDropFolderList', 'previewWidthDropFolderList'); ?>
 <?php $this->showConfigText('settings_previewWidthDetail', 'previewWidthDetail'); ?>
+<?php $this->showConfigOption('settings_defaultThumbnailClick', 'defaultThumbnailClick', array('download'=>'settings_defaultThumbnailClick_valdownload', 'viewonline'=>'settings_defaultThumbnailClick_valviewonline'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_showFullPreview', 'showFullPreview'); ?>
 <?php $this->showConfigCheckbox('settings_convertToPdf', 'convertToPdf'); ?>
 <?php $this->showConfigText('settings_maxItemsPerPage', 'maxItemsPerPage'); ?>

views/bootstrap4/class.Bootstrap4.php

@@ -3365,6 +3365,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		$enableClipboard = $this->params['enableclipboard'];
 		$accessop = $this->params['accessobject'];
 		$onepage = $this->params['onepage'];
+		$defaultthumbnailclick = $this->params['settings']->_defaultThumbnailClick ?? 'download';
 
 		$content = '';
 
@@ -3399,14 +3400,15 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				if(is_string($previewhtml))
 					$content .= $previewhtml;
 				else {
-					if($accessop->check_controller_access('Download', array('action'=>'version')))
+					$previewmode = $defaultthumbnailclick == 'viewonline' ? 'ViewOnline' : 'Download';
-						$content .= "<a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."op/op.Download.php?documentid=".$docID."&version=".$version."\">";
+					if($accessop->check_controller_access($previewmode, array('action'=>'version')))
+						$content .= "<a draggable=\"false\" href=\"".$this->params['settings']->_httpRoot."op/op.".$previewmode.".php?documentid=".$docID."&version=".$version."\">";
 					if($previewer && $previewer->hasPreview($latestContent)) {
 						$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->params['settings']->_httpRoot."op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 					} else {
 						$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 					}
-					if($accessop->check_controller_access('Download', array('action'=>'version')))
+					if($accessop->check_controller_access($previewmode, array('action'=>'version')))
 						$content .= "</a>";
 				}
 			} else