diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 9c6293d53..1e3501187 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -164,8 +164,10 @@ class Settings { /* {{{ */ var $_logFileRotation = "d"; // Enable file upload by jumploader var $_enableLargeFileUpload = false; - // size of partitions for file upload by jumploader + // size of partitions for file uploaded by fine-loader var $_partitionSize = 2000000; + // max size of files uploaded by fine-uploader, set to 0 for unlimited + var $_maxUploadSize = 0; // enable/disable users images var $_enableUserImage = false; // enable/disable calendar @@ -447,6 +449,7 @@ class Settings { /* {{{ */ $this->_logFileRotation = strval($tab["logFileRotation"]); $this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]); $this->_partitionSize = strval($tab["partitionSize"]); + $this->_maxUploadSize = strval($tab["maxUploadSize"]); // XML Path: /configuration/system/authentication $node = $xml->xpath('/configuration/system/authentication'); @@ -752,6 +755,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "logFileRotation", $this->_logFileRotation); $this->setXMLAttributValue($node, "enableLargeFileUpload", $this->_enableLargeFileUpload); $this->setXMLAttributValue($node, "partitionSize", $this->_partitionSize); + $this->setXMLAttributValue($node, "maxUploadSize", $this->_maxUploadSize); // XML Path: /configuration/system/authentication $node = $this->getXMLNode($xml, '/configuration/system', 'authentication'); diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php index 7b786245e..bdf419f03 100644 --- a/inc/inc.ClassUI.php +++ b/inc/inc.ClassUI.php @@ -105,7 +105,8 @@ class UI extends UI_Default { $view->setParam('enablelanguageselector', $settings->_enableLanguageSelector); $view->setParam('enableclipboard', $settings->_enableClipboard); $view->setParam('workflowmode', $settings->_workflowMode); - $view->setParam('partitionsize', $settings->_partitionSize); + $view->setParam('partitionsize', (int) $settings->_partitionSize); + $view->setParam('maxuploadsize', (int) $settings->_maxUploadSize); $view->setParam('showmissingtranslations', $settings->_showMissingTranslations); $view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod); $view->setParam('cachedir', $settings->_cacheDir); diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index b2837fa9a..869209281 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -449,14 +449,14 @@ URL: [url]', 'expired' => 'انتهى صلاحيته', 'expired_at_date' => '', 'expires' => 'تنتهى صلاحيته', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية', 'expiry_changed_email_body' => 'تم تغيير تاريخ الصلاحية المستند: [name] @@ -1214,6 +1214,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index e8cca8ac0..e8d0cb6b5 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -404,14 +404,14 @@ $text = array( 'expired' => 'Изтекъл', 'expired_at_date' => '', 'expires' => 'Изтича', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Датата на изтичане променена', 'expiry_changed_email_body' => '', 'expiry_changed_email_subject' => '', @@ -1079,6 +1079,8 @@ $text = array( 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 8904756c5..21bd2c121 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -409,14 +409,14 @@ URL: [url]', 'expired' => 'Caducat', 'expired_at_date' => '', 'expires' => 'Caduca', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Data de caducitat modificada', 'expiry_changed_email_body' => '', 'expiry_changed_email_subject' => '', @@ -1084,6 +1084,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 24a5836a4..dc1553ccf 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -456,14 +456,14 @@ URL: [url]', 'expired' => 'Platnost vypršela', 'expired_at_date' => '', 'expires' => 'Platnost vyprší', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Datum expirace změněno', 'expiry_changed_email_body' => 'Datum ukončení platnosti změněn Dokument: [name] @@ -1223,6 +1223,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Toto je max. počet dokumentů a složek, kterým bude kontrolováno přístupové právo při rekurzivním počítání objektů. Po jeho překročení bude počet složek a dokumentů odhadnut.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => '', 'settings_Notification' => 'Nastavení upozornění', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index bd24353cd..809f11cfa 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 (2400), dgrutsch (22) +// Translators: Admin (2402), dgrutsch (22) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -465,14 +465,14 @@ Der Link ist bis zum [valid] gültig.', 'expired' => 'abgelaufen', 'expired_at_date' => 'Abgelaufen am [datetime]', 'expires' => 'Ablaufdatum', -'expires_today' => 'Ablauf heute', -'expires_tomorrow' => 'Ablauf morgen', 'expire_by_date' => 'Ablauf nach Datum', 'expire_in_1d' => 'Ablauf in 1 Tag', 'expire_in_1h' => 'Ablauf in 1 Std.', 'expire_in_1m' => 'Ablauf in 1 Monat', 'expire_in_1w' => 'Ablauf in 1 Woche', 'expire_in_2h' => 'Ablauf in 2 Std.', +'expire_today' => 'Ablauf heute', +'expire_tomorrow' => 'Ablauf morgen', 'expiry_changed_email' => 'Ablaufdatum geändert', 'expiry_changed_email_body' => 'Ablaufdatum geändert Dokument: [name] @@ -1277,6 +1277,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Dies ist die maximale Anzahl der Dokumente und Ordner die auf Zugriffsrechte geprüft werden, wenn rekursiv gezählt wird. Wenn diese Anzahl überschritten wird, wird die Anzahl der Dokumente und Unterordner in der Ordner Ansicht geschätzt.', 'settings_maxSizeForFullText' => 'Maximale Dateigröße für sofortige Indezierung', 'settings_maxSizeForFullText_desc' => 'Alle neuen Versionen eines Dokuments, die kleiner als die konfigurierte Dateigröße in Bytes sind, werden sofort indiziert. In allen anderen Fällen werden nur die Metadaten erfasst.', +'settings_maxUploadSize' => 'Maximale Größe hochzuladener Dateien', +'settings_maxUploadSize_desc' => 'Dies ist die maximale Größe einer hochzuladenen Datei. Es begrenzt sowohl Dokumentenversionen als auch Anhänge.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc index fd1a3b179..45d441f83 100644 --- a/languages/el_GR/lang.inc +++ b/languages/el_GR/lang.inc @@ -404,14 +404,14 @@ $text = array( 'expired' => 'Έχει λήξει', 'expired_at_date' => '', 'expires' => 'Λήγει', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Η ημερομηνία λήξης έχει αλλάξει', 'expiry_changed_email_body' => '', 'expiry_changed_email_subject' => '', @@ -1090,6 +1090,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e9489c6fa..890c3620c 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 (1528), dgrutsch (9), netixw (14) +// Translators: Admin (1530), dgrutsch (9), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -466,14 +466,14 @@ The link is valid until [valid].', 'expired' => 'Expired', 'expired_at_date' => 'Expired at [datetime]', 'expires' => 'Expires', -'expires_today' => 'Expires today', -'expires_tomorrow' => 'Expires tomorrow', 'expire_by_date' => 'Expires by date', 'expire_in_1d' => 'Expires in 1 day', 'expire_in_1h' => 'Expires in 1h', 'expire_in_1m' => 'Expires in 1 month', 'expire_in_1w' => 'Expires in 1 week', 'expire_in_2h' => 'Expires in 2h', +'expire_today' => 'Expires today', +'expire_tomorrow' => 'Expires tomorrow', 'expiry_changed_email' => 'Expiry date changed', 'expiry_changed_email_body' => 'Expiry date changed Document: [name] @@ -1272,6 +1272,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.', 'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing', 'settings_maxSizeForFullText_desc' => 'All new document version smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', +'settings_maxUploadSize' => 'Maxium size for uploaded files', +'settings_maxUploadSize_desc' => 'This is the maximum size for uploaded files. It will take affect for document versions and attachments.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 5c86e828e..57c1bcd7f 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -456,14 +456,14 @@ URL: [url]', 'expired' => 'Caducado', 'expired_at_date' => '', 'expires' => 'Caduca', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Fecha de caducidad modificada', 'expiry_changed_email_body' => 'Fecha de caducidad modificada Documento: [name] @@ -1229,6 +1229,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.', 'settings_maxSizeForFullText' => 'Tamaño máximo del fichero para el indexado inmediato', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index b314f1f60..35537937e 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -461,14 +461,14 @@ URL: [url]', 'expired' => 'Expiré', 'expired_at_date' => '', 'expires' => 'Expiration', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Date d\'expiration modifiée', 'expiry_changed_email_body' => 'Date d\'expiration modifiée Document : [name] @@ -1217,6 +1217,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Nombre maximum de documents et répertoires dont l\'accès sera vérifié, lors d\'un décompte récursif. Si ce nombre est dépassé, le nombre de documents et répertoires affichés sera approximé.', 'settings_maxSizeForFullText' => 'Taille maximum pour l\'indexation instantanée', 'settings_maxSizeForFullText_desc' => 'Toute nouvelle version d\'un document plus petite que la taille configurée sera intégralement indexée juste après l\'upload. Dans tous les autres cas, seulement les métadonnées seront indexées.', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index f6e5b3bb3..09f30f954 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -461,14 +461,14 @@ Internet poveznica: [url]', 'expired' => 'Isteklo', 'expired_at_date' => '', 'expires' => 'Datum isteka', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Promijenjen datum isteka', 'expiry_changed_email_body' => 'Promijenjen datum isteka Dokument: [name] @@ -1250,6 +1250,8 @@ Internet poveznica: [url]', 'settings_maxRecursiveCount_desc' => 'To je maksimalni broj dokumenata ili mapa koji će biti označen pristupnim pravima, pri rekurzivnom brojanju objekata. Ako se taj broj premaši, broj dokumenata i mapa u pregledu mape će biti procjenjen.', 'settings_maxSizeForFullText' => 'Maksimalna veličina dokumenta za instant indeksiranje', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 0ebee6cab..e51701e1a 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -456,14 +456,14 @@ URL: [url]', 'expired' => 'Lejárt', 'expired_at_date' => '', 'expires' => 'Lejárat', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Lejárati dátum módosítva', 'expiry_changed_email_body' => 'Lejárati dátum módosult Dokumentum: [name] @@ -1228,6 +1228,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'A dokumentumok és mappák maximális mennyisége amelyeken ellenőrizni fogják a hozzáférési jogokat, ha rekurzívan számláló tárgyakat. Ha ezt az értéket túllépik, a dokumentumok számát és mappák a Mappa nézetben is becsülhetők.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index b0e077d50..b75aec9c2 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -462,14 +462,14 @@ URL: [url]', 'expired' => 'Scaduto', 'expired_at_date' => '', 'expires' => 'Scadenza', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Scadenza cambiata', 'expiry_changed_email_body' => 'Data di scadenza cambiata Documento: [name] @@ -1262,6 +1262,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.', 'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea', 'settings_maxSizeForFullText_desc' => 'Tutte le nuove versioni dei documenti più in basso della dimensione configurata saranno completamente indicizzati dopo il caricamento. In tutti gli altri casi sarà indicizzato solo i metadati.', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index d2cfe2517..b3dbc3c27 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -461,14 +461,14 @@ URL: [url]', 'expired' => '만료', 'expired_at_date' => '', 'expires' => '만료', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => '유효 기간 변경', 'expiry_changed_email_body' => '유효 기간이 변경 문서: [name] @@ -1243,6 +1243,8 @@ URL : [url]', 'settings_maxRecursiveCount_desc' => '이것은 재귀적으로 개체를 셀 때 사용 권한이 확인됩니다 문서 및 폴더의 최대 수입니다. 이 수를 초과하면 폴더보기에서 문서 나 폴더의 수가 추정됩니다.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 5de253f90..43362707d 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -454,14 +454,14 @@ URL: [url]', 'expired' => 'Verlopen', 'expired_at_date' => '', 'expires' => 'Verloopt', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Verloopdatum gewijzigd', 'expiry_changed_email_body' => 'Vervaldatum gewijzigd Document: [name] @@ -1256,6 +1256,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 8a8f4a9f2..2881ac811 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -449,14 +449,14 @@ URL: [url]', 'expired' => 'Wygasłe', 'expired_at_date' => '', 'expires' => 'Wygasa', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Zmieniona data wygaśnięcia', 'expiry_changed_email_body' => 'Zmiana daty wygaśnięcia Dokument: [name] @@ -1208,6 +1208,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 00e27c074..a982c3cbb 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -455,14 +455,14 @@ URL: [url]', 'expired' => 'Expirado', 'expired_at_date' => '', 'expires' => 'Expira', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Data de validade mudou', 'expiry_changed_email_body' => 'Data de validade mudou Documento: [name] @@ -1226,6 +1226,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index a965af84e..5e1d1df44 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -461,14 +461,14 @@ URL: [url]', 'expired' => 'Expirat', 'expired_at_date' => '', 'expires' => 'Expiră', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Data de expirare schimbată', 'expiry_changed_email_body' => 'Data de expirare schimbată Document: [name] @@ -1251,6 +1251,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Acesta este numărul maxim de documente sau foldere care vor fi verificate pentru drepturile de acces, atunci când se numără recursiv obiectele. Dacă acest număr este depășit, numărul de documente și foldere în vizualizarea directorului va fi estimat.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 330ee2bb1..4a0373247 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -461,14 +461,14 @@ URL: [url]', 'expired' => 'Срок действия вышел', 'expired_at_date' => '', 'expires' => 'Срок действия', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Срок действия изменен', 'expiry_changed_email_body' => 'Срок действия изменен Документ: [name] @@ -1258,6 +1258,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.', 'settings_maxSizeForFullText' => 'Макс. размер документа для индексирования на лету', 'settings_maxSizeForFullText_desc' => 'Размер документа, который может быть индексирован срузу после добавления', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 1c96a6b76..33e4005a0 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -408,14 +408,14 @@ URL: [url]', 'expired' => 'Platnosť vypršala', 'expired_at_date' => '', 'expires' => 'Platnosť vyprší', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Datum platnosti zmeneny', 'expiry_changed_email_body' => '', 'expiry_changed_email_subject' => '', @@ -1083,6 +1083,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 49213f7d5..d27a69344 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -449,14 +449,14 @@ URL: [url]', 'expired' => 'Har gått ut', 'expired_at_date' => '', 'expires' => 'Kommer att gå ut', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Utgångsdatum ändrat', 'expiry_changed_email_body' => 'Utgångsdatum ändrat Dokument: [name] @@ -1214,6 +1214,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Detta är maximum antal av dokument eller katalog som kommer att testas om att det har korrekt rättigheter, när objekt räknas rekursiv. Om detta nummer överskrids, kommer antalet av dokument och katalog i katalogvyn bara bli uppskattat.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index d2c97e51c..a8f6af9ae 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -455,14 +455,14 @@ URL: [url]', 'expired' => 'Süresi doldu', 'expired_at_date' => '', 'expires' => 'Süresinin dolacağı zaman', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Süresinin dolacağı tarihi değişti', 'expiry_changed_email_body' => 'Bitiş tarihi değişti Doküman: [name] @@ -1230,6 +1230,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 5a48482aa..1c8a6cd1d 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -461,14 +461,14 @@ URL: [url]', 'expired' => 'Термін виконання вийшов', 'expired_at_date' => '', 'expires' => 'Термін виконання виходить', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => 'Дату терміну виконання змінено', 'expiry_changed_email_body' => 'Змінено дату терміну виконання Документ: [name] @@ -1251,6 +1251,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 57cd087a8..9f4a21057 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -410,14 +410,14 @@ URL: [url]', 'expired' => '过期', 'expired_at_date' => '', 'expires' => '有效限期', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => '到期日子已改变', 'expiry_changed_email_body' => '', 'expiry_changed_email_subject' => '', @@ -1085,6 +1085,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '通知设置', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 0a032e49b..b288b635c 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -408,14 +408,14 @@ URL: [url]', 'expired' => '過期', 'expired_at_date' => '', 'expires' => '有效限期', -'expires_today' => '', -'expires_tomorrow' => '', 'expire_by_date' => '', 'expire_in_1d' => '', 'expire_in_1h' => '', 'expire_in_1m' => '', 'expire_in_1w' => '', 'expire_in_2h' => '', +'expire_today' => '', +'expire_tomorrow' => '', 'expiry_changed_email' => '到期日子已改變', 'expiry_changed_email_body' => '', 'expiry_changed_email_subject' => '', @@ -1083,6 +1083,8 @@ URL: [url]', 'settings_maxRecursiveCount_desc' => '', 'settings_maxSizeForFullText' => '', 'settings_maxSizeForFullText_desc' => '', +'settings_maxUploadSize' => '', +'settings_maxUploadSize_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', diff --git a/op/op.Settings.php b/op/op.Settings.php index a82d7b0c7..e45084733 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -112,6 +112,7 @@ if ($action == "saveSettings") $settings->_logFileRotation = $_POST["logFileRotation"]; $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload"); $settings->_partitionSize = $_POST["partitionSize"]; + $settings->_maxUploadSize = $_POST["maxUploadSize"]; // SETTINGS - SYSTEM - AUTHENTICATION $settings->_enableGuestLogin = getBoolValue("enableGuestLogin"); diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css index ea8dc1835..0f2a2d9e0 100644 --- a/styles/bootstrap/application.css +++ b/styles/bootstrap/application.css @@ -252,6 +252,9 @@ ul.qq-upload-list li span { border: 1px solid #cccccc; border-radius: 4px; } +.qq-hide, .qq-uploader dialog { + display: none; +} @media (max-width: 480px) { .nav-tabs > li { diff --git a/styles/bootstrap/fine-uploader/fine-uploader.js b/styles/bootstrap/fine-uploader/fine-uploader.js index f8030b1a8..ab3025ea1 100644 --- a/styles/bootstrap/fine-uploader/fine-uploader.js +++ b/styles/bootstrap/fine-uploader/fine-uploader.js @@ -7411,4 +7411,4 @@ }); }; })(window); -//# sourceMappingURL=fine-uploader.js.map \ No newline at end of file +//# sourceMappingURL=fine-uploader.js.map diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index cf06bc0a3..4348e4823 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -34,11 +34,12 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ $dropfolderdir = $this->params['dropfolderdir']; $partitionsize = $this->params['partitionsize']; + $maxuploadsize = $this->params['maxuploadsize']; $enablelargefileupload = $this->params['enablelargefileupload']; header('Content-Type: application/javascript; charset=UTF-8'); if($enablelargefileupload) - $this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize); + $this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize); ?> $(document).ready(function() { $('#new-file').click(function(event) { @@ -146,8 +147,10 @@ $(document).ready(function() { $folderid = $folder->getId(); $this->htmlAddHeader(''."\n", 'js'); - if($enablelargefileupload) + if($enablelargefileupload) { $this->htmlAddHeader(''."\n", 'js'); + $this->htmlAddHeader($this->getFineUploaderTemplate(), 'js'); + } $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); $this->globalNavigation($folder); diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php index 8804ee128..063daaf60 100644 --- a/views/bootstrap/class.AddFile.php +++ b/views/bootstrap/class.AddFile.php @@ -34,9 +34,10 @@ class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ $enablelargefileupload = $this->params['enablelargefileupload']; $partitionsize = $this->params['partitionsize']; + $maxuploadsize = $this->params['maxuploadsize']; header('Content-Type: application/javascript'); if($enablelargefileupload) - $this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize); + $this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize); ?> $(document).ready( function() { @@ -119,8 +120,10 @@ $(document).ready( function() { $enablelargefileupload = $this->params['enablelargefileupload']; $this->htmlAddHeader(''."\n", 'js'); - if($enablelargefileupload) + if($enablelargefileupload) { $this->htmlAddHeader(''."\n", 'js'); + $this->htmlAddHeader($this->getFineUploaderTemplate(), 'js'); + } $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); $this->globalNavigation($folder); diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php index 55c6926f9..84f9ef0e6 100644 --- a/views/bootstrap/class.ApprovalSummary.php +++ b/views/bootstrap/class.ApprovalSummary.php @@ -88,9 +88,9 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $previewer->createPreview($version); print ""; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } print ""; print "".htmlspecialchars($document->getName()).""; @@ -142,9 +142,9 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { $previewer->createPreview($version); print ""; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } print ""; print "".htmlspecialchars($document->getName()).""; diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1bb349d01..ca0e03af2 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -808,74 +808,74 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function getMimeIcon($fileType) { /* {{{ */ // for extension use LOWER CASE only $icons = array(); - $icons["txt"] = "txt.png"; - $icons["text"] = "txt.png"; - $icons["doc"] = "word.png"; - $icons["dot"] = "word.png"; - $icons["docx"] = "word.png"; - $icons["dotx"] = "word.png"; - $icons["rtf"] = "document.png"; - $icons["xls"] = "excel.png"; - $icons["xlt"] = "excel.png"; - $icons["xlsx"] = "excel.png"; - $icons["xltx"] = "excel.png"; - $icons["ppt"] = "powerpoint.png"; - $icons["pot"] = "powerpoint.png"; - $icons["pptx"] = "powerpoint.png"; - $icons["potx"] = "powerpoint.png"; - $icons["exe"] = "binary.png"; - $icons["html"] = "html.png"; - $icons["htm"] = "html.png"; - $icons["gif"] = "image.png"; - $icons["jpg"] = "image.png"; - $icons["jpeg"] = "image.png"; - $icons["bmp"] = "image.png"; - $icons["png"] = "image.png"; - $icons["tif"] = "image.png"; - $icons["tiff"] = "image.png"; + $icons["txt"] = "text-x-preview.svg"; + $icons["text"] = "text-x-preview.svg"; + $icons["doc"] = "office-document.svg"; + $icons["dot"] = "office-document.svg"; + $icons["docx"] = "office-document.svg"; + $icons["dotx"] = "office-document.svg"; + $icons["rtf"] = "office-document.svg"; + $icons["xls"] = "office-spreadsheet.svg"; + $icons["xlt"] = "office-spreadsheet.svg"; + $icons["xlsx"] = "office-spreadsheet.svg"; + $icons["xltx"] = "office-spreadsheet.svg"; + $icons["ppt"] = "office-presentation.svg"; + $icons["pot"] = "office-presentation.svg"; + $icons["pptx"] = "office-presentation.svg"; + $icons["potx"] = "office-presentation.svg"; + $icons["exe"] = "executable.svg"; + $icons["html"] = "web.svg"; + $icons["htm"] = "web.svg"; + $icons["gif"] = "image.svg"; + $icons["jpg"] = "image.svg"; + $icons["jpeg"] = "image.svg"; + $icons["bmp"] = "image.svg"; + $icons["png"] = "image.svg"; + $icons["tif"] = "image.svg"; + $icons["tiff"] = "image.svg"; $icons["log"] = "log.png"; - $icons["midi"] = "midi.png"; + $icons["midi"] = "audio.svg"; $icons["pdf"] = "pdf.png"; - $icons["wav"] = "sound.png"; - $icons["mp3"] = "sound.png"; + $icons["wav"] = "audio.svg"; + $icons["mp3"] = "audio.svg"; $icons["c"] = "source_c.png"; $icons["cpp"] = "source_cpp.png"; $icons["h"] = "source_h.png"; $icons["java"] = "source_java.png"; $icons["py"] = "source_py.png"; - $icons["tar"] = "tar.png"; + $icons["tar"] = "package.svg"; $icons["gz"] = "gz.png"; $icons["7z"] = "gz.png"; $icons["bz"] = "gz.png"; $icons["bz2"] = "gz.png"; $icons["tgz"] = "gz.png"; - $icons["zip"] = "gz.png"; + $icons["zip"] = "package.svg"; $icons["rar"] = "gz.png"; - $icons["mpg"] = "video.png"; - $icons["avi"] = "video.png"; + $icons["mpg"] = "video.svg"; + $icons["avi"] = "video.svg"; $icons["tex"] = "tex.png"; - $icons["ods"] = "x-office-spreadsheet.png"; - $icons["ots"] = "x-office-spreadsheet.png"; - $icons["sxc"] = "x-office-spreadsheet.png"; - $icons["stc"] = "x-office-spreadsheet.png"; - $icons["odt"] = "x-office-document.png"; - $icons["ott"] = "x-office-document.png"; - $icons["sxw"] = "x-office-document.png"; - $icons["stw"] = "x-office-document.png"; - $icons["odp"] = "ooo_presentation.png"; - $icons["otp"] = "ooo_presentation.png"; - $icons["sxi"] = "ooo_presentation.png"; - $icons["sti"] = "ooo_presentation.png"; - $icons["odg"] = "ooo_drawing.png"; - $icons["otg"] = "ooo_drawing.png"; - $icons["sxd"] = "ooo_drawing.png"; - $icons["std"] = "ooo_drawing.png"; + $icons["ods"] = "office-spreadsheet.svg"; + $icons["ots"] = "office-spreadsheet.svg"; + $icons["sxc"] = "office-spreadsheet.svg"; + $icons["stc"] = "office-spreadsheet.svg"; + $icons["odt"] = "office-document.svg"; + $icons["ott"] = "office-document.svg"; + $icons["sxw"] = "office-document.svg"; + $icons["stw"] = "office-document.svg"; + $icons["odp"] = "office-presentation.svg"; + $icons["otp"] = "office-presentation.svg"; + $icons["sxi"] = "office-presentation.svg"; + $icons["sti"] = "office-presentation.svg"; + $icons["odg"] = "office-drawing.png"; + $icons["otg"] = "office-drawing.png"; + $icons["sxd"] = "office-drawing.png"; + $icons["std"] = "office-drawing.png"; $icons["odf"] = "ooo_formula.png"; $icons["sxm"] = "ooo_formula.png"; $icons["smf"] = "ooo_formula.png"; $icons["mml"] = "ooo_formula.png"; - $icons["default"] = "default.png"; + $icons["default"] = "text-x-preview.svg"; //"default.png"; $ext = strtolower(substr($fileType, 1)); if (isset($icons[$ext])) { @@ -1509,7 +1509,7 @@ $(function() { $comment = $folder->getComment(); if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; $content .= "getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; - $content .= "getID()."&showtree=".showtree()."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."&showtree=".showtree()."\">imgpath."folder.svg\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . ""; if($comment) { $content .= "
".htmlspecialchars($comment).""; @@ -1539,13 +1539,13 @@ $(function() { if (file_exists($dms->contentDir . $latestContent->getPath())) { $content .= ""; if($previewer->hasPreview($latestContent)) { - $content .= "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } $content .= ""; } else - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; $content .= "" . htmlspecialchars($document->getName()) . ""; if($comment) { @@ -1935,13 +1935,13 @@ $(document).ready( function() { if (file_exists($dms->contentDir . $latestContent->getPath())) { $content .= ""; if($previewer->hasPreview($latestContent)) { - $content .= "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getMimeIcon($latestContent->getFileType())."\" ".($previewwidth ? "width=\"".$previewwidth."\"" : "")."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } $content .= ""; } else - $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; $content .= ""; $content .= ""; @@ -2017,7 +2017,7 @@ $(document).ready( function() { $content = ''; $content .= "getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; // $content .= ""; - $content .= "getID()."\" draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">imgpath."folder.png\" width=\"24\" height=\"24\" border=0>\n"; + $content .= "getID()."\" draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">imgpath."folder.svg\" width=\"24\" height=\"24\" border=0>\n"; $content .= "getID()."\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . ""; $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $subFolder->getDate()).""; if($comment) { @@ -2382,6 +2382,71 @@ mayscript> parent::show(); } /* }}} */ + /** + * Return HTML Template for jumploader + * + * @param string $uploadurl URL where post data is send + * @param integer $folderid id of folder where document is saved + * @param integer $maxfiles maximum number of files allowed to upload + * @param array $fields list of post fields + */ + function getFineUploaderTemplate() { /* {{{ */ + return ' + +'; + } /* }}} */ + /** * Output HTML Code for jumploader * @@ -2392,58 +2457,6 @@ mayscript> */ function printFineUploaderHtml() { /* {{{ */ ?> -
@@ -2458,22 +2471,31 @@ mayscript> * @param integer $maxfiles maximum number of files allowed to upload * @param array $fields list of post fields */ - function printFineUploaderJs($uploadurl, $partsize=0, $multiple=true) { /* {{{ */ + function printFineUploaderJs($uploadurl, $partsize=0, $maxuploadsize=0, $multiple=true) { /* {{{ */ ?> $(document).ready(function() { manualuploader = new qq.FineUploader({ - debug: true, + debug: false, autoUpload: false, multiple: , element: $('#manual-fine-uploader')[0], + template: 'qq-template', request: { endpoint: '' }, + 0 ? ' + validation: { + sizeLimit: '.$maxuploadsize.' + }, +' : ''); ?> chunking: { enabled: true, mandatory: true }, + messages: { + sizeError: '{file} is too large, maximum file size is {sizeLimit}.' + }, callbacks: { onComplete: function(id, name, json, xhr) { }, diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php index bdb19ad2c..78cbec64d 100644 --- a/views/bootstrap/class.DropFolderChooser.php +++ b/views/bootstrap/class.DropFolderChooser.php @@ -83,7 +83,7 @@ $('.folderselect').click(function(ev) { $previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype); echo ""; if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) { - echo ""; + echo ""; } echo "".$entry."".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."\n"; } elseif($showfolders && is_dir($dir.'/'.$entry)) { diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php index 06a2874e8..be7d35178 100644 --- a/views/bootstrap/class.ManageNotify.php +++ b/views/bootstrap/class.ManageNotify.php @@ -114,9 +114,9 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style { print "\n"; print ""; if($previewer->hasPreview($latest)) { - print "previewwidth."\"src=\"../op/op.Preview.php?documentid=".$doc->getID()."&version=".$latest->getVersion()."&width=".$this->previewwidth."\" title=\"".htmlspecialchars($latest->getMimeType())."\">"; + print "previewwidth."\" src=\"../op/op.Preview.php?documentid=".$doc->getID()."&version=".$latest->getVersion()."&width=".$this->previewwidth."\" title=\"".htmlspecialchars($latest->getMimeType())."\">"; } else { - print "getMimeIcon($latest->getFileType())."\" title=\"".htmlspecialchars($latest->getMimeType())."\">"; + print "previewwidth."\" src=\"".$this->getMimeIcon($latest->getFileType())."\" title=\"".htmlspecialchars($latest->getMimeType())."\">"; } print ""; diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index d6b3d8894..6f9e672e1 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -174,9 +174,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; @@ -212,9 +212,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; @@ -262,9 +262,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; @@ -297,9 +297,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"]).""; @@ -389,9 +389,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "" . htmlspecialchars($res["name"]) . "\n"; @@ -508,9 +508,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; $workflowstate = $latestContent->getWorkflowState(); @@ -550,9 +550,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"]).""; @@ -633,9 +633,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "" . htmlspecialchars($res["name"]) . "\n"; @@ -714,9 +714,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "" . htmlspecialchars($res["name"]) . "\n"; @@ -817,9 +817,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } print ""; print "" . htmlspecialchars($res["name"]) . "\n"; diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php index 879cdc3e0..c25e88919 100644 --- a/views/bootstrap/class.ReviewSummary.php +++ b/views/bootstrap/class.ReviewSummary.php @@ -90,9 +90,9 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { $previewer->createPreview($version); print ""; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } print ""; print "".htmlspecialchars($document->getName()).""; @@ -144,9 +144,9 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { $previewer->createPreview($version); print ""; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } print ""; print "".htmlspecialchars($document->getName()).""; diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index a27fda139..22d44a59e 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -495,9 +495,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { } print "getID()."\">"; if($previewer->hasPreview($lc)) { - print "getID()."&version=".$lc->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; + print "getID()."&version=".$lc->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; } else { - print "getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; + print "getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; } print ""; print "getID()."\">/"; diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index ea3245e56..614e48f50 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -411,6 +411,10 @@ if(!is_writeable($settings->_configFilePath)) { : showTextField("partitionSize", $settings->_partitionSize); ?> + "> + : + showTextField("maxUploadSize", $settings->_maxUploadSize); ?> + diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index 8a1bb532c..dbc189f74 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -36,13 +36,14 @@ class SeedDMS_View_UpdateDocument extends SeedDMS_Bootstrap_Style { $dropfolderdir = $this->params['dropfolderdir']; $enablelargefileupload = $this->params['enablelargefileupload']; $partitionsize = $this->params['partitionsize']; + $maxuploadsize = $this->params['maxuploadsize']; header('Content-Type: application/javascript'); $this->printDropFolderChooserJs("form1"); $this->printSelectPresetButtonJs(); $this->printInputPresetButtonJs(); $this->printCheckboxPresetButtonJs(); if($enablelargefileupload) - $this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, false); + $this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, false); ?> $(document).ready( function() { jQuery.validator.addMethod("alternatives", function(value, element, params) { @@ -129,6 +130,7 @@ console.log(element); $document = $this->params['document']; $strictformcheck = $this->params['strictformcheck']; $enablelargefileupload = $this->params['enablelargefileupload']; + $maxuploadsize = $this->params['maxuploadsize']; $enableadminrevapp = $this->params['enableadminrevapp']; $enableownerrevapp = $this->params['enableownerrevapp']; $enableselfrevapp = $this->params['enableselfrevapp']; @@ -138,8 +140,10 @@ console.log(element); $documentid = $document->getId(); $this->htmlAddHeader(''."\n", 'js'); - if($enablelargefileupload) + if($enablelargefileupload) { $this->htmlAddHeader(''."\n", 'js'); + $this->htmlAddHeader($this->getFineUploaderTemplate(), 'js'); + } $this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName())))); $this->globalNavigation($folder); @@ -182,8 +186,14 @@ console.log(element); } } - $msg = getMLText("max_upload_size").": ".ini_get( "upload_max_filesize"); if($enablelargefileupload) { + if($maxuploadsize) { + $msg = getMLText("max_upload_size").": ".SeedDMS_Core_File::format_filesize($maxuploadsize); + } + } else { + $msg = getMLText("max_upload_size").": ".ini_get( "upload_max_filesize"); + } + if(0 && $enablelargefileupload) { $msg .= "

".sprintf(getMLText('link_alt_updatedocument'), "out.AddMultiDocument.php?folderid=".$folder->getID()."&showtree=".showtree())."

"; } $this->warningMsg($msg); diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index fce4265b2..2919aadcd 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -526,7 +526,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($previewer->hasPreview($latestContent)) { print("getID()."&version=".$latestContent->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"); } else { - print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } if ($file_exists) { print ""; @@ -1101,7 +1101,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($previewer->hasPreview($version)) { print("getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">"); } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } if($file_exists) { print "\n"; @@ -1197,7 +1197,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($previewer->hasPreview($file)) { print("getID()."&file=".$file->getID()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($file->getMimeType())."\">"); } else { - print "getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">"; + print "getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">"; } if($file_exists) { print ""; @@ -1263,9 +1263,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; print "getID()."&version=".$targetlc->getVersion()."\">"; if($previewer->hasPreview($targetlc)) { - print "getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">"; + print "getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">"; } else { - print "getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">"; + print "getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">"; } print ""; print "getID()."\" class=\"linklist\">".htmlspecialchars($targetDoc->getName()).""; @@ -1334,9 +1334,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print ""; print "getID()."&version=".$sourcelc->getVersion()."\">"; if($previewer->hasPreview($sourcelc)) { - print "getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">"; + print "getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">"; } else { - print "getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">"; + print "getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">"; } print ""; print "getID()."\" class=\"linklist\">".htmlspecialchars($sourceDoc->getName()).""; diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php index ba482b8c0..7b128b314 100644 --- a/views/bootstrap/class.WorkflowSummary.php +++ b/views/bootstrap/class.WorkflowSummary.php @@ -88,9 +88,9 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { print "\n"; print "getID()."&version=".$st['version']."\">"; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } print ""; print "".htmlspecialchars($document->getName()); @@ -145,9 +145,9 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { print "\n"; print "getID()."&version=".$st['version']."\">"; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } print ""; print "".htmlspecialchars($document->getName()).""; diff --git a/views/bootstrap/images/audio.svg b/views/bootstrap/images/audio.svg new file mode 100644 index 000000000..31cc0e30f --- /dev/null +++ b/views/bootstrap/images/audio.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/views/bootstrap/images/executable.svg b/views/bootstrap/images/executable.svg new file mode 100644 index 000000000..c7c5b9841 --- /dev/null +++ b/views/bootstrap/images/executable.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Executable + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + executable + program + binary + bin + script + shell + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/folder.svg b/views/bootstrap/images/folder.svg new file mode 100644 index 000000000..78976e25c --- /dev/null +++ b/views/bootstrap/images/folder.svg @@ -0,0 +1,287 @@ + + + + + + + image/svg+xml + + Folder + + + Jakub Steiner + + + 2005-02-01 + + http://jimmac.musichall.cz/ + + + folder + directory + storage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/image.svg b/views/bootstrap/images/image.svg new file mode 100644 index 000000000..9e92eeba5 --- /dev/null +++ b/views/bootstrap/images/image.svg @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Generic Image + + + Lapo Calamandrei + + + http://www.gnome.org + + + Jakub Steiner, Andreas Nilsson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/office-document.svg b/views/bootstrap/images/office-document.svg new file mode 100644 index 000000000..420e1fec1 --- /dev/null +++ b/views/bootstrap/images/office-document.svg @@ -0,0 +1,740 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Rich Text + + + rich + text + document + office + word + write + + + + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/office-drawing.svg b/views/bootstrap/images/office-drawing.svg new file mode 100644 index 000000000..a2ae0f680 --- /dev/null +++ b/views/bootstrap/images/office-drawing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/views/bootstrap/images/office-presentation.svg b/views/bootstrap/images/office-presentation.svg new file mode 100644 index 000000000..8ded5a238 --- /dev/null +++ b/views/bootstrap/images/office-presentation.svg @@ -0,0 +1,686 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + Presentation + + + Based of Hylke Bons Work + + + + + + presentation + slides + powerpoint + spreadsheet + impress + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/office-spreadsheet.svg b/views/bootstrap/images/office-spreadsheet.svg new file mode 100644 index 000000000..e486e3702 --- /dev/null +++ b/views/bootstrap/images/office-spreadsheet.svg @@ -0,0 +1,972 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Office Spreadsheet + + + spreadsheet + excel + gnumeric + opencalc + office + + + + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/package.svg b/views/bootstrap/images/package.svg new file mode 100644 index 000000000..73a17b7e2 --- /dev/null +++ b/views/bootstrap/images/package.svg @@ -0,0 +1,356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Package + + + Jakub Steiner + + + http://jimmac.musichall.cz/ + + + package + archive + tarball + tar + bzip + gzip + zip + arj + tar + jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/text-x-preview.svg b/views/bootstrap/images/text-x-preview.svg new file mode 100644 index 000000000..909c970d0 --- /dev/null +++ b/views/bootstrap/images/text-x-preview.svg @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Text Preview + + + text + plaintext + regular + document + + + + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/bootstrap/images/video.svg b/views/bootstrap/images/video.svg new file mode 100644 index 000000000..fb22e197a --- /dev/null +++ b/views/bootstrap/images/video.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/views/bootstrap/images/web.svg b/views/bootstrap/images/web.svg new file mode 100644 index 000000000..4c7c3098e --- /dev/null +++ b/views/bootstrap/images/web.svg @@ -0,0 +1,1015 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Web Browser + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +