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

CHANGELOG

@@ -35,12 +35,12 @@
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
 - check for minimum number of attribute values for each attribute type
-- fix selection of imported folder in ImportFS
+- fix selection of imported folder in ImportFS, add it to the admin tools
 - file from drop folder can be removed after successful upload
 - remove preview images when document or document content is removed (Closes #262)
 - add clear cache operation in admin tools
 - fix strict standard error in SeedDMS_Lucene (Closes #263)
-- fix sql statements, because the didn't work for mysql 5.7.5 anymore (Closes #273)
+- fix some sql statements, because they didn't work for mysql 5.7.5 anymore (Closes #273)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26

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();

SeedDMS_Lucene/package.xml

@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 pass variables to stream_select() to fullfill strict standards.
+make all functions in Indexer.php static
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

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;
+		}
 
 	} /* }}} */
 }

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()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

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' => 'رفع سريع',
@@ -506,6 +507,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
@@ -525,6 +527,7 @@ URL: [url]',
 'invalid_create_date_end' => 'تاريخ نهائي خاطىء لانشاء مدى تاريخي',
 'invalid_create_date_start' => 'تاريخ ابتدائي خاطيء لانشاء مدى تاريخي',
 'invalid_doc_id' => 'معرف مستند خاطىء',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'معرف ملف خاطىء',

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' => '',
@@ -437,6 +438,7 @@ $text = array(
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
@@ -456,6 +458,7 @@ $text = array(
 'invalid_create_date_end' => 'Неправилна крайна дата за диапазаона на датата на създаване',
 'invalid_create_date_start' => 'Неправилна начална дата за диапазаона на датата на създаване',
 'invalid_doc_id' => 'Неправилен идентификатор на документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Неправилен идентификатор на файла',

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',
@@ -442,6 +443,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
@@ -461,6 +463,7 @@ URL: [url]',
 'invalid_create_date_end' => 'La data de final no és vàlida per a la creació de rangs de dates.',
 'invalid_create_date_start' => 'La data d\'inici no és vàlida per a la creació de rangs de dates.',
 'invalid_doc_id' => 'ID de document no vàlid',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fitxer no vàlid',

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',
@@ -513,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
@@ -532,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Neplatné koncové datum vytvoření.',
 'invalid_create_date_start' => 'Neplatné počáteční datum vytvoření.',
 'invalid_doc_id' => 'Neplatný ID dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nevalidní ID souboru',

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 (2241), 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',
@@ -518,6 +519,7 @@ URL: [url]',
 'import' => 'Importiere',
 'importfs' => 'Importiere aus Dateisystem',
 'import_fs' => 'Aus Dateisystem importieren',
+'import_fs_warning' => 'Der Import kann nur für Ordner im Ablageordner erfolgen. Alle Ordner und Dateien werden rekursiv importiert. Dateien werden sofort freigegeben.',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
@@ -537,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Unzulässiges Erstellungsenddatum.',
 'invalid_create_date_start' => 'Unzulässiges Erstellungsstartdatum.',
 'invalid_doc_id' => 'Unzulässige Dokumentenidentifikation',
+'invalid_dropfolder_folder' => 'Ungültiger Ordner im Ablageordner',
 'invalid_expiration_date_end' => 'Unzulässiges Ablaufenddatum.',
 'invalid_expiration_date_start' => 'Unzulässiges Ablaufstartdatum.',
 'invalid_file_id' => 'Ungültige Datei-ID',

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 (1391), 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',
@@ -518,6 +519,7 @@ URL: [url]',
 'import' => 'Import',
 'importfs' => 'Import from Filesystem',
 'import_fs' => 'Import from filesystem',
+'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@@ -537,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Invalid end date for creation date range.',
 'invalid_create_date_start' => 'Invalid start date for creation date range.',
 'invalid_doc_id' => 'Invalid Document ID',
+'invalid_dropfolder_folder' => 'Invalid folder in drop folder',
 'invalid_expiration_date_end' => 'Invalid end date for expiration date range.',
 'invalid_expiration_date_start' => 'Invalid start date for expiration date range.',
 'invalid_file_id' => 'Invalid file ID',

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',
@@ -513,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
@@ -532,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Fecha de fin no válida para creación de rango de fechas.',
 'invalid_create_date_start' => 'Fecha de inicio no válida para creación de rango de fechas.',
 'invalid_doc_id' => 'ID de documento no válido',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fichero no válido',

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',
@@ -513,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
@@ -532,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Date de fin invalide pour la plage de dates de création.',
 'invalid_create_date_start' => 'Date de début invalide pour la plage de dates de création.',
 'invalid_doc_id' => 'Identifiant de document invalide',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Identifiant de fichier invalide',

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',
@@ -518,6 +519,7 @@ Internet poveznica: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
@@ -537,6 +539,7 @@ Internet poveznica: [url]',
 'invalid_create_date_end' => 'Pogrešan krajnji datum za izradu vremenskog raspona.',
 'invalid_create_date_start' => 'Pogrešan početni datum za izradu vremenskog raspona.',
 'invalid_doc_id' => 'Pogrešan ID dokumenta',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Neispravan datum isteka za datumski raspon isteka.',
 'invalid_expiration_date_start' => 'Neispravan početni datum za datumski raspon isteka.',
 'invalid_file_id' => 'Pogrešan ID datoteke',

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',
@@ -513,6 +514,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
@@ -532,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Érvénytelen befejezési dátum a létrehozási dátum tartományban.',
 'invalid_create_date_start' => 'Érvénytelen kezdési dátum a létrehozási dátum tartományban.',
 'invalid_doc_id' => 'Érvénytelen dokumentum azonosító',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Érvénytelen állomány azonosító',

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',
@@ -519,6 +520,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
@@ -538,6 +540,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale',
 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale',
 'invalid_doc_id' => 'ID del documento non valido',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID del file non valido',

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' => '빠른 업로드',
@@ -518,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '서브 디렉토리를 포함',
@@ -537,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => '작성 날짜 범위에 대한 잘못된 종료 날짜.',
 'invalid_create_date_start' => '작성 날짜 범위에 대한 잘못된 시작 날짜.',
 'invalid_doc_id' => '잘못된 문서 ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '잘못된 유효 기간 종료',
 'invalid_expiration_date_start' => '잘못된 유효 기간 시작',
 'invalid_file_id' => '잘못된 파일 ID',

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',
@@ -511,6 +512,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
@@ -530,6 +532,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Foutieve eind-datum voor het maken van een periode.',
 'invalid_create_date_start' => 'Foutieve begin-datum voor het maken van een periode.',
 'invalid_doc_id' => 'Foutief Document ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Foute expiratiedatum',
 'invalid_expiration_date_start' => 'Foute startdatum',
 'invalid_file_id' => 'Foutief Bestand ID',
@@ -1187,7 +1190,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)',

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',
@@ -506,6 +507,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
@@ -525,6 +527,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Nieprawidłowa data końcowa dla tworzenia przedziału czasowego.',
 'invalid_create_date_start' => 'Nieprawidłowa data początkowa dla tworzenia przedziału czasowego.',
 'invalid_doc_id' => 'Nieprawidłowy identyfikator dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nieprawidłowy identyfikator pliku',
@@ -887,8 +890,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',

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',
@@ -512,6 +513,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@@ -531,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Invalid end date for creation date range.',
 'invalid_create_date_start' => 'Invalid start date for creation date range.',
 'invalid_doc_id' => 'ID de documento inválida',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Invalid file ID',

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ă',
@@ -518,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
@@ -537,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Dată de încheiere invalidă pentru crearea intervalului de date.',
 'invalid_create_date_start' => 'Dată de începere invalidă pentru crearea intervalului de date.',
 'invalid_doc_id' => 'ID Document invalid',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID fisier invalid',
@@ -1362,7 +1365,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',

languages/ru_RU/lang.inc

@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => '<b>Черновик</b> — ожидает утверждения',
 'draft_pending_review' => '<b>Черновик</b> — ожидает рецензии',
 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл из проходного каталога',
 'dropfolder_folder' => '',
 'dropupload' => 'Быстрая загрузка',
@@ -518,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
@@ -537,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Неверная конечная дата диапазона даты создания',
 'invalid_create_date_start' => 'Неверная начальная дата диапазона даты создания',
 'invalid_doc_id' => 'Неверный идентификатор документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Неверная конечная дата для диапазона срока исполнения.',
 'invalid_expiration_date_start' => 'Неверная начальная дата для диапазона срока исполнения.',
 'invalid_file_id' => 'Неверный идентификатор файла',

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',
@@ -441,6 +442,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
@@ -460,6 +462,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Neplatný koncový dátum vytvorenia.',
 'invalid_create_date_start' => 'Neplatný počiatočný dátum vytvorenia.',
 'invalid_doc_id' => 'Neplatný ID dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nesprávne ID súboru',

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',
@@ -506,6 +507,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
@@ -525,6 +527,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Ogiltigt slutdatum för intervall.',
 'invalid_create_date_start' => 'Ogiltigt startdatum för intervall.',
 'invalid_doc_id' => 'Ogiltigt dokument-ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Ogiltigt fil-ID',

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',
@@ -512,6 +513,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
@@ -531,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Oluşturma tarih aralığı için geçersiz bitiş tarihi.',
 'invalid_create_date_start' => 'Oluşturma tarih aralığı için geçersiz başlangıç tarihi.',
 'invalid_doc_id' => 'Geçersiz Doküman ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Geçersiz dosya ID',

languages/uk_UA/lang.inc

@@ -374,6 +374,7 @@ URL: [url]',
 'draft_pending_approval' => '<b>Чернетка</b> — Очікує на затвердження',
 'draft_pending_review' => '<b>Чернетка</b> — Очікує на рецензію',
 'drag_icon_here' => 'Перетягніть сюди значок документа чи каталогу',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл з прохідного каталогу',
 'dropfolder_folder' => '',
 'dropupload' => 'Швидке завантаження',
@@ -518,6 +519,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
@@ -537,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Невірна кінцева дата діапазону дати створення',
 'invalid_create_date_start' => 'Невірна початкова дата діапазону дати створення',
 'invalid_doc_id' => 'Невірний ідентифікатор документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Невірна кінцева дата діапазону терміна виконання.',
 'invalid_expiration_date_start' => 'Невірна початкова дата діапазону терміна виконання.',
 'invalid_file_id' => 'Невірний ідентифікатор файлу',

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' => '快速上传',
@@ -443,6 +444,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
@@ -462,6 +464,7 @@ URL: [url]',
 'invalid_create_date_end' => '无效截止日期,不在创建日期范围内',
 'invalid_create_date_start' => '无效开始日期,不在创建日期范围内',
 'invalid_doc_id' => '无效文档ID号',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => '无效文件ID号',

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' => '快速上傳',
@@ -441,6 +442,7 @@ URL: [url]',
 'import' => '',
 'importfs' => '',
 'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',
@@ -460,6 +462,7 @@ URL: [url]',
 'invalid_create_date_end' => '無效截止日期,不在創建日期範圍內',
 'invalid_create_date_start' => '無效開始日期,不在創建日期範圍內',
 'invalid_doc_id' => '無效文檔ID號',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => '無效檔ID號',

op/op.ImportFS.php

@@ -25,7 +25,7 @@ if (empty($_GET["dropfolderfileform1"])) {
 }
 $dirname = $settings->_dropFolderDir.'/'.$user->getLogin()."/".$_GET["dropfolderfileform1"];
 if(!is_dir($dirname)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("invalid_target_folder"));
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_dropfolder_folder"));
 }
 
 function import_folder($dirname, $folder) { /* {{{ */

views/bootstrap/class.Bootstrap.php

@@ -629,6 +629,7 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("misc")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		echo "      <li><a href=\"../out/out.ImportFS.php\">".getMLText("import_fs")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Statistic.php\">".getMLText("folders_and_documents_statistic")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
@@ -1175,13 +1176,13 @@ $('#acceptkeywords').click(function(ev) {
 		print "<div class=\"input-append\">\n";
 		print "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
 		print "<button type=\"button\" class=\"btn\" id=\"clearFilename".$formName."\"><i class=\"icon-remove\"></i></button>";
-		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("choose_target_file")."…</a>\n";
+		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		print "</div>\n";
 ?>
 <div class="modal hide" id="dropfolderChooser" tabindex="-1" role="dialog" aria-labelledby="dropfolderChooserLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="dropfolderChooserLabel"><?php printMLText("choose_target_file") ?></h3>
+    <h3 id="dropfolderChooserLabel"><?php echo ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")) ?></h3>
   </div>
   <div class="modal-body">
 		<p><?php printMLText('files_loading') ?></p>

views/bootstrap/class.DropFolderChooser.php

@@ -78,15 +78,15 @@ $('.folderselect').click(function(ev) {
 				$finfo = finfo_open(FILEINFO_MIME_TYPE);
 				while (false !== ($entry = $d->read())) {
 					if($entry != '..' && $entry != '.') {
-						if(!is_dir($dir.'/'.$entry)) {
+						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
 							$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 							echo "<tr><td style=\"min-width: ".$previewwidth."px;\">";
 							if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-								echo "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
+								echo "<img style=\"cursor: pointer;\" class=\"fileselect mimeicon\" filename=\"".$entry."\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
 							}
 							echo "</td><td><span style=\"cursor: pointer;\" class=\"fileselect\" filename=\"".$entry."\">".$entry."</span></td><td align=\"right\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."</td><td>".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</td></tr>\n";
-						} elseif($showfolders) {
+						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
 							echo "<tr>";
 							echo "<td></td>";
 							echo "<td><span style=\"cursor: pointer;\" class=\"folderselect\" foldername=\"".$entry."\" >".$entry."</span></td><td align=\"right\"></td><td></td>";

views/bootstrap/class.ImportFS.php

@@ -49,13 +49,16 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("import_fs"));
-		$this->contentContainerStart();
 
-		print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
-		print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
-		$this->printFolderChooserHtml("form1",M_READWRITE);
-		print "</div></div>";
-		if($dropfolderdir) {
+		if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
+			echo "<div class=\"alert alert-warning\">";
+			printMLText("import_fs_warning");
+			echo "</div>\n";
+			$this->contentContainerStart();
+			print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
+			print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
+			$this->printFolderChooserHtml("form1",M_READWRITE);
+			print "</div></div>";
 			print "<div class=\"control-group\"><label class=\"control-label\">";
 			printMLText("dropfolder_folder");
 			echo ": ";
@@ -63,14 +66,18 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 			/* Setting drop folder dir to "" will force to take the default from settings.xml */
 			$this->printDropFolderChooserHtml("form1", "", 1);
 			print "</div></div>";
+			print "<div class=\"control-group\"><label class=\"control-label\">";
+			print "</label><div class=\"controls\">";
+			print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/><br />";
+			print "</div></div>";
+			print "</form>\n";
+			$this->contentContainerEnd();
+		} else {
+			echo "<div class=\"alert alert-warning\">";
+			printMLText("dropfolderdir_missing");
+			echo "</div>\n";
 		}
-		print "<div class=\"control-group\"><label class=\"control-label\">";
-		print "</label><div class=\"controls\">";
-		print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/><br />";
-		print "</div></div>";
-		print "</form>\n";
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */