From 7dcee81c511bac020b997e151dba2f20c4fef2da Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 5 Jul 2016 17:29:58 +0200 Subject: [PATCH 01/15] make all functions static --- SeedDMS_Lucene/Lucene/Indexer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Lucene/Lucene/Indexer.php b/SeedDMS_Lucene/Lucene/Indexer.php index 95df5ca71..58b7204eb 100644 --- a/SeedDMS_Lucene/Lucene/Indexer.php +++ b/SeedDMS_Lucene/Lucene/Indexer.php @@ -38,7 +38,7 @@ class SeedDMS_Lucene_Indexer { } } /* }}} */ - function create($luceneDir) { /* {{{ */ + static function create($luceneDir) { /* {{{ */ $index = Zend_Search_Lucene::create($luceneDir); return($index); } /* }}} */ @@ -47,7 +47,7 @@ class SeedDMS_Lucene_Indexer { * Do some initialization * */ - function init($stopWordsFile='') { /* {{{ */ + static function init($stopWordsFile='') { /* {{{ */ $analyzer = new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive(); if($stopWordsFile && file_exists($stopWordsFile)) { $stopWordsFilter = new Zend_Search_Lucene_Analysis_TokenFilter_StopWords(); From e5f8144268967df5fb775b92e431324fa9e2e39e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 5 Jul 2016 17:31:25 +0200 Subject: [PATCH 02/15] make all functions static --- SeedDMS_Lucene/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml index dc9fc8a20..3f5e3d45c 100644 --- a/SeedDMS_Lucene/package.xml +++ b/SeedDMS_Lucene/package.xml @@ -24,6 +24,7 @@ GPL License pass variables to stream_select() to fullfill strict standards. +make all functions in Indexer.php static From 58182119db3f1662bddb1815d064c1bba0d63371 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 6 Jul 2016 08:25:27 +0200 Subject: [PATCH 03/15] add new key dropfolderdir_missing, add ro translation --- languages/ar_EG/lang.inc | 1 + languages/bg_BG/lang.inc | 1 + languages/ca_ES/lang.inc | 1 + languages/cs_CZ/lang.inc | 1 + languages/de_DE/lang.inc | 3 ++- languages/en_GB/lang.inc | 3 ++- languages/es_ES/lang.inc | 1 + languages/fr_FR/lang.inc | 1 + languages/hr_HR/lang.inc | 5 +++-- languages/hu_HU/lang.inc | 1 + languages/it_IT/lang.inc | 1 + languages/ko_KR/lang.inc | 1 + languages/nl_NL/lang.inc | 7 ++++--- languages/pl_PL/lang.inc | 7 ++++--- languages/pt_BR/lang.inc | 1 + languages/ro_RO/lang.inc | 5 +++-- languages/ru_RU/lang.inc | 1 + languages/sk_SK/lang.inc | 1 + languages/sv_SE/lang.inc | 5 +++-- languages/tr_TR/lang.inc | 1 + languages/uk_UA/lang.inc | 1 + languages/zh_CN/lang.inc | 1 + languages/zh_TW/lang.inc | 1 + 23 files changed, 37 insertions(+), 14 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index b9cc9688a..1a960363c 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -362,6 +362,7 @@ URL: [url]', 'draft_pending_approval' => 'مسودة - قيد الموافقة', 'draft_pending_review' => 'مسودة - قيد المراجعة', 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'ملف من مجلد التجميع', 'dropfolder_folder' => '', 'dropupload' => 'رفع سريع', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 15aad9dde..885eb4d25 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -317,6 +317,7 @@ $text = array( 'draft_pending_approval' => 'Чернова - очаква утвърждаване', 'draft_pending_review' => 'Чернова - очаква рецензия', 'drag_icon_here' => 'Провлачи икона или папка, или документ ТУК!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл от drop папка', 'dropfolder_folder' => '', 'dropupload' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 9ce73354a..32a028106 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -322,6 +322,7 @@ URL: [url]', 'draft_pending_approval' => 'Esborrany - pendent d\'aprovació', 'draft_pending_review' => 'Esborrany - pendent de revisió', 'drag_icon_here' => 'Arrossegui aquí una icona de carpeta o document', +'dropfolderdir_missing' => '', 'dropfolder_file' => '', 'dropfolder_folder' => '', 'dropupload' => 'Pujada ràpida', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index be3e86302..3f5133237 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -369,6 +369,7 @@ URL: [url]', 'draft_pending_approval' => 'Návrh - čeká na schválení', 'draft_pending_review' => 'Návrh - čeká na kontrolu', 'drag_icon_here' => 'Přetáhnout ikonu složky nebo dokumentu sem!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Soubor z "přetažené" složky', 'dropfolder_folder' => '', 'dropupload' => 'Rychlý upload', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 3a4a8e446..0ae2ded9a 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 (2238), dgrutsch (21) +// Translators: Admin (2239), dgrutsch (21) $text = array( 'accept' => 'Übernehmen', @@ -374,6 +374,7 @@ URL: [url]', 'draft_pending_approval' => 'Entwurf - bevorstehende Freigabe', 'draft_pending_review' => 'Entwurf - bevorstehende Prüfung', 'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!', +'dropfolderdir_missing' => 'Ihr persönlicher Ablageordner auf dem Server existiert nicht! Kontaktieren Sie den Administrator, um in anlegen zu lassen.', 'dropfolder_file' => 'Datei aus Ablageordner', 'dropfolder_folder' => 'Ordner aus Ablageordner', 'dropupload' => 'Direkt Hochladen', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 16ebb1bca..a22f2b792 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 (1387), dgrutsch (7), netixw (14) +// Translators: Admin (1388), dgrutsch (7), netixw (14) $text = array( 'accept' => 'Accept', @@ -374,6 +374,7 @@ URL: [url]', 'draft_pending_approval' => 'Draft - pending approval', 'draft_pending_review' => 'Draft - pending review', 'drag_icon_here' => 'Drag icon of folder or document here!', +'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.', 'dropfolder_file' => 'File from drop folder', 'dropfolder_folder' => 'Folder from drop folder', 'dropupload' => 'Fast upload', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 90fc96018..30f41f8fd 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -369,6 +369,7 @@ URL: [url]', 'draft_pending_approval' => 'Borador - pendiente de aprobación', 'draft_pending_review' => 'Borrador - pendiente de revisión', 'drag_icon_here' => 'Arrastre carpeta o documento aquí!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fichero de la carpeta destino', 'dropfolder_folder' => '', 'dropupload' => 'Carga Rapida', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 1b5ee6fdd..00ac3e297 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -369,6 +369,7 @@ URL: [url]', 'draft_pending_approval' => 'Ebauche - En cours d\'approbation', 'draft_pending_review' => 'Ebauche - En cours de correction', 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fichier du dossier déposé', 'dropfolder_folder' => '', 'dropupload' => 'Téléchargement rapide', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index a7a34766b..bbdbd9581 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/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 (1186), marbanas (16) +// Translators: Admin (1187), marbanas (16) $text = array( 'accept' => 'Prihvati', @@ -233,7 +233,7 @@ Internet poveznica: [url]', 'choose_workflow_action' => 'Odaberite radnju toka rada', 'choose_workflow_state' => 'Odaberite status toka rada', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'Obriši keš', 'clear_clipboard' => 'Očistite međuspremnik', 'clear_password' => '', 'clipboard' => 'Međuspremnik', @@ -374,6 +374,7 @@ Internet poveznica: [url]', 'draft_pending_approval' => 'Skica - čeka odobrenje', 'draft_pending_review' => 'Skica - čeka pregled', 'drag_icon_here' => 'Ovdje povuci ikonu mape ili dokumenta!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Datoteka iz padajuće mape', 'dropfolder_folder' => '', 'dropupload' => 'Zona za brzo učitavanje', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 60529dc1e..9f6048b00 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -369,6 +369,7 @@ URL: [url]', 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban', 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban', 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Állomány a dropfolder-ből', 'dropfolder_folder' => '', 'dropupload' => 'Gyors feltöltés', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 2b1b5215e..162ea1503 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -375,6 +375,7 @@ URL: [url]', 'draft_pending_approval' => 'Bozza - in approvazione', 'draft_pending_review' => 'Bozza - in revisione', 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Scegli file dal server', 'dropfolder_folder' => '', 'dropupload' => 'Caricamento Rapido', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index e8f4d8159..3ab064bcc 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -374,6 +374,7 @@ URL: [url]', 'draft_pending_approval' => '초안 - 보류 승인', 'draft_pending_review' => '초안 - 검토 대기', 'drag_icon_here' => '여기에 폴더 나 문서의 아이콘을 끌어!', +'dropfolderdir_missing' => '', 'dropfolder_file' => '드롭 폴더 파일', 'dropfolder_folder' => '', 'dropupload' => '빠른 업로드', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index aac99f067..909afaeab 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (716), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (718), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( 'accept' => 'Accept', @@ -226,7 +226,7 @@ URL: [url]', 'choose_workflow_action' => 'Kies workflow actie', 'choose_workflow_state' => 'kiest workflowstatus', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'Cache leegmaken', 'clear_clipboard' => 'Vrijgeven klembord', 'clear_password' => '', 'clipboard' => 'Klembord', @@ -367,6 +367,7 @@ URL: [url]', 'draft_pending_approval' => 'Draft - in afwachting van goedkeuring', 'draft_pending_review' => 'Draft - in afwachting van controle', 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Bestand van dropfolder', 'dropfolder_folder' => '', 'dropupload' => 'Snel toevoegen', @@ -1187,7 +1188,7 @@ URL: [url]', 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina', 'settings_quota' => 'Gebruikersquotum', 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.', -'settings_removeFromDropFolder' => '', +'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload', 'settings_removeFromDropFolder_desc' => '', 'settings_restricted' => 'Beperkte toegang', 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 47d541e24..1557ddf09 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/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 (735), netixw (84), romi (93), uGn (112) +// Translators: Admin (737), netixw (84), romi (93), uGn (112) $text = array( 'accept' => 'Akceptuj', @@ -362,6 +362,7 @@ URL: [url]', 'draft_pending_approval' => 'Szkic - w oczekiwaniu na akceptację', 'draft_pending_review' => 'Szkic - w oczekiwaniu na opinię', 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Plik z folderu rozwijanego', 'dropfolder_folder' => '', 'dropupload' => 'Szybki upload', @@ -887,8 +888,8 @@ URL: [url]', 'search_fulltext' => 'Przeszukaj całe teksty', 'search_in' => 'Szukaj w', 'search_mode_and' => 'wszystkie słowa', -'search_mode_documents' => '', -'search_mode_folders' => '', +'search_mode_documents' => 'Tylko dokumenty', +'search_mode_folders' => 'Tylko foldery', 'search_mode_or' => 'conajmnej jedno słowo', 'search_no_results' => 'Nie znaleziono dokumentów spełniających kryteria wyszukiwania.', 'search_query' => 'Wyszukaj', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index e92a70a5a..fae71e0ee 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -368,6 +368,7 @@ URL: [url]', 'draft_pending_approval' => 'Rascunho - Aprovação pendente', 'draft_pending_review' => 'Draft - pending review', 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Arquivo de pasta suspensa', 'dropfolder_folder' => '', 'dropupload' => 'Upload rápido', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 7b66c04f4..b7f3ca039 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/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 (1042), balan (87) +// Translators: Admin (1043), balan (87) $text = array( 'accept' => 'Accept', @@ -374,6 +374,7 @@ URL: [url]', 'draft_pending_approval' => 'Proiect - în așteptarea aprobarii', 'draft_pending_review' => 'Proiect - în așteptarea revizuirii', 'drag_icon_here' => 'Trageți iconul de folder sau document aici!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fișiere din folderele aruncate (File from drop folder)', 'dropfolder_folder' => '', 'dropupload' => 'Încărcare rapidă', @@ -1362,7 +1363,7 @@ URL: [url]', 'timeline_skip_status_change_1' => 'așteaptă aprobare', 'timeline_skip_status_change_2' => '', 'timeline_skip_status_change_3' => 'în proces', -'timeline_status_change' => '', +'timeline_status_change' => 'Versiune [versiune]: [stare]', 'to' => 'La', 'toggle_manager' => 'Comută Manager', 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 3829eaca4..e94cf19b7 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -374,6 +374,7 @@ URL: [url]', 'draft_pending_approval' => 'Черновик — ожидает утверждения', 'draft_pending_review' => 'Черновик — ожидает рецензии', 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл из проходного каталога', 'dropfolder_folder' => '', 'dropupload' => 'Быстрая загрузка', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index a5de71d7c..72c48c312 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -321,6 +321,7 @@ URL: [url]', 'draft_pending_approval' => 'Návrh - čaká na schválenie', 'draft_pending_review' => 'Návrh - čaká na kontrolu', 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument', +'dropfolderdir_missing' => '', 'dropfolder_file' => '', 'dropfolder_folder' => '', 'dropupload' => 'Rýchlo nahraj', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 5177e9209..fcdd1a63c 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/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 (1128), tmichelfelder (106) +// Translators: Admin (1129), tmichelfelder (106) $text = array( 'accept' => 'Godkänn', @@ -221,7 +221,7 @@ URL: [url]', 'choose_workflow_action' => 'Välj åtgärd för arbetsflödet', 'choose_workflow_state' => 'Välj status för arbetsflödet', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'Rensa cache', 'clear_clipboard' => 'Rensa urklipp', 'clear_password' => '', 'clipboard' => 'Urklipp', @@ -362,6 +362,7 @@ URL: [url]', 'draft_pending_approval' => 'Utkast: väntar på godkännande', 'draft_pending_review' => 'Utkast: väntar på granskning', 'drag_icon_here' => 'Dra ikon av mappen eller dokument hit!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Fil från mellanlagrings-mappen', 'dropfolder_folder' => '', 'dropupload' => 'Snabb uppladdning', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 90a8db147..2a3d1d377 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -368,6 +368,7 @@ URL: [url]', 'draft_pending_approval' => 'Taslak - onay bekliyor', 'draft_pending_review' => 'Taslak - kontrol bekliyor', 'drag_icon_here' => 'Klasör veya dokümanın ikonunu buraya sürükleyin!', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Sürüklenen klasörden dosya', 'dropfolder_folder' => '', 'dropupload' => 'Hızlı yükleme', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 8a3d77743..d8e50e361 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -374,6 +374,7 @@ URL: [url]', 'draft_pending_approval' => 'Чернетка — Очікує на затвердження', 'draft_pending_review' => 'Чернетка — Очікує на рецензію', 'drag_icon_here' => 'Перетягніть сюди значок документа чи каталогу', +'dropfolderdir_missing' => '', 'dropfolder_file' => 'Файл з прохідного каталогу', 'dropfolder_folder' => '', 'dropupload' => 'Швидке завантаження', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 3d852b13d..82b8c4fcd 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -323,6 +323,7 @@ URL: [url]', 'draft_pending_approval' => '待审核', 'draft_pending_review' => '待校对', 'drag_icon_here' => '拖动图标到这里', +'dropfolderdir_missing' => '', 'dropfolder_file' => '所选文件夹的文件', 'dropfolder_folder' => '', 'dropupload' => '快速上传', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 9ee761a87..8ab3dbcad 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -321,6 +321,7 @@ URL: [url]', 'draft_pending_approval' => '待審核', 'draft_pending_review' => '待校對', 'drag_icon_here' => '拖動圖示到這裡', +'dropfolderdir_missing' => '', 'dropfolder_file' => '檔案來源為 drop 目錄', 'dropfolder_folder' => '', 'dropupload' => '快速上傳', From 4b0787147f17e58733256451f6b91116ea2a6f4e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 6 Jul 2016 09:00:56 +0200 Subject: [PATCH 04/15] check if cache dir exists before deleting it --- SeedDMS_Preview/Preview/Previewer.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php index 6a466adbe..51f2bbdd1 100644 --- a/SeedDMS_Preview/Preview/Previewer.php +++ b/SeedDMS_Preview/Preview/Previewer.php @@ -383,7 +383,11 @@ class SeedDMS_Preview_Previewer { return false; $dir = $this->previewDir.'/'.$document->getDir(); - return SeedDMS_Preview_Previewer::recurseRmdir($dir); + if(file_exists($dir) && is_dir($dir)) { + return SeedDMS_Preview_Previewer::recurseRmdir($dir); + } else { + return false; + } } /* }}} */ } From 54c295276ba7d3bb93edf6b9b5409e5181a00192 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 6 Jul 2016 09:02:16 +0200 Subject: [PATCH 05/15] add note --- SeedDMS_Preview/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml index a712b517b..681e952bf 100644 --- a/SeedDMS_Preview/package.xml +++ b/SeedDMS_Preview/package.xml @@ -27,6 +27,7 @@ add more documentation finish deletePreview() add new method deleteDocumentPreviews() fix calculation of timeout (Bug #269) +check if cache dir exists before deleting it in deleteDocumentPreviews() From f8a6b7e59939e5db0b75731bc954e345e063a9b1 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 6 Jul 2016 09:03:14 +0200 Subject: [PATCH 06/15] distinguish between files and folders in printDropFolderChooser() if $showfolders is set, only folders will be shown --- views/bootstrap/class.Bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index ff5897f2c..cbb502d8a 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1112,13 +1112,13 @@ $('#acceptkeywords').click(function(ev) { print "
\n"; print ""; print ""; - print "".getMLText("choose_target_file")."…\n"; + print "".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…\n"; print "
\n"; ?>