diff --git a/CHANGELOG b/CHANGELOG index f1f7e18c6..55b24ce4d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -353,6 +353,11 @@ - add new command line program utils/console - major code polishing - add markdown editor editor.md +- less colorful extension manager +- check for missing changes in extension configuration +- use table for list of caches +- propper error msgs when saving extension configuration +- creating backup archives has been removed -------------------------------------------------------------------------------- Changes in version 5.1.42 diff --git a/composer-dist.json b/composer-dist.json index 43c57b780..cc71eb34d 100644 --- a/composer-dist.json +++ b/composer-dist.json @@ -56,7 +56,7 @@ "dragonmantank/cron-expression": "^3.1", "alecrabbit/php-console-colour": "*", "zf1/zend-search-lucene": "*", - "symfony/http-foundation": "^5.4", + "symfony/http-foundation": "^7", "php-di/php-di": "^7", "hfig/mapi": "*", "slim/psr7": "^1.7", @@ -69,25 +69,13 @@ "seeddms/http_webdav_server": "dev-master", "wikimedia/composer-merge-plugin": "dev-master", "cache/memcached-adapter": "^1.2", - "symfony/console": "^7.2" + "symfony/console": "^7.2", + "twig/twig": "^3.0", + "league/commonmark": "^2.7" }, "require-dev": { "composer/composer": "dev-main" }, - "extra": { - "merge-plugin": { - "include": [ - "composer.local.json" - ], - "recurse": false, - "replace": true, - "ignore-duplicates": true, - "merge-dev": true, - "merge-extra": false, - "merge-extra-deep": false, - "merge-scripts": true - } - }, "repositories": [ { "type": "path", @@ -124,5 +112,19 @@ "symlink": false } } - ] + ], + "extra": { + "merge-plugin": { + "include": [ + "composer.local.json" + ], + "recurse": false, + "replace": true, + "ignore-duplicates": true, + "merge-dev": true, + "merge-extra": false, + "merge-extra-deep": false, + "merge-scripts": true + } + } } diff --git a/composer.json b/composer.json index 2233d6f56..4da7943e6 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "dragonmantank/cron-expression": "^3.1", "alecrabbit/php-console-colour": "*", "zf1/zend-search-lucene": "*", - "symfony/http-foundation": "^5.4", + "symfony/http-foundation": "^7", "php-di/php-di": "^7", "hfig/mapi": "*", "slim/psr7": "^1.7", @@ -72,7 +72,9 @@ "seeddms/http_webdav_server": "dev-master", "wikimedia/composer-merge-plugin": "dev-master", "cache/memcached-adapter": "^1.2", - "symfony/console": "^7.2" + "symfony/console": "^7.2", + "twig/twig": "^3.0", + "league/commonmark": "^2.7" }, "require-dev": { "composer/composer": "dev-main", diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 881d314af..d48d3cc40 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -85,6 +85,12 @@ class ExtensionMgr { */ protected $errmsgs; + /** + * @var string[] $warnmsg list of warning message from last operation + * @access protected + */ + protected $warnmsgs; + /* * Name of json file containg available extension from repository */ @@ -435,6 +441,7 @@ $EXT_CONF = '.var_export($EXT_CONF, true).';'); } $this->errmsgs = array(); + $this->warnmsgs = array(); if(!isset($extconf['constraints']['depends']['seeddms'])) { $this->errmsgs[] = "Missing dependency on SeedDMS"; @@ -451,6 +458,9 @@ $EXT_CONF = '.var_export($EXT_CONF, true).';'); if(!isset($extconf['author'])) { $this->errmsgs[] = "Missing author"; } + if(!isset($extconf['changes'])) { + $this->warnmsgs[] = "Missing changes"; + } if(!isset($options['noconstraints']) || $options['noconstraints'] == false) { if(isset($extconf['constraints']['depends'])) { @@ -754,4 +764,13 @@ $EXT_CONF = '.var_export($EXT_CONF, true).';'); public function getErrorMsgs() { /* {{{ */ return $this->errmsgs; } /* }}} */ + + /** + * Return all warning messages + * + * @return string[] + */ + public function getWarningMsgs() { /* {{{ */ + return $this->warnmsgs; + } /* }}} */ } diff --git a/inc/inc.Language.php b/inc/inc.Language.php index 0a63bf0a4..d356ca291 100644 --- a/inc/inc.Language.php +++ b/inc/inc.Language.php @@ -172,6 +172,6 @@ function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex= } /* }}} */ function getAttributeValidationError($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */ - return $GLOBALS['translator']->getAttributeValidationText($error, $attrname, $attrvalue, $regex); + return $GLOBALS['translator']->getAttributeValidationError($error, $attrname, $attrvalue, $regex); } /* }}} */ diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 7286a4ecb..e461401bc 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -141,6 +141,7 @@ URL: [url]', 'ar_EG' => 'العربية', 'archive' => 'إرشيف', 'archive_creation' => 'انشاء ارشيف', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'من خلال العملية التالية يمكنك انشاء ارشيف يحتوي على كل ملفات النظام. بعد انشاء الارشيف سيتم حفظه في ملف البيانات على السيرفر.
تحذير: الارشيف الذي تم انشاؤه ليكون مقروء بواسطة المستخدم لن يكون نافعا كملف نسخ احتياطي للسيرفر', 'assign_approvers' => 'تخصيص موافقون', 'assign_recipients' => 'تخصيص المستلمين', @@ -2125,6 +2126,7 @@ URL: [url]', 'splash_notinherit_access' => 'لا يرث الوصول', 'splash_objects_transfered' => 'نقل الأشياء', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'تحديد المدير', 'splash_receipt_update_success' => 'استلام التحديث بنجاح', 'splash_removed_from_clipboard' => 'ازيل من الحافظة', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 67fd9166c..d203c7ca7 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -136,6 +136,7 @@ $text = array( 'ar_EG' => 'Арабски', 'archive' => '', 'archive_creation' => 'Създаване архив', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Тази операция ще създаде архив, съдържащ всички папки. След създаването архивът ще бъде съхранен в папката с данни на сървъра.
ВНИМАНИЕ: Архивът създаден като понятен за човек, ще бъде непригоден за бекъп!', 'assign_approvers' => 'Назначи утвърждаващи', 'assign_recipients' => '', @@ -1967,6 +1968,7 @@ $text = array( 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index e72904a77..582bc0388 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -141,6 +141,7 @@ URL: [url]', 'ar_EG' => 'Àrab', 'archive' => '', 'archive_creation' => 'Creació d\'arxiu', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Amb aquesta operació pot crear un arxiu que contingui els fitxers de les carpetes del DMS complet. Després de crear-lo, l\'arxiu es guardarà a la carpeta de dades del servidor.
ATENCIÓ: un fitxer creat com llegible per humans no es podrà usar com a còpia de seguretat del servidor.', 'assign_approvers' => 'Assignar aprovadors', 'assign_recipients' => '', @@ -1972,6 +1973,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 23b161689..278869040 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabština', 'archive' => 'Archív', 'archive_creation' => 'Archivování', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Pomocí této operace můžete vytvořit archiv obsahující soubory z celé složky DMS. Po jeho vytvoøení bude archiv uložen v datové složce serveru. POZOR: archiv bude vytvořen jako běžně čitelný, nelze jej použít jako záložní server.', 'assign_approvers' => 'Přiřazení schvalující', 'assign_recipients' => 'Přiřazení příjemci', @@ -2197,6 +2198,7 @@ Jméno: [username] 'splash_notinherit_access' => 'Přístupová práva již nejsou zděděna', 'splash_objects_transfered' => 'Objekt přenesen', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Nastaven nový vlastník', 'splash_receipt_update_success' => 'Příjem byl úspěšně přidán', 'splash_removed_from_clipboard' => 'Odstraněno ze schránky', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 99b8ba5f6..ecc725f47 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 (3558), dgrutsch (22) +// Translators: Admin (3560), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -176,6 +176,7 @@ URL: [url]

', 'ar_EG' => 'Arabisch', 'archive' => 'Archiv', 'archive_creation' => 'Archiv erzeugen', +'archive_creation_is_obsolete_msg' => 'Das Erzeugen der Backup-Archive wurde entfernt, weil es kein verlässliches Backup merh erzeugt hat. Erstellen Sie ein Backup indem Sie das data-Verzeichnis (ggf. ohne das cache-Verzeichnis) und die Datenbank (falls sie mysql verwenden) sichern.', 'archive_creation_warning' => 'Mit dieser Operation können Sie ein Archiv mit allen Dokumenten des DMS erzeugen. Nach der Erstellung wird das Archiv im Datenordner Ihres Servers gespeichert.
Warnung: ein menschenlesbares Archiv ist als Server-Backup unbrauchbar.', 'assign_approvers' => 'Freigebende zuweisen', 'assign_recipients' => 'Empfänger zuweisen', @@ -2588,6 +2589,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver 'splash_notinherit_access' => 'Zugriffsrechte werden nicht mehr geerbt', 'splash_objects_transfered' => 'Objekte übertragen', 'splash_orig_filename_changed' => 'Originaler Dateiname geändert', +'splash_orig_filename_unchanged' => 'Originaler Dateiname unverändert', 'splash_owner_set' => 'Neuen Besitzer gesetzt', 'splash_receipt_update_success' => 'Empfangsbestätigung hinzugefügt', 'splash_removed_from_clipboard' => 'Aus der Zwischenablage entfernt', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index cfd2b91ee..d5f3c26b7 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -136,6 +136,7 @@ $text = array( 'ar_EG' => 'Arabic/Αραβικά', 'archive' => '', 'archive_creation' => '', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => '', 'assign_approvers' => '', 'assign_recipients' => '', @@ -1978,6 +1979,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 9f8afe793..9fa1d64d2 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 (2627), archonwang (3), dgrutsch (9), netixw (14) +// Translators: Admin (2629), archonwang (3), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -176,6 +176,7 @@ URL: [url]

', 'ar_EG' => 'Arabic', 'archive' => 'Archive', 'archive_creation' => 'Archive creation', +'archive_creation_is_obsolete_msg' => 'The creation of backup archives has been removed, because it was no longer a reliable backup. Instead make a backup of the data directory (possibly without the cache directory) and the database (if you use mysql).', 'archive_creation_warning' => 'With this operation you can create archive containing the files of entire DMS folders. After the creation the archive will be saved in the data folder of your server.
WARNING: an archive created as human readable will be unusable as server backup.', 'assign_approvers' => 'Assign Approvers', 'assign_recipients' => 'Assign Recipients', @@ -2590,6 +2591,7 @@ If you did not receive a password, please use the password forgotten function on 'splash_notinherit_access' => 'Access rights no longer inherited', 'splash_objects_transfered' => 'Objects transferred', 'splash_orig_filename_changed' => 'Original filename changed', +'splash_orig_filename_unchanged' => 'Original filename unchanged', 'splash_owner_set' => 'Set new owner', 'splash_receipt_update_success' => 'Reception added successfully', 'splash_removed_from_clipboard' => 'Removed from clipboard', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index faa7a64da..fbe257062 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -148,6 +148,7 @@ URL: [url]', 'ar_EG' => 'Arabe', 'archive' => 'Archivo', 'archive_creation' => 'Creación de archivo', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Con esta operación usted puede crear un archivo que contenga los ficheros de las carpetas del DMS completo. Después de crearlo el archivo se guardará en la carpeta de datos de su servidor.
CUIDADO: un fichero creado como legible por humanos no podrá usarse como copia de seguridad del servidor.', 'assign_approvers' => 'Asignar aprobadores', 'assign_recipients' => 'Asignar Receptores', @@ -2148,6 +2149,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => 'Eliminado del portapapeles', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 691b623de..a21f55e9f 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -167,6 +167,7 @@ URL : [url]

', 'ar_EG' => 'Arabe – Égypte', 'archive' => 'Archive', 'archive_creation' => 'Créer une archive', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Avec cette fonction, vous pouvez créer une archive contenant les fichiers de tous les dossiers DMS. Après la création, l\'archive sera sauvegardée dans le dossier de données de votre serveur.
AVERTISSEMENT: Une archive créée ainsi sera inutilisable en tant que sauvegarde du serveur.', 'assign_approvers' => 'Affecter les approbateurs', 'assign_recipients' => 'Affecter les destinataires', @@ -2535,6 +2536,7 @@ Nom : [username] 'splash_notinherit_access' => 'Les droits d’accès ne sont plus hérités', 'splash_objects_transfered' => 'Objets transférés', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Nouveau propriétaire défini', 'splash_receipt_update_success' => 'Réception ajoutée avec succès', 'splash_removed_from_clipboard' => 'Supprimé du presse-papier', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index d87851def..445820b54 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -153,6 +153,7 @@ Internet poveznica: [url]', 'ar_EG' => 'Arapski', 'archive' => 'arhiva', 'archive_creation' => 'Izrada arhive', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Ovom radnjom možete izraditi arhivu koja sadrži datoteke cijele DMS mape. Nakon izrade arhiva će biti pohranjena u podatkovnu mapu vašer servera.
UPOZORENJE: arhiva izrađena na način da je čitljiva ljudima, bit će bezkorisna kao sigurnosna kopija servera.', 'assign_approvers' => 'Dodijeli validatore', 'assign_recipients' => 'Dodaj primaoca', @@ -2161,6 +2162,7 @@ Internet poveznica: [url]', 'splash_notinherit_access' => 'splash notinherit pristup', 'splash_objects_transfered' => 'objekti prijenosa prskanja', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'prskanje setowner', 'splash_receipt_update_success' => 'splash potvrda ažuriranje uspješno', 'splash_removed_from_clipboard' => 'Uklonjeno iz međuspremnika', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index bfa58b6a4..d5626b9a9 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -148,6 +148,7 @@ URL: [url]', 'ar_EG' => 'Arab', 'archive' => 'Archívum', 'archive_creation' => 'Archívum létrehozása', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Ezzel a művelettel archívumot hozhat létre, amely tartalmazza az összes DMS mappában található állományokat. A létrehozás követően az archívum a kiszolgáló adat mappájába lesz mentve.
FIGYELEM: az archívum értelmezhető formában kerül tárolásra és nem használható kiszolgáló mentésként.', 'assign_approvers' => 'Jóváhagyók hozzárendelése', 'assign_recipients' => '', @@ -2138,6 +2139,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => 'Eltávolítva a vágólapról', diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc index e537ecbfa..7af9213e8 100644 --- a/languages/id_ID/lang.inc +++ b/languages/id_ID/lang.inc @@ -156,6 +156,7 @@ URL: [url]', 'ar_EG' => 'Arab', 'archive' => 'Arsip', 'archive_creation' => 'Arsip creation', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Dengan operasi ini Anda dapat membuat arsip yang berisi file dari seluruh folder DMS. Setelah pembuatan arsip akan disimpan di folder data server Anda.
PERINGATAN: arsip yang dibuat sebagai dapat dibaca manusia tidak akan dapat digunakan sebagai cadangan server.', 'assign_approvers' => '', 'assign_recipients' => 'Tetapkan Penerima', @@ -2228,6 +2229,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Tentukan pemilik baru', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 4ba9d50f6..67a47a157 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabo', 'archive' => 'Archivio', 'archive_creation' => 'Creazione archivio', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.', 'assign_approvers' => 'Assegna approvatori', 'assign_recipients' => 'Assegna destinatari', @@ -2184,6 +2185,7 @@ Name: [username] 'splash_notinherit_access' => 'I diritti di accesso non sono più ereditati', 'splash_objects_transfered' => 'Oggetti trasferito', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Imposta nuovo proprietario', 'splash_receipt_update_success' => 'Ricevuta aggiunta con successo', 'splash_removed_from_clipboard' => 'Rimosso dagli appunti', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 914fb1d6c..dd44303f0 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => '아랍어', 'archive' => '', 'archive_creation' => '백업 파일 생성', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => '본 작업은 전체 DMS 폴더 내의 파일 모두에 아카이브를 만듭니다. 생성한 아카이브는 서버의 데이터 폴더에 저장됩니다.
경고 : 이렇게 만들어진 자료는 서버의 백업과 같이 가독성이 저하 됩니다.', 'assign_approvers' => '승인자 지정', 'assign_recipients' => '수신자를 할당하여 주십시요.', @@ -2155,6 +2156,7 @@ URL : [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => '클립 보드에서 제거', diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc index 67a947555..1b7b2c487 100644 --- a/languages/lo_LA/lang.inc +++ b/languages/lo_LA/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'ພາສາອາຫລັບ', 'archive' => '', 'archive_creation' => 'ການສ້າງບ່ອນເກັບມ້ຽນແບບຖາວອນ', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'ດ້ວຍການດຳເນີນການນີ້ ເຈົ້າສາມາດສ້າງບ່ອນເກັບມ້ຽນແບບຖາວອນ ທີມີໄຟລຂອງ DMS ທັງໂຟລເດີໄດ້, ຫຼັງຈາກການສ້າງລະບົບຈະເກັບຂໍ້ມູນທີ່ເກັບໄວ້ໃນໂຟລເດີໃນເຊີເວີຂອງເຈົ້າ
ຄຳເຕືອນ: ພື້ນທີເກັບແບບຖ້າວອນທີໄດ້ສ້າງຂື້ນເພື່ອໃຫ້ ມະນຸດສາມາດອ່ານໄດ້, ແຕ່ບໍ່ສາມາດໄຊ້ງານເປັນເຊີເວີສຳຮອງໄດ້', 'assign_approvers' => 'ມອບຫມາຍໃຫ້ເປັນຜູ້ອະນຸມັດ', 'assign_recipients' => '', @@ -2181,6 +2182,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => 'ຖ່າຍໂອນວັດຖຸຮຽບຮ້ອຍແລ້ວ', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => 'ການເພີ່ມຂໍ້ມູນໄດ້ສຳເລັດແລ້ວ', 'splash_removed_from_clipboard' => 'ຍ້າຍອອກຈາກຄິບບອດ', diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc index 57b9e6b7b..964580bec 100644 --- a/languages/nb_NO/lang.inc +++ b/languages/nb_NO/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabisk', 'archive' => 'arkiv', 'archive_creation' => 'Lag arkiv', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Med denne operasjonen kan du lage arkiv som inneholder filene til hele DMS-mapper. Etter opprettelsen vil arkivet bli lagret i datamappen på serveren din.
ADVARSEL: et arkiv som er opprettet som menneskelig lesbar, kan være ubrukelig som sikkerhetskopiering av serveren.', 'assign_approvers' => 'Tildel godkjennere', 'assign_recipients' => 'Tildel mottakere', @@ -2194,6 +2195,7 @@ Bruker: [username] 'splash_notinherit_access' => 'Adgangsrettigheter arves ikke lenger', 'splash_objects_transfered' => 'Objekt er øverført', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Sett ny eier', 'splash_receipt_update_success' => 'Mottak ble lagt til', 'splash_removed_from_clipboard' => 'Fjernet fra utklippstavlen', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index deea669af..4154fd87d 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -146,6 +146,7 @@ URL: [url]', 'ar_EG' => 'Arabisch', 'archive' => 'Archief', 'archive_creation' => 'Archief aanmaken', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Met deze handeling maakt U een Archief aan van alle bestanden in het DMS. Na het aanmaken van het Archief, wordt dit opgeslagen in de data-map van uw server.
Waarschuwing: een leesbaar Archief kan niet worden gebruikt voor server back-up doeleinde.', 'assign_approvers' => 'Wijs goedkeurders aan', 'assign_recipients' => 'Wijs ontvangers aan', @@ -2193,6 +2194,7 @@ Name: [username] 'splash_notinherit_access' => 'Toegangsrechten worden niet meer overgeërfd', 'splash_objects_transfered' => 'Objecten verzonden', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Stelt een nieuwe eigenaar in', 'splash_receipt_update_success' => 'Ontvangst succesvol toegevoegd', 'splash_removed_from_clipboard' => 'Verwijderd van het klembord', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 57eff3922..1c9f55c15 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -175,6 +175,7 @@ URL: [url]

', 'ar_EG' => 'Arabski', 'archive' => 'Archiwum', 'archive_creation' => 'Tworzenie archiwum', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Ta operacja utworzy archiwum zawierające pliki z całego repozytorium. Po utworzeniu, archiwum będzie zapisane w folderze na serwerze.
UWAGA: archiwum utworzone jako czytelne dla ludzi będzie bezużyteczne jako kopia serwera.', 'assign_approvers' => 'Przypisz osoby akceptujące', 'assign_recipients' => 'Przypisz odbiorców', @@ -2365,6 +2366,7 @@ Name: [username] 'splash_notinherit_access' => 'Prawa dostępu nie są już dziedziczone', 'splash_objects_transfered' => 'Obiekty przekazane', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Ustaw nowego właściciela', 'splash_receipt_update_success' => 'Odbiór został dodany pomyślnie', 'splash_removed_from_clipboard' => 'Usunięto ze schowka', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index aa75c0b0b..8bcbbb432 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Árabe', 'archive' => 'Arquivo', 'archive_creation' => 'Criação de arquivo', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Com esta operação, você pode criar um arquivo contendo os arquivos de pastas inteiras do DMS. Após a criação, o arquivo será salvo na pasta de dados do seu servidor.
AVISO: um arquivo criado como legível por humanos será inutilizável como backup do servidor.', 'assign_approvers' => 'Atribuir Aprovadores', 'assign_recipients' => 'Atribuir Destinatários', @@ -2200,6 +2201,7 @@ Nome: [username] 'splash_notinherit_access' => 'Direitos de acesso não herdados', 'splash_objects_transfered' => 'Objetos transferidos', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Definir novo dono', 'splash_receipt_update_success' => 'Recepção adicionada com sucesso', 'splash_removed_from_clipboard' => 'Remover da área de transferência', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index e5cdcea58..7883ee152 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabă', 'archive' => '', 'archive_creation' => 'Creare arhiva', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Cu această operațiune puteți crea o arhiva care sa conțina fișierele din toate folderele DMS. După creare, arhiva va fi salvata în folderul de date din serverul dumneavoastră.
AVERTISMENT:. O arhivă creată ca lizibilă pentru om nu va putea fi utilizata ca server de backup.', 'assign_approvers' => 'Atribuire aprobatori', 'assign_recipients' => '', @@ -2162,6 +2163,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => 'Eliminat din clipboard', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 6c51680db..204c94a4e 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabic', 'archive' => 'Архив', 'archive_creation' => 'Создать архив', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Эта операция создаст архив, содержащий все каталоги. После создания архив будет сохранен в каталоге данных сервера.
Внимание: архив созданный как понятный человеку, будет непригоден в качестве резервной копии для восстановления!', 'assign_approvers' => 'Назначить утверждающих', 'assign_recipients' => 'Указать получателей', @@ -2169,6 +2170,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => 'Удалён из буфера обмена', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index e94630051..81330f06b 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabština', 'archive' => 'archív', 'archive_creation' => 'Vytvorenie archívu', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Touto akciou môžete vytvoriť archív obsahujúci celú DMS zložku. Po vytvorení bude každý súbor uložený do dátovej zložky súborov na vašom serveri.
UPOZORNENIE: uživateľsky prístupný archív nie je možné použiť ako zálohu servera.', 'assign_approvers' => 'Určiť schvaľovateľov', 'assign_recipients' => 'Určiť príjemcov', @@ -2202,6 +2203,7 @@ Meno: [username] 'splash_notinherit_access' => 'Prístupové práva sa už nededia', 'splash_objects_transfered' => 'Objects transfered', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => 'Nastaviť nového vlastníka', 'splash_receipt_update_success' => 'Reception added successfully', 'splash_removed_from_clipboard' => 'Odstránené zo schránky', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 763dda84d..7484bdbde 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -154,6 +154,7 @@ URL: [url]', 'ar_EG' => 'arabiska', 'archive' => '', 'archive_creation' => 'Skapa arkiv', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Med denna funktion kan du skapa ett arkiv som innehåller filer från hela DMS-kataloger. När arkivet har skapats, kommer det att sparas i data-mappen på din server.
OBS! Skapas ett arkiv som är läsbart för användare, kan det inte användas för att återställa systemet.', 'assign_approvers' => 'Ge uppdrag till personer/grupper att godkänna dokumentet', 'assign_recipients' => '', @@ -2175,6 +2176,7 @@ Kommentar: [comment]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => 'Objekt överförda', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => 'Meddelande tillagt', 'splash_removed_from_clipboard' => 'Borttaget från urklipp', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 34d6b988d..c76896637 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -148,6 +148,7 @@ URL: [url]', 'ar_EG' => 'Arapça', 'archive' => '', 'archive_creation' => 'Arşiv oluşturma', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Bu işlemle tüm DYS içeriğindeki dosyaların arşivini oluşturabilirsiniz. Arşiv oluşturulduktan sonra sunucudaki data klasörüne kaydedilecektir.
DİKKAT: Okunabilir olarak oluşturulan arşiv, sunucu yedeği olarak kullanılamaz.', 'assign_approvers' => 'Onaylayıcı Tanımla', 'assign_recipients' => 'Alıcı ata', @@ -2139,6 +2140,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => 'Panodan silindi', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 877614482..d9b7563db 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => 'Arabic', 'archive' => '', 'archive_creation' => 'Створити архів', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => 'Ця операція створить архів, який містить всі каталоги. Після створення архів буде збережений в каталозі даних сервера.
Увага: архів, який створено в читабельному вигляді, буде непридатний в якості резервної копії для відновлення!', 'assign_approvers' => 'Призначити затверджувачів', 'assign_recipients' => '', @@ -2161,6 +2162,7 @@ URL: [url]', 'splash_notinherit_access' => '', 'splash_objects_transfered' => '', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '', 'splash_receipt_update_success' => '', 'splash_removed_from_clipboard' => 'Видалити з буферу обміну', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 33539a593..3d646a079 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -153,6 +153,7 @@ URL: [url]', 'ar_EG' => '阿拉伯语', 'archive' => '存档', 'archive_creation' => '创建存档', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => '通过此操作您可以创建一个包含文档管理系统的数据文件夹。之后，所有文档都将保存到您服务器的数据文件夹中.
警告:如果所创建文档名为非数字的，那么将在服务器备份中不可用', 'assign_approvers' => '指派审核人', 'assign_recipients' => '指派接收人', @@ -2149,6 +2150,7 @@ URL: [url]', 'splash_notinherit_access' => '访问权不再继承', 'splash_objects_transfered' => '对象转移', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '设置新所有者', 'splash_receipt_update_success' => '接收人添加成功', 'splash_removed_from_clipboard' => '已从剪切板删除', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 9d3e6a439..12add36c7 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -153,6 +153,7 @@ $text = array( 'ar_EG' => '阿拉伯語', 'archive' => '封存', 'archive_creation' => '創建存檔', +'archive_creation_is_obsolete_msg' => '', 'archive_creation_warning' => '通過此操作您可以創建一個包含這個DMS(文件管理系統)的資料檔案夾。之後，所有文件都將保存到您伺服器的資料檔案夾中.
警告:如果所創建文件名為非數字的，那麼將在伺服器備份中不可用', 'assign_approvers' => '指派審核人', 'assign_recipients' => '分配收件人', @@ -2200,6 +2201,7 @@ URL: [url]', 'splash_notinherit_access' => '訪問權限不再繼承', 'splash_objects_transfered' => '轉移的物件', 'splash_orig_filename_changed' => '', +'splash_orig_filename_unchanged' => '', 'splash_owner_set' => '設定新的擁有者', 'splash_receipt_update_success' => '接待已成功添加', 'splash_removed_from_clipboard' => '已從剪貼簿中刪除', diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 432fd5bd1..02b23b5f3 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -701,20 +701,28 @@ switch($command) { $document = $content->getDocument(); if ($document->getAccessMode($user) >= M_READWRITE) { $oldname = $content->getOriginalFileName(); - if (!$content->setOriginalFilename($_REQUEST['name'])) { - header('Content-Type: application/json'); - echo json_encode(array('success'=>false, 'message'=>'Error setting original file name', 'data'=>'')); - } else { - if($fulltextservice && ($index = $fulltextservice->Indexer())) { - $lucenesearch = $fulltextservice->Search(); - if($hit = $lucenesearch->getDocument($document->getId())) { - $index->reindexDocument($hit->id); - $index->commit(); + $newname = trim($_REQUEST['name']); + if ($oldname != $newname) { + if (!$content->setOriginalFilename($newname)) { + header('Content-Type: application/json'); + echo json_encode(array('success'=>false, 'message'=>'Error setting original file name', 'data'=>'')); + } else { + $fileType = pathinfo($newname, PATHINFO_EXTENSION); + $content->setFileType($fileType); + if($fulltextservice && ($index = $fulltextservice->Indexer())) { + $lucenesearch = $fulltextservice->Search(); + if($hit = $lucenesearch->getDocument($document->getId())) { + $index->reindexDocument($hit->id); + $index->commit(); + } } + header('Content-Type: application/json'); + echo json_encode(array('success'=>true, 'message'=>getMLText('splash_orig_filename_changed'), 'data'=>'')); + add_log_line("set original filename '".$_REQUEST['name']."' of document ".$document->getId().":".$content->getVersion()); } + } else { header('Content-Type: application/json'); - echo json_encode(array('success'=>true, 'message'=>getMLText('splash_orig_filename_changed'), 'data'=>'')); - add_log_line("set original filename '".$_REQUEST['name']."' of document ".$document->getId().":".$content->getVersion()); + echo json_encode(array('success'=>true, 'message'=>getMLText('splash_orig_filename_unchanged'), 'data'=>'')); } } else { header('Content-Type: application/json'); diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php index 3d3dbc299..5e77b1ef0 100644 --- a/views/bootstrap/class.BackupTools.php +++ b/views/bootstrap/class.BackupTools.php @@ -75,6 +75,10 @@ class SeedDMS_View_BackupTools extends SeedDMS_Theme_Style { // archive creation //////////////////////////////////////////////////////////// + if (1) { + $this->contentHeading(getMLText("archive_creation")); + $this->warningMsg(getMLText('archive_creation_is_obsolete_msg')); + } else { if($this->params['hasbackupdir']) { $this->contentHeading(getMLText("archive_creation")); print "

".getMLText("archive_creation_warning")."

\n"; @@ -197,6 +201,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Theme_Style { } else { $this->warningMsg(getMLText('no_backup_dir')); } + } // files deletion ////////////////////////////////////////////////////////////// /* @@ -216,4 +221,3 @@ class SeedDMS_View_BackupTools extends SeedDMS_Theme_Style { $this->htmlEndPage(); } /* }}} */ } -?> diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php index 5b45c5157..577ff62b7 100644 --- a/views/bootstrap/class.ClearCache.php +++ b/views/bootstrap/class.ClearCache.php @@ -9,7 +9,7 @@ * @author Uwe Steinmann * @copyright Copyright (C) 2002-2005 Markus Westphal, * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, - * 2010-2012 Uwe Steinmann + * 2010-2025 Uwe Steinmann * @version Release: @package_version@ */ @@ -26,13 +26,17 @@ * @author Markus Westphal, Malcolm Cowe, Uwe Steinmann * @copyright Copyright (C) 2002-2005 Markus Westphal, * 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli, - * 2010-2012 Uwe Steinmann + * 2010-2025 Uwe Steinmann * @version Release: @package_version@ */ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style { protected function output($name, $title, $space, $c) { - echo '

'.$title.($space !== NULL || $c != NULL ? '
' : '').($space !== NULL ? SeedDMS_Core_File::format_filesize($space) : '').($c !== NULL ? ' in '.$c.' Files' : '').'

'; + echo ''; + echo ''.$title.''; + echo ''.($space !== NULL ? SeedDMS_Core_File::format_filesize($space) : '').''; + echo ''.($c !== NULL ? $c : '').''; + echo ''; } function show() { /* {{{ */ @@ -49,9 +53,11 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style { ?>
-contentContainerStart('warning'); -?> + + + + +contentContainerEnd(); - $this->infoMsg(SeedDMS_Core_File::format_filesize($totalspace).' in '.$totalc.' Files'); +?> + + +'; +?> + +
CacheSizeFiles
'.SeedDMS_Core_File::format_filesize($totalspace).''.$totalc.'
+formSubmit(" ".getMLText('clear_cache'), '', '', 'danger'); ?>
@@ -102,4 +115,3 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style { $this->htmlEndPage(); } /* }}} */ } -?> diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php index 6ea4c2f0d..4c5468b3b 100644 --- a/views/bootstrap/class.ExtensionMgr.php +++ b/views/bootstrap/class.ExtensionMgr.php @@ -27,6 +27,24 @@ */ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { + protected function showMessages($msgs, $icon) { + if(!$msgs) + return; + echo ' '.implode('
', $msgs).""; + } + + protected function showErrorMessages($msgs) { + echo '
'; + $this->showMessages($msgs, 'exclamation-triangle'); + echo '
'; + } + + protected function showWarningMessages($msgs) { + echo '
'; + $this->showMessages($msgs, 'lightbulb-o'); + echo '
'; + } + function js() { /* {{{ */ header('Content-Type: application/javascript; charset=UTF-8'); ?> @@ -45,7 +63,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { success: function(data) { noty({ text: data.msg, - type: (data.error) ? 'error' : 'success', + type: (data.success) ? 'success' : 'error', dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', @@ -65,7 +83,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { success: function(data) { noty({ text: data.msg, - type: (data.error) ? 'error' : 'success', + type: (data.success) ? 'success' : 'error', dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', @@ -85,7 +103,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { success: function(data) { noty({ text: data.msg, - type: (data.error) ? 'error' : 'success', + type: (data.success) ? 'success' : 'error', dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', @@ -137,26 +155,28 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { $list = $extmgr->getExtensionListByName($extname); foreach($list as $re) { $extmgr->checkExtensionByName($re['name'], $re); - $checkmsgs = $extmgr->getErrorMsgs(); + $errormsgs = $extmgr->getErrorMsgs(); + $warningmsgs = $extmgr->getWarningMsgs(); $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; - echo ""; - echo "".($re['icon-data'] ? ''.$re['name'].'' : '').""; - echo "".$re['title']."
".$re['description'].""; + echo ""; + echo "".($re['icon-data'] ? ''.$re['name'].'' : '').""; + echo "".$re['title'].""; + echo "
".$re['description'].""; echo "
".getMLText('author').": ".$re['author']['name'].", ".$re['author']['company'].""; - if($checkmsgs) - echo "
getImgPath("attention.gif")."\"> ".implode('
', $checkmsgs)."
"; + $this->showErrorMessages($errormsgs); + $this->showWarningMessages($warningmsgs); echo ""; echo "".$re['version']."
".$re['releasedate'].""; echo ""; echo "
"; - if(!$checkmsgs && $extmgr->isWritableExtDir()) + if(!$errormsgs && $extmgr->isWritableExtDir()) echo "
".createHiddenFieldWithKey('extensionmgr')."
"; echo "
"; echo ""; @@ -231,29 +251,30 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { print "".getMLText('version')."\n"; print "\n"; print "\n"; - $errmsgs = array(); foreach($extconf as $extname=>$extconf) { - $errmsgs = array(); $check = $extmgr->checkExtensionByDir($extname); + $class = ""; if(!$settings->extensionIsDisabled($extname)) { // if(!isset($extconf['disable']) || $extconf['disable'] == false) { if(!$check) - echo ""; + $class = "class=\"table-danger error\""; else - echo ""; + $class = "class=\"table-success success\""; } else { - echo ""; + $class = "class=\"table-warning warning\""; } - $errmsgs = $extmgr->getErrorMsgs(); - echo ""; + echo ""; + $errormsgs = $extmgr->getErrorMsgs(); + $warningmsgs = $extmgr->getWarningMsgs(); + echo ""; if($extconf['icon']) echo "\"".$extname."\""; echo ""; - echo "".$extconf['title']; + echo "".$extconf['title'].""; echo "
".$extconf['description'].""; echo "
".getMLText('author').": ".$extconf['author']['name'].", ".(!empty($extconf['author']['company']) ? $extconf['author']['company'] : '').""; - if($errmsgs) - echo "
getImgPath("attention.gif")."\"> ".implode('
', $errmsgs)."
"; + $this->showErrorMessages($errormsgs); + $this->showWarningMessages($warningmsgs); echo ""; echo "".$extconf['version']; echo "
".$extconf['releasedate'].""; @@ -363,29 +384,30 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style { if(!$re) continue; $extmgr->checkExtensionByName($en, $re); - $checkmsgs = $extmgr->getErrorMsgs(); + $errormsgs = $extmgr->getErrorMsgs(); + $warningmsgs = $extmgr->getWarningMsgs(); $needsupdate = !isset($extconf[$re['name']]) || SeedDMS_Extension_Mgr::cmpVersion($re['version'], $extconf[$re['name']]['version']) > 0; - echo ""; - echo "".($re['icon-data'] ? ''.$re['name'].'' : '').""; - echo "".$re['title']; + echo ""; + echo "".($re['icon-data'] ? ''.$re['name'].'' : '').""; + echo "".$re['title'].""; echo "
".$re['description'].""; echo "
".getMLText('author').": ".$re['author']['name'].", ".$re['author']['company'].""; - if($checkmsgs) - echo "
getImgPath("attention.gif")."\"> ".implode('
', $checkmsgs)."
"; + $this->showErrorMessages($errormsgs); + $this->showWarningMessages($warningmsgs); echo ""; echo "".$re['version']."
".$re['releasedate'].""; echo ""; echo "
"; echo $this->getModalBoxLink(array('target'=>'extensionInfo', 'remote'=>'out.ExtensionMgr.php?action=info_versions&extensionname='.$re['name'], 'class'=>'', 'title'=>'')); echo $this->getModalBoxLink(array('target'=>'extensionChangelog', 'remote'=>'out.ExtensionMgr.php?action=info_changelog&extensionname='.$re['name'], 'class'=>'', 'title'=>'')); - if(!$checkmsgs && $settings->_enableExtensionImportFromRepository && $extmgr->isWritableExtDir()) + if(!$errormsgs && $settings->_enableExtensionImportFromRepository && $extmgr->isWritableExtDir()) echo "
".createHiddenFieldWithKey('extensionmgr')."
"; echo "
"; echo "";