diff --git a/CHANGELOG b/CHANGELOG index 91ecae04a..98fc75f5f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 5.1.41 +-------------------------------------------------------------------------------- +- action when clicking on a thumbnail can be set (download or view online) + -------------------------------------------------------------------------------- Changes in version 5.1.40 -------------------------------------------------------------------------------- diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index f6c59003d..d9be038bf 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -320,6 +320,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 @@ -542,6 +544,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"])) @@ -963,6 +966,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); diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 1196f2618..06958e7a7 100644 --- a/languages/ar_EG/lang.inc +++ b/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' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index bd55ca88c..8b579c435 100644 --- a/languages/bg_BG/lang.inc +++ b/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' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 034b38f9f..7a3bccb30 100644 --- a/languages/ca_ES/lang.inc +++ b/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' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 774d75d95..ca4e53628 100644 --- a/languages/cs_CZ/lang.inc +++ b/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' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 9c2f2e6af..25a55a946 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (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.', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index 52bc791b0..bc311077a 100644 --- a/languages/el_GR/lang.inc +++ b/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' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index f458a7943..0b980afd5 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (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.', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index e507bb64a..fad33d0c9 100644 --- a/languages/es_ES/lang.inc +++ b/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' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 7bb5a905f..4f468d0e2 100644 --- a/languages/fr_FR/lang.inc +++ b/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' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 024bb087b..df80ac572 100644 --- a/languages/hr_HR/lang.inc +++ b/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', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 057386e8b..508463b74 100644 --- a/languages/hu_HU/lang.inc +++ b/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' => '', diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc index 9077a2997..2d4fa0e19 100644 --- a/languages/id_ID/lang.inc +++ b/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' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 0ac19b910..4d25fd4c1 100644 --- a/languages/it_IT/lang.inc +++ b/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' => '', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 3342d2fed..93199c404 100644 --- a/languages/ko_KR/lang.inc +++ b/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' => '', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 1b1ed5d16..8adfd0032 100644 --- a/languages/lo_LA/lang.inc +++ b/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' => '', diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc index 8af9fcf26..274b46cff 100644 --- a/languages/nb_NO/lang.inc +++ b/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' => '', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index a927056cf..60f993eab 100644 --- a/languages/nl_NL/lang.inc +++ b/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' => '', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 90bb29747..d1b8849cf 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -1616,6 +1616,10 @@ Name: [username] 'settings_defaultSearchMethod_desc' => 'Domyślna metoda wyszukiwania, gdy wyszukiwanie jest uruchamiane przez formularz wyszukiwania w menu głównym.', 'settings_defaultSearchMethod_valdatabase' => 'baza danych', 'settings_defaultSearchMethod_valfulltext' => 'pełnotekstowe', +'settings_defaultThumbnailClick' => '', +'settings_defaultThumbnailClick_desc' => '', +'settings_defaultThumbnailClick_valdownload' => '', +'settings_defaultThumbnailClick_valviewonline' => '', 'settings_delete_install_folder' => 'Aby móc używać SeedDMS, musisz usunąć plik ENABLE_INSTALL_TOOL znajdujący się w katalogu konfiguracyjnym', 'settings_disableChangePassword' => '', 'settings_disableChangePassword_desc' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 4dcf36d27..cf02e2eef 100644 --- a/languages/pt_BR/lang.inc +++ b/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' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 2e34965ce..875825371 100644 --- a/languages/ro_RO/lang.inc +++ b/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' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index d4e71bb93..68d748b63 100644 --- a/languages/ru_RU/lang.inc +++ b/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' => '', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 005bef052..dac3d748f 100644 --- a/languages/sk_SK/lang.inc +++ b/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' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 9931d2858..3deaf29de 100644 --- a/languages/sv_SE/lang.inc +++ b/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' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index d129dd215..d285d4b71 100644 --- a/languages/tr_TR/lang.inc +++ b/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' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 88800f451..e8b4431ea 100644 --- a/languages/uk_UA/lang.inc +++ b/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' => '', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index df72c6603..7ba0e73ef 100644 --- a/languages/zh_CN/lang.inc +++ b/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' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 30ad3fc27..3a9e80f4e 100644 --- a/languages/zh_TW/lang.inc +++ b/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' => '', diff --git a/op/op.Settings.php b/op/op.Settings.php index 1e199a30d..a2661b858 100644 --- a/op/op.Settings.php +++ b/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'); diff --git a/out/out.Clipboard.php b/out/out.Clipboard.php index 3d5147f1b..cdd77cce7 100644 --- a/out/out.Clipboard.php +++ b/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); diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index b3e875a78..14a2705ef 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -3253,6 +3253,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 = ''; @@ -3287,14 +3288,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'))) - $content .= "params['settings']->_httpRoot."op/op.Download.php?documentid=".$docID."&version=".$version."\">"; + $previewmode = $defaultthumbnailclick == 'viewonline' ? 'ViewOnline' : 'Download'; + if($accessop->check_controller_access($previewmode, array('action'=>'version'))) + $content .= "params['settings']->_httpRoot."op/op.".$previewmode.".php?documentid=".$docID."&version=".$version."\">"; if($previewer && $previewer->hasPreview($latestContent)) { $content .= "params['settings']->_httpRoot."op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { $content .= "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 .= ""; } } else diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php index 7899bb055..38e3e340c 100644 --- a/views/bootstrap/class.Clipboard.php +++ b/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,17 +127,23 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style { $content .= $this->documentListRowStart($document); + $content .= ''; if (file_exists($dms->contentDir . $latestContent->getPath())) { - $content .= "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 .= "params['settings']->_httpRoot."op/op.".$previewmode.".php?documentid=".$document->getID()."&version=".$version."\">"; if($previewer->hasPreview($latestContent)) { $content .= "params['settings']->_httpRoot."op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } - $content .= ""; - } else - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - + if($accessop->check_controller_access($previewmode, array('action'=>'version'))) + $content .= ""; + } else { + $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + } + $content .= ''; + $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . ""; /* if($comment) { diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index eba2a1d64..49f16ae36 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -645,6 +645,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site')); showConfigText('settings_previewWidthMenuList', 'previewWidthMenuList'); ?> showConfigText('settings_previewWidthDropFolderList', 'previewWidthDropFolderList'); ?> showConfigText('settings_previewWidthDetail', 'previewWidthDetail'); ?> +showConfigOption('settings_defaultThumbnailClick', 'defaultThumbnailClick', array('download'=>'settings_defaultThumbnailClick_valdownload', 'viewonline'=>'settings_defaultThumbnailClick_valviewonline'), false, true); ?> showConfigCheckbox('settings_showFullPreview', 'showFullPreview'); ?> showConfigCheckbox('settings_convertToPdf', 'convertToPdf'); ?> showConfigText('settings_maxItemsPerPage', 'maxItemsPerPage'); ?> diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index fe21a22c7..4bea186f6 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -3302,6 +3302,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 = ''; @@ -3336,14 +3337,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'))) - $content .= "params['settings']->_httpRoot."op/op.Download.php?documentid=".$docID."&version=".$version."\">"; + $previewmode = $defaultthumbnailclick == 'viewonline' ? 'ViewOnline' : 'Download'; + if($accessop->check_controller_access($previewmode, array('action'=>'version'))) + $content .= "params['settings']->_httpRoot."op/op.".$previewmode.".php?documentid=".$docID."&version=".$version."\">"; if($previewer && $previewer->hasPreview($latestContent)) { $content .= "params['settings']->_httpRoot."op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { $content .= "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 .= ""; } } else