gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2022-08-19 15:01:04 +02:00
commit 3a9abc5009
29 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
languages/ar_EG/lang.inc
View File

@ -624,6 +624,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'حجم الملف',
'filter_for_documents' => 'فلتر للمستندات',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'فلتر للملفات',
'folder' => 'مجلد',
'folders' => 'مجلدات',

1
languages/bg_BG/lang.inc
View File

@ -573,6 +573,7 @@ $text = array(
'filetype' => '',
'file_size' => 'Размер',
'filter_for_documents' => '',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => '',
'folder' => 'Папка',
'folders' => 'Папки',

1
languages/ca_ES/lang.inc
View File

@ -578,6 +578,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Mida',
'filter_for_documents' => '',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filtre adicional per les carpetes',
'folder' => 'Carpeta',
'folders' => 'Carpetes',

1
languages/cs_CZ/lang.inc
View File

@ -648,6 +648,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Velikost souboru',
'filter_for_documents' => 'Další filtr pro dokumenty',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Další filtr pro složky',
'folder' => 'Složka',
'folders' => 'Složky',

3
languages/de_DE/lang.inc
View File

@ -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 (3118), dgrutsch (22)
// Translators: Admin (3119), dgrutsch (22)
$text = array(
'2_factor_auth' => '2-Faktor Authentifizierung',
@ -755,6 +755,7 @@ URL: [url]</p>',
'filetype' => 'Dateityp',
'file_size' => 'Dateigröße',
'filter_for_documents' => 'Zusätzliche Filter für Dokumente',
'filter_for_documents_and_folders' => 'Zusätzliche Filter für Ordner und Dokumente',
'filter_for_folders' => 'Zusätzliche Filter für Ordner',
'folder' => 'Ordner',
'folders' => 'Verzeichnisse',

1
languages/el_GR/lang.inc
View File

@ -573,6 +573,7 @@ $text = array(
'filetype' => '',
'file_size' => 'Μέγεθος αρχείου',
'filter_for_documents' => '',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => '',
'folder' => 'Φάκελος',
'folders' => 'Φάκελοι',

3
languages/en_GB/lang.inc
View File

@ -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 (2212), archonwang (3), dgrutsch (9), netixw (14)
// Translators: Admin (2213), archonwang (3), dgrutsch (9), netixw (14)
$text = array(
'2_factor_auth' => '2-factor authentication',
@ -755,6 +755,7 @@ URL: [url]</p>',
'filetype' => 'File type',
'file_size' => 'Filesize',
'filter_for_documents' => 'Additional filter for documents',
'filter_for_documents_and_folders' => 'Additional filter for folder and documents',
'filter_for_folders' => 'Additional filter for folders',
'folder' => 'Folder',
'folders' => 'Folders',

1
languages/es_ES/lang.inc
View File

@ -637,6 +637,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Tamaño',
'filter_for_documents' => 'Filtro adicional para documentos',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filtro adicional para carpetas',
'folder' => 'Carpeta',
'folders' => 'Carpetas',

1
languages/fr_FR/lang.inc
View File

@ -741,6 +741,7 @@ URL : [url]</p>',
'filetype' => 'Type de fichier',
'file_size' => 'Taille',
'filter_for_documents' => 'Filtre additionnel pour les documents',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filtre additionnel pour les dossiers',
'folder' => 'Dossier',
'folders' => 'Dossiers',

1
languages/hr_HR/lang.inc
View File

@ -636,6 +636,7 @@ Internet poveznica: [url]',
'filetype' => '',
'file_size' => 'Veličina datoteke',
'filter_for_documents' => 'Dodatni filter za dokumente',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Dodatni filter za dokumente',
'folder' => 'Mapa',
'folders' => 'Mape',

1
languages/hu_HU/lang.inc
View File

@ -631,6 +631,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Állomány méret',
'filter_for_documents' => 'További dokumentum szűrők',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'További mappa szűrők',
'folder' => 'Mappa',
'folders' => 'Mappák',

1
languages/id_ID/lang.inc
View File

@ -676,6 +676,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Ukuran berkas',
'filter_for_documents' => '',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filter tambahan untuk folder',
'folder' => '',
'folders' => 'Folder',

1
languages/it_IT/lang.inc
View File

@ -641,6 +641,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Grandezza del file',
'filter_for_documents' => 'Filtro aggiuntivo per i documenti',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filtro aggiuntivo per le cartelle',
'folder' => 'Cartella',
'folders' => 'Cartelle',

1
languages/ko_KR/lang.inc
View File

@ -637,6 +637,7 @@ URL: [url]',
'filetype' => '',
'file_size' => '파일 크기',
'filter_for_documents' => '문서에 대한 추가 필터',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => '폴더에 대한 추가 필터',
'folder' => '폴더',
'folders' => '폴더',

1
languages/lo_LA/lang.inc
View File

@ -634,6 +634,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'ຂະໜາດ',
'filter_for_documents' => 'ຕົວກອງເພີ່ມເຕົມສຳລັບເອກະສານ',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'ຕົວກອງເພີ່ມເຕີມສຳລັບໂຟລເດີ',
'folder' => 'ໂຟລເດີ',
'folders' => 'ໂຟລເດີ',

1
languages/nb_NO/lang.inc
View File

@ -648,6 +648,7 @@ URL: [url]',
'filetype' => 'Filtype',
'file_size' => 'Filstørrelse',
'filter_for_documents' => 'Tilleggsfilter for dokumentet',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Tilleggsfilter for mapper',
'folder' => 'Mappe',
'folders' => 'Mapper',

1
languages/nl_NL/lang.inc
View File

@ -641,6 +641,7 @@ URL: [url]',
'filetype' => 'Type file',
'file_size' => 'Bestandsomvang',
'filter_for_documents' => 'Extra filter voor documenten',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Extra filter voor mappen',
'folder' => 'Map',
'folders' => 'Mappen',

1
languages/pl_PL/lang.inc
View File

@ -624,6 +624,7 @@ URL: [url]',
'filetype' => 'Typ pliku',
'file_size' => 'Rozmiar pliku',
'filter_for_documents' => 'Dodatkowe filtrowanie dla dokumentów',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Dodatkowe filtrowanie dla folderów',
'folder' => 'Folder',
'folders' => 'Foldery',

1
languages/pt_BR/lang.inc
View File

@ -648,6 +648,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Tamanho',
'filter_for_documents' => 'Filtro adicional para documentos',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filtro adicional para pasta',
'folder' => 'Pasta',
'folders' => 'Pastas',

1
languages/ro_RO/lang.inc
View File

@ -636,6 +636,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Mărimea fișierului',
'filter_for_documents' => 'Filtru suplimentar pentru documente',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Filtru suplimentar pentru foldere',
'folder' => 'Folder',
'folders' => 'Foldere',

1
languages/ru_RU/lang.inc
View File

@ -636,6 +636,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Размер',
'filter_for_documents' => 'Дополнительный фильтр по документам',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Дополнительный фильтр по папкам',
'folder' => 'Каталог',
'folders' => 'кат.',

1
languages/sk_SK/lang.inc
View File

@ -648,6 +648,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Veľkosť súboru',
'filter_for_documents' => 'Ďalší filter pre dokumenty',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Ďalší filter pre zložky',
'folder' => 'Zložka',
'folders' => 'Zložky',

1
languages/sv_SE/lang.inc
View File

@ -642,6 +642,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Filstorlek',
'filter_for_documents' => 'Tilläggsfilter för dokument',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Tilläggsfilter för kataloger',
'folder' => 'Katalog',
'folders' => 'Kataloger',

1
languages/tr_TR/lang.inc
View File

@ -630,6 +630,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Dosya boyutu',
'filter_for_documents' => 'Dokümanlar için ek filtreler',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Klasörler için ek filtreler',
'folder' => 'Klasör',
'folders' => 'Klasör',

1
languages/uk_UA/lang.inc
View File

@ -636,6 +636,7 @@ URL: [url]',
'filetype' => '',
'file_size' => 'Розмір',
'filter_for_documents' => 'Додатковий фільтр по документах',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => 'Додатковий фільтр по каталогах',
'folder' => 'Каталог',
'folders' => 'кат.',

1
languages/zh_CN/lang.inc
View File

@ -638,6 +638,7 @@ URL: [url]',
'filetype' => '',
'file_size' => '文件大小',
'filter_for_documents' => '文档新增过滤',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => '文件夹新增过滤',
'folder' => '文件夹',
'folders' => '文件夹',

1
languages/zh_TW/lang.inc
View File

@ -648,6 +648,7 @@ URL: [url]',
'filetype' => '檔案類型',
'file_size' => '文件大小',
'filter_for_documents' => '附加文件過濾器',
'filter_for_documents_and_folders' => '',
'filter_for_folders' => '文件夾的附加過濾器',
'folder' => '資料夾',
'folders' => '資料夾',

2
op/op.ExtensionMgr.php
View File

@ -115,7 +115,7 @@ elseif ($action == "import") { /* {{{ */
// $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
$controller->setParam('extmgr', $extMgr);
$controller->setParam('file', $file);
$_POST['action'] = 'upload';
$controller->setParam('action', 'upload');
if (!$controller()) {
unlink($file);
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));

62
views/bootstrap/class.Search.php
View File

@ -292,7 +292,7 @@ function typeahead() { /* {{{ */
</ul>
<div class="tab-content">
<div class="tab-pane <?php echo ($fullsearch == false) ? 'active' : ''; ?>" id="database">
<form class="form-horizontal" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form1">
<form class="form-horizontal mb-4" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form1">
<input type="hidden" name="fullsearch" value="0" />
<?php
// Database search Form {{{
@ -392,36 +392,42 @@ function typeahead() { /* {{{ */
);
$this->contentContainerEnd();
// Seach options for documents and folders {{{
/* First check if any of the folder/document filters are set. If it is,
* open the accordion.
*/
$openfilterdlg = false;
$hasattrs = false;
if($attrdefs) {
foreach($attrdefs as $attrdef) {
if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
/* Do not check dates because they always have 'from' and 'to' element
* even if it is empty. FIXME should be also checked.
*/
$hasattrs = true;
if($attrdef->getType() != SeedDMS_Core_AttributeDefinition::type_date)
if(!empty($attributes[$attrdef->getID()]))
$openfilterdlg = true;
}
}
}
ob_start();
if($attrdefs) {
foreach($attrdefs as $attrdef) {
if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
} else
$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true));
if($hasattrs) {
ob_start();
if($attrdefs) {
foreach($attrdefs as $attrdef) {
if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_all) {
if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
} else
$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true));
}
}
}
$content = ob_get_clean();
$this->printAccordion(getMLText('filter_for_documents_and_folders'), $content, $openfilterdlg);
}
$content = ob_get_clean();
$this->printAccordion(getMLText('filter_for_documents_and_folders'), $content, $openfilterdlg);
// }}}
// Seach options for documents {{{
/* First check if any of the folder filters are set. If it is,
@ -535,39 +541,43 @@ function typeahead() { /* {{{ */
}
}
}
$content = ob_get_clean();
$this->printAccordion(getMLText('filter_for_documents'), $content, $openfilterdlg);
// }}}
// Seach options for folders {{{
$content = ob_get_clean();
$this->printAccordion(getMLText('filter_for_documents'), $content, $openfilterdlg);
/* First check if any of the folder filters are set. If it is,
* open the accordion.
*/
$openfilterdlg = false;
$hasattrs = false;
if($attrdefs) {
foreach($attrdefs as $attrdef) {
if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) {
$hasattrs = true;
if($attrdef->getType() != SeedDMS_Core_AttributeDefinition::type_date)
if(!empty($attributes[$attrdef->getID()]))
$openfilterdlg = true;
}
}
}
ob_start();
if($attrdefs) {
foreach($attrdefs as $attrdef) {
if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) {
if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
} else
$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true));
if($hasattrs) {
ob_start();
if($attrdefs) {
foreach($attrdefs as $attrdef) {
if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) {
if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
} else
$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true));
}
}
}
}
$content = ob_get_clean();
if($content)
$content = ob_get_clean();
$this->printAccordion(getMLText('filter_for_folders'), $content, $openfilterdlg);
}
// }}}
$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));