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

inc/inc.ClassEmailNotify.php

@@ -141,7 +141,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) { /* {{{ */
 		if ((!is_object($sender) && strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) ||
 				(!is_object($groupRecipient) || strcasecmp(get_class($groupRecipient), $this->_dms->getClassname('group')))) {
-			return -1;
+			return false;
 		}
 
 		foreach ($groupRecipient->getUsers() as $recipient) {
@@ -154,7 +154,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	function toList($sender, $recipients, $subject, $message, $params=array()) { /* {{{ */
 		if ((!is_object($sender) && strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) ||
 				(!is_array($recipients) && count($recipients)==0)) {
-			return -1;
+			return false;
 		}
 
 		foreach ($recipients as $recipient) {

inc/inc.ClassNotificationService.php

@@ -36,19 +36,19 @@ class SeedDMS_NotificationService {
 
 	public function toIndividual($sender, $recipient, $subject, $message, $params=array()) {
 		foreach($this->services as $service) {
-			$service->toIndividual($sender, $recipient, $subject, $message, $params);
+			return $service->toIndividual($sender, $recipient, $subject, $message, $params);
 		}
 	}
 
 	public function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) {
 		foreach($this->services as $service) {
-			$service->toGroup($sender, $groupRecipient, $subject, $message, $params);
+			return $service->toGroup($sender, $groupRecipient, $subject, $message, $params);
 		}
 	}
 
 	public function toList($sender, $recipients, $subject, $message, $params=array()) {
 		foreach($this->services as $service) {
-			$service->toList($sender, $recipients, $subject, $message, $params);
+			return $service->toList($sender, $recipients, $subject, $message, $params);
 		}
 	}
 

languages/ar_EG/lang.inc

@@ -1274,6 +1274,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => '',
 'settings_enableVersionModification' => '',
 'settings_enableVersionModification_desc' => '',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '',
 'settings_encryptionKey_desc' => '',
 'settings_error' => 'خطأ',
@@ -1407,6 +1409,8 @@ URL: [url]',
 'settings_smtpPort_desc' => '',
 'settings_smtpSendFrom' => '',
 'settings_smtpSendFrom_desc' => '',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => '',
 'settings_smtpServer_desc' => '',
 'settings_smtpUser' => '',
@@ -1452,6 +1456,7 @@ URL: [url]',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => 'الملفات التى يمكن عرضها اونلاين',
 'settings_viewOnlineFileTypes_desc' => '',
+'settings_webdav' => '',
 'settings_workflowMode' => 'حالة مسار العمل',
 'settings_workflowMode_desc' => '',
 'settings_workflowMode_valadvanced' => 'متقدم',

languages/bg_BG/lang.inc

@@ -1137,6 +1137,8 @@ $text = array(
 'settings_enableVersionDeletion_desc' => 'Разреши/забрани изтриване на предишни версии на документ от обикновен потребител. Администраторите могат винаги да трият стари версии.',
 'settings_enableVersionModification' => 'Разреши промяна на версиите',
 'settings_enableVersionModification_desc' => 'Разреши/забрани промяната на версия на документ от обикновен потребител след като версията е качена. Администраторите могат винаги да променят версията след качване.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Кодиращ ключ',
 'settings_encryptionKey_desc' => 'Този стринг се използва за създаване на уникален идентификатор, който добавен като невидимо поле към формуляр, предотвратява CSRF атаки.',
 'settings_error' => 'Грешка',
@@ -1270,6 +1272,8 @@ $text = array(
 'settings_smtpPort_desc' => 'Порт на SMTP сървъра, по подразбиране 25',
 'settings_smtpSendFrom' => 'От',
 'settings_smtpSendFrom_desc' => 'Изпратено от',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP Хост',
 'settings_smtpServer_desc' => 'SMTP Хост',
 'settings_smtpUser' => '',
@@ -1315,6 +1319,7 @@ $text = array(
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => 'Тип файлове за разглеждане онлайн',
 'settings_viewOnlineFileTypes_desc' => 'Файлове с едно от следните разширения могат да се разглеждат онлайн (само малки букви)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Вид процес',
 'settings_workflowMode_desc' => 'Специален/advanced процес позволява да зададете Ваш специфичен процес за версия на документ.',
 'settings_workflowMode_valadvanced' => 'advanced',

languages/ca_ES/lang.inc

@@ -1142,6 +1142,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => '',
 'settings_enableVersionModification' => '',
 'settings_enableVersionModification_desc' => '',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '',
 'settings_encryptionKey_desc' => '',
 'settings_error' => 'Error',
@@ -1275,6 +1277,8 @@ URL: [url]',
 'settings_smtpPort_desc' => '',
 'settings_smtpSendFrom' => '',
 'settings_smtpSendFrom_desc' => '',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => '',
 'settings_smtpServer_desc' => '',
 'settings_smtpUser' => '',
@@ -1320,6 +1324,7 @@ URL: [url]',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => 'View Online File Types',
 'settings_viewOnlineFileTypes_desc' => 'Files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)',
+'settings_webdav' => '',
 'settings_workflowMode' => '',
 'settings_workflowMode_desc' => '',
 'settings_workflowMode_valadvanced' => '',

languages/cs_CZ/lang.inc

@@ -1283,6 +1283,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Povolit/zakázat odstranění předchozích verzí dokumentů běžným uživatelům. Administrátor může odstranit staré verze kdykoliv.',
 'settings_enableVersionModification' => 'Povolit změnu verze',
 'settings_enableVersionModification_desc' => 'Povolit/zakázat úpravu verze dokumentu běžnému uživateli po té, co byla verze nahrána. Administrátor může vždy změnit verzi po nahrání.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Encryption key',
 'settings_encryptionKey_desc' => 'This string is used for creating a unique identifier being added as a hidden field to a formular in order to prevent CSRF attacks.',
 'settings_error' => 'Error',
@@ -1416,6 +1418,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'SMTP Server port, default 25',
 'settings_smtpSendFrom' => 'Send from',
 'settings_smtpSendFrom_desc' => 'Send from',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP Server hostname',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => 'Uživatel SMTP serveru',
@@ -1461,6 +1465,7 @@ URL: [url]',
 'settings_versiontolow' => 'Příliš nízká verze',
 'settings_viewOnlineFileTypes' => 'View Online File Types',
 'settings_viewOnlineFileTypes_desc' => 'Files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Režim pracovního postupu',
 'settings_workflowMode_desc' => 'Pokročilý pracovní postup umožňuje zadat vaše vlastní pracovní postupy pro uvolňování verzí dokumentů.',
 'settings_workflowMode_valadvanced' => 'pokročilý',

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 (2621), dgrutsch (22)
+//    Translators: Admin (2628), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1363,6 +1363,8 @@ Name: [username]
 'settings_enableVersionDeletion_desc' => 'Setzen Sie diese Option, wenn frühere Versionen eines Dokuments durch reguläre Benutzer gelöscht werden können. Administratoren dürfen dies immer.',
 'settings_enableVersionModification' => 'Erlaube Modifikation von Versionen',
 'settings_enableVersionModification_desc' => 'Setzen Sie diese Option, wenn Versionen eines Dokuments nach dem Hochladen noch durch reguläre Benutzer verändert werden dürfen. Administratoren dürfen dies immer.',
+'settings_enableWebdavReplaceDoc' => 'Dokument beim Speichern ersetzen',
+'settings_enableWebdavReplaceDoc_desc' => 'Wenn eingeschaltet, wird beim Speichern eine bestehende Dokumentenversion ersetzt und keine neue Version erzeugt. Dies erfolgt nur wenn der Benutzer, Mimetype und Dateiname unverändert zur letzten Version sind. Diese Einstellung kann hilfreich sein, wenn Programme das geöffnete Dokument in regelmäßigen Abständen speichern.',
 'settings_encryptionKey' => 'Verschlüsselungs-Sequenz',
 'settings_encryptionKey_desc' => 'Diese Zeichenkette wird verwendet um eine eindeutige Kennung zu erzeugen, die als verstecktes Feld in einem Formular untergebracht wird. Sie dient zur Verhinderung von CSRF-Attacken.',
 'settings_error' => 'Fehler',
@@ -1496,6 +1498,8 @@ Name: [username]
 'settings_smtpPort_desc' => 'SMTP Server Port, voreingestellt ist 25',
 'settings_smtpSendFrom' => 'Absenderadresse',
 'settings_smtpSendFrom_desc' => 'Absenderadresse für herausgehende Mails',
+'settings_smtpSendTestMail' => 'Sende Testmail',
+'settings_smtpSendTestMail_desc' => 'Verschickte eine Testmail, um die akuelle Konfiguration zu testen.',
 'settings_smtpServer' => 'SMTP Server-Hostname',
 'settings_smtpServer_desc' => 'SMTP Server-Hostname',
 'settings_smtpUser' => 'SMTP Server User',
@@ -1541,6 +1545,7 @@ Name: [username]
 'settings_versiontolow' => 'Version zu gering',
 'settings_viewOnlineFileTypes' => 'Dateitypen für Online-Ansicht',
 'settings_viewOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen können Online angeschaut werden (benutzen Sie ausschließlich Kleinbuchstaben).',
+'settings_webdav' => 'WebDAV',
 'settings_workflowMode' => 'Workflow mode',
 'settings_workflowMode_desc' => 'Der erweiterte Workflow-Modes erlaubt es eigene Workflows zu erstellen.',
 'settings_workflowMode_valadvanced' => 'erweitert',

languages/el_GR/lang.inc

@@ -1148,6 +1148,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => '',
 'settings_enableVersionModification' => '',
 'settings_enableVersionModification_desc' => '',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '',
 'settings_encryptionKey_desc' => '',
 'settings_error' => '',
@@ -1281,6 +1283,8 @@ URL: [url]',
 'settings_smtpPort_desc' => '',
 'settings_smtpSendFrom' => '',
 'settings_smtpSendFrom_desc' => '',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => '',
 'settings_smtpServer_desc' => '',
 'settings_smtpUser' => '',
@@ -1326,6 +1330,7 @@ URL: [url]',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => '',
 'settings_viewOnlineFileTypes_desc' => '',
+'settings_webdav' => '',
 'settings_workflowMode' => '',
 'settings_workflowMode_desc' => '',
 'settings_workflowMode_valadvanced' => '',

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 (1739), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1744), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1358,6 +1358,8 @@ Name: [username]
 'settings_enableVersionDeletion_desc' => 'Enable/disable deletion of previous document versions by regular users. Admin may always delete old versions.',
 'settings_enableVersionModification' => 'Enable modification of versions',
 'settings_enableVersionModification_desc' => 'Enable/disable modification of a document versions by regular users after a version was uploaded. Admin may always modify the version after upload.',
+'settings_enableWebdavReplaceDoc' => 'Replace document when saving',
+'settings_enableWebdavReplaceDoc_desc' => 'If enabled, saving a new version of a document will replace the old document instead of creating a new version. This will only apply if the user, mimetype and filename are equal to the last version. This can be usefull when applications are auto saving a document in fixed intervals.',
 'settings_encryptionKey' => 'Encryption key',
 'settings_encryptionKey_desc' => 'This string is used for creating a unique identifier being added as a hidden field to a form in order to prevent CSRF attacks.',
 'settings_error' => 'Error',
@@ -1491,6 +1493,8 @@ Name: [username]
 'settings_smtpPort_desc' => 'SMTP Server port, default 25',
 'settings_smtpSendFrom' => 'Send from',
 'settings_smtpSendFrom_desc' => 'Send from',
+'settings_smtpSendTestMail' => 'Send test mail',
+'settings_smtpSendTestMail_desc' => 'Sends a test mail, for checking the current email configuration.',
 'settings_smtpServer' => 'SMTP Server hostname',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => 'SMTP Server user',
@@ -1536,6 +1540,7 @@ Name: [username]
 'settings_versiontolow' => 'Version to low',
 'settings_viewOnlineFileTypes' => 'View Online File Types',
 'settings_viewOnlineFileTypes_desc' => 'Files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)',
+'settings_webdav' => 'WebDAV',
 'settings_workflowMode' => 'Workflow mode',
 'settings_workflowMode_desc' => 'The advanced workflow allows to specify your own release workflow for document versions.',
 'settings_workflowMode_valadvanced' => 'advanced',

languages/es_ES/lang.inc

@@ -1289,6 +1289,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Habilitar/Deshabilitar la eliminación de versiones anteriores de documentos por parte de usuarios. El administrador siempre podrá eliminar versiones antiguas.',
 'settings_enableVersionModification' => 'Habilitar la modificación de versiones',
 'settings_enableVersionModification_desc' => 'Habilitar/Deshabilitar la modificación de versiones de documentos por parte de usuarios después de añadir una nueva versión. El administrador siempre podrá modificar la versión después de añadida.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Clave de cifrado',
 'settings_encryptionKey_desc' => 'Esta cadena se utiliza para crear un identificador único añadido como campo oculto a formularios para prevenir ataques CSRF.',
 'settings_error' => 'Error',
@@ -1422,6 +1424,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Puerto del servidor SMTP, por defecto 25',
 'settings_smtpSendFrom' => 'Enviar desde',
 'settings_smtpSendFrom_desc' => 'Enviar desde',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Nombre de servidor SMTP',
 'settings_smtpServer_desc' => 'Nombre de servidor SMTP',
 'settings_smtpUser' => 'Usuario del servidor SMTP',
@@ -1467,6 +1471,7 @@ URL: [url]',
 'settings_versiontolow' => 'Versión antigua',
 'settings_viewOnlineFileTypes' => 'Ver en lineas las extensiones de fichero',
 'settings_viewOnlineFileTypes_desc' => 'Archivos con una de las siguientes extensiones se pueden visualizar en linea (UTILICE SOLAMENTE CARACTERES EN MINÚSCULA)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Workflow mode',
 'settings_workflowMode_desc' => 'El flujo de trabajo avanzado permite especificar su propia versión de flujo para las versiones de documento.',
 'settings_workflowMode_valadvanced' => 'avanzado',

languages/fr_FR/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 (1085), jeromerobert (50), lonnnew (9), Oudiceval (687)
+//    Translators: Admin (1086), jeromerobert (50), lonnnew (9), Oudiceval (687)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -538,7 +538,7 @@ URL : [url]',
 'export' => '',
 'extension_archive' => 'Extension',
 'extension_changelog' => 'Journal des modifications',
-'extension_loading' => '',
+'extension_loading' => 'Chargement des extensions',
 'extension_manager' => 'Gestionnaire d\'extensions',
 'extension_mgr_installed' => 'Installées',
 'extension_mgr_no_upload' => 'L’ajout de nouvelles extensions n’est pas possible car le répertoire des extensions n’est pas accessible en écriture.',
@@ -1342,6 +1342,8 @@ Nom : [username]
 'settings_enableVersionDeletion_desc' => 'Active/désactive la suppression des versions antérieures de documents par les utilisateurs normaux. L’administrateur peut toujours supprimer les anciennes versions.',
 'settings_enableVersionModification' => 'Modification des versions',
 'settings_enableVersionModification_desc' => 'Active/désactive la modification de version d’un document par les utilisateurs normaux après le dépôt. L’administrateur peut toujours modifier la version après le dépôt.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Clé de cryptage',
 'settings_encryptionKey_desc' => 'Cette chaîne est utilisée pour créer un identifiant unique étant ajouté comme champ masqué à un formulaire afin de prévenir des attaques CSRF.',
 'settings_error' => 'Erreur',
@@ -1475,6 +1477,8 @@ Nom : [username]
 'settings_smtpPort_desc' => 'Port serveur SMTP, par défaut 25',
 'settings_smtpSendFrom' => 'Envoyé par',
 'settings_smtpSendFrom_desc' => 'Envoyé par',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Nom du serveur SMTP',
 'settings_smtpServer_desc' => 'Nom du serveur SMTP',
 'settings_smtpUser' => 'Utilisateur pour le serveur SMTP',
@@ -1520,6 +1524,7 @@ Nom : [username]
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => 'Aperçu en ligne des fichiers',
 'settings_viewOnlineFileTypes_desc' => 'Extensions des fichiers pouvant être visionnés en ligne (en lettres minuscules uniquement).',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Mode workflow',
 'settings_workflowMode_desc' => 'Le workflow avancé permet de définir son propre workflow de parution pour les versions de documents.',
 'settings_workflowMode_valadvanced' => 'avancé',

languages/hr_HR/lang.inc

@@ -1310,6 +1310,8 @@ Internet poveznica: [url]',
 'settings_enableVersionDeletion_desc' => 'Omogući/onemogući brisanje prethodnih verzija dokumenta redovnim korisnicima. Administrator uvijek može izbrisati stare verzije.',
 'settings_enableVersionModification' => 'Omogući mijenjanje verzija',
 'settings_enableVersionModification_desc' => 'Omogući/onemogući mijenjanje verzija dokumenta redovnim korisnicima nakon učitavanja verzije. Administrator uvijek može promijeniti verziju nakon učitavanja.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Ključ za šifriranje',
 'settings_encryptionKey_desc' => 'Ovaj string se koristi za izradu jedinstvenog identifikatora koji će biti dodan kao skriveno polje u formularu kako bi se spriječili CSRF napadi.',
 'settings_error' => 'Greška',
@@ -1443,6 +1445,8 @@ Internet poveznica: [url]',
 'settings_smtpPort_desc' => 'Port SMTP servera, zadano 25',
 'settings_smtpSendFrom' => 'Pošalji od',
 'settings_smtpSendFrom_desc' => 'Pošaji od',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Hostname SMTP servera',
 'settings_smtpServer_desc' => 'Hostname SMTP servera',
 'settings_smtpUser' => 'Korisnik SMTP servera',
@@ -1488,6 +1492,7 @@ Internet poveznica: [url]',
 'settings_versiontolow' => 'Na nižu verziju',
 'settings_viewOnlineFileTypes' => 'Vidi online vrste datoteka',
 'settings_viewOnlineFileTypes_desc' => 'Datoteke s jednim od sljedećih završetaka mogu se pregledati online (KORISTITE SAMO MALA SLOVA)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Način rada toka rada',
 'settings_workflowMode_desc' => 'Napredni tok rada vam omogućuje da odredite vaše vlastito izdanje toka rada za verzije dokumenta.',
 'settings_workflowMode_valadvanced' => 'napredno',

languages/hu_HU/lang.inc

@@ -1288,6 +1288,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Engedélyezi/tiltja a korábbi dokumentum verziók törlését az általános felhasználóknak. Adminisztrátor mindig törölheti a korábbi változatokat.',
 'settings_enableVersionModification' => 'Engedélyezi a verziók módosítását',
 'settings_enableVersionModification_desc' => 'Engedélyezi/tiltja a dokumentum verziók módosítását az általános felhasználóknak miután a verzió feltöltésre került. Adminisztrátor mindig módosíthatja a verziót feltöltés után.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Titkosító kulcs',
 'settings_encryptionKey_desc' => 'Ez a karaktersorozat használható egyedi azonosító létrehozásához amely rejtett mezőként lesz hozzáadva az űrlapokhoz a CSRF támadások megelőzésére.',
 'settings_error' => 'Hiba',
@@ -1421,6 +1423,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'SMTP kiszolgáló port, alapértelmezett 25',
 'settings_smtpSendFrom' => 'Feladó',
 'settings_smtpSendFrom_desc' => 'A levél feladója',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP kiszolgáló gépnév',
 'settings_smtpServer_desc' => 'SMTP kiszolgáló gépnév',
 'settings_smtpUser' => 'SMTP kiszolgáló felhasználó',
@@ -1466,6 +1470,7 @@ URL: [url]',
 'settings_versiontolow' => 'túl alacsony verzió',
 'settings_viewOnlineFileTypes' => 'Online állománytípus nézet',
 'settings_viewOnlineFileTypes_desc' => 'A következő végződéssel rendelkező állományok megtekinthetők online (KIZÁRÓLAG KISBETŰS KARAKTEREKET HASZNÁLJON)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Munkafolyamat mód',
 'settings_workflowMode_desc' => 'A részletes munkafolyamat engedélyezi saját kiadási munkafolyamat megadását a dokumentum változatokhoz.',
 'settings_workflowMode_valadvanced' => 'részletes',

languages/it_IT/lang.inc

@@ -1322,6 +1322,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Abilita/disabilita il permesso di cancellare le versioni precedenti di un documento da parte di un qualsiasi utente. Gli Amministratori hanno sempre e comunque tale facoltà.',
 'settings_enableVersionModification' => 'Abilita modifica della versione',
 'settings_enableVersionModification_desc' => 'Abilita/disabilita il permesso di modificare le versioni di un documento da parte di un qualsiasi utente. Gli Amministratori hanno sempre e comunque tale facoltà.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Chiave di criptazione',
 'settings_encryptionKey_desc' => 'La chiave viene usata per creare un identificatore unico da aggiungere come campo nascosto ad un formulario per protezione da attacchi CSRF.',
 'settings_error' => 'Errore',
@@ -1455,6 +1457,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Porta utilizzata dal server di posta SMTP. Default: 25',
 'settings_smtpSendFrom' => 'Mittente',
 'settings_smtpSendFrom_desc' => 'Mittente per le notifiche via email',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Nome host server SMTP',
 'settings_smtpServer_desc' => 'Nome host server SMTP',
 'settings_smtpUser' => 'Utente server SMTP',
@@ -1500,6 +1504,7 @@ URL: [url]',
 'settings_versiontolow' => 'Versione obsoleta',
 'settings_viewOnlineFileTypes' => 'Tipi di files visualizzabili',
 'settings_viewOnlineFileTypes_desc' => 'Solo i files che terminano nella maniera seguente verranno visualizzati (UTILIZZARE SOLO IL MINUSCOLO)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Modalità flusso di lavoro',
 'settings_workflowMode_desc' => 'Il flusso di lavoro \'avanzato\' permette di rilasciare un proprio flusso di lavoro per le versioni dei documenti',
 'settings_workflowMode_valadvanced' => 'Avanzato',

languages/ko_KR/lang.inc

@@ -1304,6 +1304,8 @@ URL : [url]',
 'settings_enableVersionDeletion_desc' => '일반 사용자가 이전 문서 버전의 활성화 / 비활성화 삭제를 활성화합니다. 관리자는 항상 이전 버전을 삭제할 수 있습니다.',
 'settings_enableVersionModification' => '버전의 수정 사용',
 'settings_enableVersionModification_desc' => '버전이 업로드 된 후 일반 사용자가 문서 버전의 활성화 / 비활성화 수정을 사용합니다. 관리자는 항상 업로드 후 버전을 수정할 수 있습니다.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '암호화 키',
 'settings_encryptionKey_desc' => '이 문자열은 CSRF 공격을 방지하기 위해 formular에 숨겨진 필드로 추가되는 고유 식별자를 만드는 데 사용된다.',
 'settings_error' => '오류',
@@ -1437,6 +1439,8 @@ URL : [url]',
 'settings_smtpPort_desc' => 'SMTP 서버 포트, 기본 25',
 'settings_smtpSendFrom' => '송신자',
 'settings_smtpSendFrom_desc' => '송신자',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP 서버의 호스트 이름',
 'settings_smtpServer_desc' => 'SMTP 서버의 호스트 이름',
 'settings_smtpUser' => 'SMTP 서버 사용자',
@@ -1482,6 +1486,7 @@ URL : [url]',
 'settings_versiontolow' => '낮은 버전',
 'settings_viewOnlineFileTypes' => '온라인 파일 형식 보기',
 'settings_viewOnlineFileTypes_desc' => '최종 파일은 온라인을 통헤 보여진다. (소문자 만 사용) Files with one of the following endings can be viewed online',
+'settings_webdav' => '',
 'settings_workflowMode' => '워크플로우 모드',
 'settings_workflowMode_desc' => '문서 버전에 대한 자신의 릴리스 워크플로우 지정하실 수 있습니다 .',
 'settings_workflowMode_valadvanced' => '고급',

languages/nl_NL/lang.inc

@@ -1334,6 +1334,8 @@ Name: [username]
 'settings_enableVersionDeletion_desc' => 'Inschakelen/uitschakelen verwijderen van voorgaande documentversies door normale gebruikers. Beheerder mag altijd oude versies verwijderen.',
 'settings_enableVersionModification' => 'Inschakelen van versiebewerking',
 'settings_enableVersionModification_desc' => 'Inschakelen/uitschakelen van bewerkingen op documentversies door normale gebruikers na een versie upload. Beheerder mag altijd de versie wijzigen na upload.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Encryptie sleutel',
 'settings_encryptionKey_desc' => 'Deze string wordt gebruikt om een unieke identificatie als onzichtbaar veld aan een formulier toe te voegen om CSRF aanvallen tegen te gaan.',
 'settings_error' => 'Fout',
@@ -1467,6 +1469,8 @@ Name: [username]
 'settings_smtpPort_desc' => 'SMTP Server poort, standaard 25',
 'settings_smtpSendFrom' => 'Send from',
 'settings_smtpSendFrom_desc' => 'Send from',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP Server hostname',
 'settings_smtpServer_desc' => 'SMTP Server hostname',
 'settings_smtpUser' => 'SMTP Server gebruiker',
@@ -1512,6 +1516,7 @@ Name: [username]
 'settings_versiontolow' => 'Versie te laag',
 'settings_viewOnlineFileTypes' => 'De volgende bestandstypen online bekijken',
 'settings_viewOnlineFileTypes_desc' => 'Bestanden met een van de volgende extensies kunnen online bekeken worden (GEBRUIK ALLEEN KLEINE LETTERS)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Workflow mode',
 'settings_workflowMode_desc' => 'De uitgebreide workflow maakt het mogelijk om uw eigen workflow op te geven voor documentversies.',
 'settings_workflowMode_valadvanced' => 'geavanceerd',

languages/pl_PL/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (796), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (797), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -843,7 +843,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Wyłącznie pliki typu .jpg mogą być użyte jako obrazy użytkowników',
 'order_by_sequence_off' => '',
 'original_filename' => 'Oryginalna nazwa pliku',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Całkowity postęp indeksowania',
 'owner' => 'Właściciel',
 'ownership_changed_email' => 'Właściciel zmieniony',
 'ownership_changed_email_body' => 'Zmiana właściciela
@@ -1268,6 +1268,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Włącz/Wyłącz możliwość kasowania poprzednich wersji plików przez zwykłych użytkowników. Administrator może w każdej chwili usunąć stare wersjie.',
 'settings_enableVersionModification' => 'Zezwól na modyfikowanie wersji',
 'settings_enableVersionModification_desc' => 'Włącz/Wyłącz możliwość modyfikacji wersji dokumentów przez zwykłych użytkowników po wczytaniu pliku. Administrator może w każdej chwili zmienić wersję wczytanego pliku.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Klucz szyfrujący',
 'settings_encryptionKey_desc' => 'Ten ciąg znaków jest używany do tworzenia unikatowego identyfikatora dodawanego jako ukryte pole do formularza aby zapobiec atakom CSRF.',
 'settings_error' => 'Błąd',
@@ -1401,6 +1403,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Port serwera SMTP, domyślnie 25',
 'settings_smtpSendFrom' => 'Wyślij od',
 'settings_smtpSendFrom_desc' => 'Wyślij od',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Nazwa serwera SMTP',
 'settings_smtpServer_desc' => 'Nazwa hosta serwera SMTP',
 'settings_smtpUser' => 'Użytkownik SMTP',
@@ -1446,6 +1450,7 @@ URL: [url]',
 'settings_versiontolow' => 'Za niska wersja',
 'settings_viewOnlineFileTypes' => 'Typy plików widoczne online',
 'settings_viewOnlineFileTypes_desc' => 'Pliki z jednym z następujących rozszerzeń mogą być widoczne online (UŻYWAJ WYŁĄCZNIE MAŁYCH LITER)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Tryb procesu',
 'settings_workflowMode_desc' => 'Zaawansowany proces pozwala określić własne release procesu zwalniający dla wersji dokumentu.',
 'settings_workflowMode_valadvanced' => 'zaawansowane',

languages/pt_BR/lang.inc

@@ -1286,6 +1286,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Ativar/desativar a exclusão de versões de documentos anteriores por usuários regulares. Administrador pode sempre apagar versões antigas.',
 'settings_enableVersionModification' => 'Ativar modificação de versões',
 'settings_enableVersionModification_desc' => 'Ativar/desativar a modificação de versões de documentos por usuários comuns, depois que uma versão foi enviada. Administrador pode sempre modificar a versão após o upload.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Chave de criptografia',
 'settings_encryptionKey_desc' => 'Esta cadeia é usada para a criação de um identificador único a ser adicionado como um campo oculto para formular, a fim de evitar ataques CSRF.',
 'settings_error' => 'Erro',
@@ -1419,6 +1421,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Porta do Servidor SMTP, padrão 25',
 'settings_smtpSendFrom' => 'Enviar a partir de',
 'settings_smtpSendFrom_desc' => 'Enviar a partir de',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Hostname do servidor SMTP',
 'settings_smtpServer_desc' => 'Hostname do servidor SMTP',
 'settings_smtpUser' => 'Usuário do servidor SMTP',
@@ -1464,6 +1468,7 @@ URL: [url]',
 'settings_versiontolow' => 'Versão para baixo',
 'settings_viewOnlineFileTypes' => 'Ver Tipos de arquivo on-line',
 'settings_viewOnlineFileTypes_desc' => 'Os arquivos com uma das seguintes terminações podem ser visualizados on-line (use somente caracteres minúsculos)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Modo de fluxo de trabalho',
 'settings_workflowMode_desc' => 'O fluxo de trabalho avançado permite especificar seu próprio fluxo de trabalho de liberação de versões de documentos.',
 'settings_workflowMode_valadvanced' => 'avançado',

languages/ro_RO/lang.inc

@@ -1311,6 +1311,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Activarea/dezactivarea ștergerii versiunilor anterioare de documente de către utilizatorii obisnuiti. Adminul poate șterge oricând versiunile vechi.',
 'settings_enableVersionModification' => 'Activați modificarea versiunilor',
 'settings_enableVersionModification_desc' => 'Activarea/dezactivarea modificarii unei versiuni de documente de către utilizatorii obisnuiti, după ce o versiune a fost încărcată. Adminul poate modifica oricând versiunea după încărcare.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Cheia de criptare',
 'settings_encryptionKey_desc' => 'Acest șir este utilizat pentru crearea unui identificator unic ce este adăugat ca un câmp ascuns pentru un formular, cu scopul de a preveni atacurile CSRF.',
 'settings_error' => 'Eroare',
@@ -1444,6 +1446,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Port server SMTP, implicit 25',
 'settings_smtpSendFrom' => 'Trimite de la',
 'settings_smtpSendFrom_desc' => 'Trimite de la',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Hostname server SMTP',
 'settings_smtpServer_desc' => 'Hostname server SMTP',
 'settings_smtpUser' => 'User server SMTP',
@@ -1489,6 +1493,7 @@ URL: [url]',
 'settings_versiontolow' => 'Versiunea e prea mică(veche)',
 'settings_viewOnlineFileTypes' => 'Vezi Tipurile de fișiere online',
 'settings_viewOnlineFileTypes_desc' => 'Fișierele cu una dintre următoarele terminații/extensii pot fi vizualizate online (utilizati numai caractere minuscule)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Mod Workflow',
 'settings_workflowMode_desc' => 'Workflow-ul avansat permite să specificați propriul flux de lucru(workflow) pentru versiunile de documente.',
 'settings_workflowMode_valadvanced' => 'avansat',

languages/ru_RU/lang.inc

@@ -1318,6 +1318,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Разрешить или запретить обычным пользователям удаление предыдущих версий документа. Администратор всегда сможет удалить старые версии документов.',
 'settings_enableVersionModification' => 'Разрешить изменение версий',
 'settings_enableVersionModification_desc' => 'Разрешить или запретить обычным пользователям изменение версий документов после их загрузки на сервер. Администратор всегда сможет изменить версии документов после их загрузки на сервер.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Ключ шифрования',
 'settings_encryptionKey_desc' => 'Строка используется для создания уникального идентификатора, добавляемого как скрытые поля к формулярам, для предотвращения CSRF-атак.',
 'settings_error' => 'Ошибка',
@@ -1451,6 +1453,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Порт сервера SMTP, по умолчанию 25.',
 'settings_smtpSendFrom' => 'От',
 'settings_smtpSendFrom_desc' => 'Отправлять с указанного адреса.',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Хост SMTP',
 'settings_smtpServer_desc' => 'Хост сервера SMTP.',
 'settings_smtpUser' => 'Пользователь сервера SMTP',
@@ -1496,6 +1500,7 @@ URL: [url]',
 'settings_versiontolow' => 'Слишком старая версия',
 'settings_viewOnlineFileTypes' => 'Типы файлов для просмотра онлайн',
 'settings_viewOnlineFileTypes_desc' => 'Файлы с одним из следующих расширений могут просматриваться онлайн (только маленькие буквы).',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Режим процесса',
 'settings_workflowMode_desc' => 'Улучшенный режим позволяет указать ваш собственный процесс для документа.',
 'settings_workflowMode_valadvanced' => 'улучшенный',

languages/sk_SK/lang.inc

@@ -1149,6 +1149,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => '',
 'settings_enableVersionModification' => '',
 'settings_enableVersionModification_desc' => '',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '',
 'settings_encryptionKey_desc' => '',
 'settings_error' => 'Chyba',
@@ -1282,6 +1284,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'SMTP Server port, štandardne 25',
 'settings_smtpSendFrom' => 'Odoslané z',
 'settings_smtpSendFrom_desc' => 'Odoslané z',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP Server názov hostiteľa',
 'settings_smtpServer_desc' => 'SMTP Server názov hostiteľa',
 'settings_smtpUser' => 'SMTP Server používateľ',
@@ -1327,6 +1331,7 @@ URL: [url]',
 'settings_versiontolow' => 'Verzia je nízka',
 'settings_viewOnlineFileTypes' => 'Zobraziť online typy súborov',
 'settings_viewOnlineFileTypes_desc' => '',
+'settings_webdav' => '',
 'settings_workflowMode' => '',
 'settings_workflowMode_desc' => '',
 'settings_workflowMode_valadvanced' => 'pokročilý',

languages/sv_SE/lang.inc

@@ -1331,6 +1331,8 @@ Kommentar: [comment]',
 'settings_enableVersionDeletion_desc' => 'Aktivera/Inaktivera möjlighet att ta bort äldre dokumentversioner genom användare. Administratorn kan alltid ta bort äldre versioner.',
 'settings_enableVersionModification' => 'Aktivera modifiering av versionen',
 'settings_enableVersionModification_desc' => 'Aktivera/Inaktivera modifiering av en dokumentversionen genom användare efter att en version har laddats upp. Administratören kan alltid ändra versionen efter att den har laddats upp.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Krypteringsnyckel',
 'settings_encryptionKey_desc' => 'Denna sträng används för att generera en unik identifierare, som är inrymd som ett dolt fält i ett formulär. Det används för att förhindra CSRF-attacker.',
 'settings_error' => 'Fel',
@@ -1464,6 +1466,8 @@ Kommentar: [comment]',
 'settings_smtpPort_desc' => 'SMTP server-port, default 25',
 'settings_smtpSendFrom' => 'Skickat från',
 'settings_smtpSendFrom_desc' => 'Skickat från',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP server-hostname',
 'settings_smtpServer_desc' => 'SMTP server-hostname',
 'settings_smtpUser' => 'SMTP Server användare',
@@ -1509,6 +1513,7 @@ Kommentar: [comment]',
 'settings_versiontolow' => 'Version för låg',
 'settings_viewOnlineFileTypes' => 'Visa online-filtyper',
 'settings_viewOnlineFileTypes_desc' => 'Filer av en av de följande filtyperna kan visas online. OBS! ANVÄND BARA SMÅ BOKSTÄVER',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Typ av arbetsflöde',
 'settings_workflowMode_desc' => 'Det avancerade arbetsflödet gör det möjligt att lägga upp ett eget definerat gransknings- och godkännandeflöde för dokumentversioner.',
 'settings_workflowMode_valadvanced' => 'avancerat',

languages/tr_TR/lang.inc

@@ -1290,6 +1290,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Kullanıcıların eski sürümlü dokümanları silmelerine izin vermeyi etkinleştir/devre dışı bırak. Yönetici her zaman eski versiyonları silebilir.',
 'settings_enableVersionModification' => 'Versiyon değiştirmeyi etkinleştir',
 'settings_enableVersionModification_desc' => 'Bu etkinleştirilirse kullanıcılar yeni doküman yüklediklerinde versiyon numaralarını değiştirebilirler. Yöneticiler yükleme yaptıklarında her zaman değişiklik yapabilirler.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Şifreleme anahtarı',
 'settings_encryptionKey_desc' => 'Bu string, CSRF ataklarını önlemek için eşsiz id olarak kaydedilir.',
 'settings_error' => 'Hata',
@@ -1423,6 +1425,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'SMTP Sunucu portu, varsayılan 25',
 'settings_smtpSendFrom' => 'Kimden',
 'settings_smtpSendFrom_desc' => 'Gönderilecek e-postalar kimden gidecek',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP Sunucu adı/adresi',
 'settings_smtpServer_desc' => 'SMTP sunucu adı/adresi',
 'settings_smtpUser' => 'SMTP Sunucu kullanıcı adı',
@@ -1468,6 +1472,7 @@ URL: [url]',
 'settings_versiontolow' => 'Versiyon düşük',
 'settings_viewOnlineFileTypes' => 'Online Dosya Tiplerini Görüntüle',
 'settings_viewOnlineFileTypes_desc' => 'Belirtilen uzantıdaki dosyalar online olarak görüntülenebilir. (SADECE KÜÇÜK HARF KULLANIN)',
+'settings_webdav' => '',
 'settings_workflowMode' => 'İş Akış Modu',
 'settings_workflowMode_desc' => 'Gelişmiş İş Akışı, dokümün versiyonları için kendi sürümlerinizi belirlemenizi sağlar.',
 'settings_workflowMode_valadvanced' => 'gelişmiş',

languages/uk_UA/lang.inc

@@ -1311,6 +1311,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => 'Дозволити/заборонити звичайним користувачам видаляти попередні версії документів. Адміністратор завжди зможе видалити старі версії документів.',
 'settings_enableVersionModification' => 'Дозволити зміну версій',
 'settings_enableVersionModification_desc' => 'Дозволити/заборонити звичайним користувачам змінювати версію документів після завантаження їх на сервер. Адміністратор завжди зможе змінювати версії документів після завантаження їх на сервер.',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => 'Ключ шифрування',
 'settings_encryptionKey_desc' => 'Рядок використовується для створення унікального ідентифікатора, який додається як приховане поле до формулярів, для запобігання CSRF-атак.',
 'settings_error' => 'Помилка',
@@ -1444,6 +1446,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'Порт сервера SMTP, по замовчуванню 25.',
 'settings_smtpSendFrom' => 'Від',
 'settings_smtpSendFrom_desc' => 'Відправляти із вказаної адреси.',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'Хост SMTP',
 'settings_smtpServer_desc' => 'Хост сервера SMTP.',
 'settings_smtpUser' => 'Користувач сервера SMTP',
@@ -1489,6 +1493,7 @@ URL: [url]',
 'settings_versiontolow' => 'Надто стара версія',
 'settings_viewOnlineFileTypes' => 'Типи файлів для перегляду онлайн',
 'settings_viewOnlineFileTypes_desc' => 'Файли з такими розширеннями можна переглядати онлайн (лише малі літери).',
+'settings_webdav' => '',
 'settings_workflowMode' => 'Режим процесу',
 'settings_workflowMode_desc' => 'Покращений режим дозволяє вказати ваш власний процес для документа.',
 'settings_workflowMode_valadvanced' => 'покращений',

languages/zh_CN/lang.inc

@@ -1292,6 +1292,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => '启用/禁用普通用户删除以前的文档版本。管理员除外（可随时删除旧版本）。',
 'settings_enableVersionModification' => '启用版本修改功能',
 'settings_enableVersionModification_desc' => '通过用户上传新版本，启用/禁用文档版本修改',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '加密密钥',
 'settings_encryptionKey_desc' => '',
 'settings_error' => '错误',
@@ -1425,6 +1427,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'SMTP 服务器端口，默认25',
 'settings_smtpSendFrom' => '发送自',
 'settings_smtpSendFrom_desc' => '发送自',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP 服务器名称',
 'settings_smtpServer_desc' => 'SMTP 服务器名称',
 'settings_smtpUser' => 'SMTP服务器用户',
@@ -1470,6 +1474,7 @@ URL: [url]',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => '查看在线文件属性',
 'settings_viewOnlineFileTypes_desc' => '',
+'settings_webdav' => '',
 'settings_workflowMode' => '工作流模式',
 'settings_workflowMode_desc' => '',
 'settings_workflowMode_valadvanced' => '先进...',

languages/zh_TW/lang.inc

@@ -1141,6 +1141,8 @@ URL: [url]',
 'settings_enableVersionDeletion_desc' => '',
 'settings_enableVersionModification' => '',
 'settings_enableVersionModification_desc' => '',
+'settings_enableWebdavReplaceDoc' => '',
+'settings_enableWebdavReplaceDoc_desc' => '',
 'settings_encryptionKey' => '',
 'settings_encryptionKey_desc' => '',
 'settings_error' => '',
@@ -1274,6 +1276,8 @@ URL: [url]',
 'settings_smtpPort_desc' => 'SMTP 伺服器埠，默認25',
 'settings_smtpSendFrom' => '發送自',
 'settings_smtpSendFrom_desc' => '發送自',
+'settings_smtpSendTestMail' => '',
+'settings_smtpSendTestMail_desc' => '',
 'settings_smtpServer' => 'SMTP 伺服器名稱',
 'settings_smtpServer_desc' => 'SMTP 伺服器名稱',
 'settings_smtpUser' => '',
@@ -1319,6 +1323,7 @@ URL: [url]',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => '',
 'settings_viewOnlineFileTypes_desc' => '',
+'settings_webdav' => '',
 'settings_workflowMode' => '',
 'settings_workflowMode_desc' => '',
 'settings_workflowMode_valadvanced' => '先進...',

op/op.ExtensionMgr.php

@@ -72,7 +72,7 @@ elseif ($action == "refresh") { /* {{{ */
 	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 elseif ($action == "upload") { /* {{{ */
-	if(!$extmgr->isWritableExtDir()) {
+	if(!$extMgr->isWritableExtDir()) {
 		UI::exitError(getMLText("admin_tools"),getMLText("extension_mgr_no_upload"));
 	}
 	if($_FILES['userfile']['error']) {

out/out.Calendar.php

@@ -72,6 +72,7 @@ if($view) {
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);
 	$view->setParam('event', $event);
+	$view->setParam('showtree', showtree());
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view->setParam('eventtype', $eventtype);
 	$view->setParam('cachedir', $settings->_cacheDir);

views/bootstrap/class.AddEvent.php

@@ -85,43 +85,28 @@ $(document).ready(function() {
 
 <form class="form-horizontal" action="../op/op.AddEvent.php" id="form1" name="form1" method="post">
 
-		<div class="control-group">
+<?php
-			<label class="control-label"><?php printMLText("from");?>:</label>
+		$this->formField(
-			<div class="controls"><?php //$this->printDateChooser(-1, "from");?>
+			getMLText("from"),
-    		<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
+			$this->getDateChooser($expdate, "from", $this->params['session']->getLanguage())
-      		<input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>">
+		);
-      		<span class="add-on"><i class="icon-calendar"></i></span>
+		$this->formField(
-    		</span>
+			getMLText("to"),
-			</div>
+			$this->getDateChooser($expdate, "to", $this->params['session']->getLanguage())
-		</div>
+		);
-
+		$this->formField(
-		<div class="control-group">
+			getMLText("name"),
-			<label class="control-label"><?php printMLText("to");?>:</label>
+			'<input type="text" name="name" size="60">'
-			<div class="controls"><?php //$this->printDateChooser(-1, "to");?>
+		);
-    		<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
+		$this->formField(
-      		<input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>">
+			getMLText("comment"),
-      		<span class="add-on"><i class="icon-calendar"></i></span>
+			'<textarea name="comment" rows="4" cols="80"></textarea>'
-    		</span>
+		);
-			</div>
+		$this->formSubmit(getMLText('add_event'));
-		</div>
+?>
-
-
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("name");?>:</label>
-			<div class="controls"><input type="text" name="name" size="60"></div>
-		</div>
-
-
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls"><textarea name="comment" rows="4" cols="80"></textarea></div>
-		</div>
-		
-		<div class="controls">
-			<input class="btn" type="submit" value="<?php printMLText("add_event");?>">
-		</div>
 
 </form>
+
 <?php
 		$this->contentContainerEnd();
 		$this->contentEnd();

views/bootstrap/class.AddFile.php

@@ -152,50 +152,37 @@ $(document).ready( function() {
 
 <form class="form-horizontal" action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="form1">
 <input type="hidden" name="documentid" value="<?php print $document->getId(); ?>">
-<div class="control-group">
-	<label class="control-label"><?php printMLText("local_file");?>:</label>
-	<div class="controls">
-<?php
-		if($enablelargefileupload)
-			$this->printFineUploaderHtml();
-		else
-			$this->printFileChooser('userfile[]', false);
-?>
-	</div>
-</div>
-<div class="control-group">
-	<label class="control-label"><?php printMLText("version");?>:</label>
-	<div class="controls"><select name="version" id="version">
-		<option value=""><?= getMLText('document') ?></option>
 <?php
+		$this->formField(
+			getMLText("local_file"),
+			($enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooser('userfile[]', false))
+		);
+		$html = '<select name="version" id="version">
+		<option value="">'.getMLText('document').'</option>';
 		$versions = $document->getContent();
 		foreach($versions as $version)
-			echo "<option value=\"".$version->getVersion()."\">".getMLText('version')." ".$version->getVersion()."</option>";
+			$html .= "<option value=\"".$version->getVersion()."\">".getMLText('version')." ".$version->getVersion()."</option>";
+		$html .= '</select>';
+		$this->formField(
+			getMLText("version"),
+			$html
+		);
+		$this->formField(
+			getMLText("name"),
+			'<input type="text" name="name" id="name" size="60">'
+		);
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" id="comment" rows="4" cols="80"'.($strictformcheck ?  ' required' : '').'></textarea>'
+		);
+		if ($document->getAccessMode($user) >= M_READWRITE) {
+			$this->formField(
+				getMLText("document_link_public"),
+				'<input type="checkbox" name="public" value="true" checked />'
+			);
+		}
+		$this->formSubmit(getMLText('add'));
 ?>
-	</select></div>
-</div>
-<div class="control-group">
-	<label class="control-label"><?php printMLText("name");?>:</label>
-	<div class="controls"><input type="text" name="name" id="name" size="60"></div>
-</div>
-<div class="control-group">
-	<label class="control-label"><?php printMLText("comment");?>:</label>
-	<div class="controls">
-		<textarea name="comment" id="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea>
-	</div>
-</div>
-<?php
-	if ($document->getAccessMode($user) >= M_READWRITE) {
-		print "<div class=\"control-group\"><label class=\"control-label\">".getMLText("document_link_public")."</label>";
-		print "<div class=\"controls\">";
-		print "<input type=\"checkbox\" name=\"public\" value=\"true\" checked />";
-		print "</div></div>";
-	}
-?>
-<div class="control-group">
-	<label class="control-label"></label>
-	<div class="controls"><input class="btn" type="submit" value="<?php printMLText("add");?>"></div>
-</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.AddSubFolder.php

@@ -83,49 +83,32 @@ $(document).ready( function() {
 	<?php echo createHiddenFieldWithKey('addsubfolder'); ?>
 	<input type="hidden" name="folderid" value="<?php print $folder->getId();?>">
 	<input type="hidden" name="showtree" value="<?php echo showtree();?>">
-	
+<?php	
-		<div class="control-group">
+		$this->formField(
-			<label class="control-label"><?php printMLText("name");?>:</label>
+			getMLText("name"),
-			<div class="controls"><input type="text" name="name" size="60" required></div>
+			'<input type="text" name="name" size="60" required>'
-		</div>
+		);
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" rows="4" cols="80"'.($strictformcheck ? ' required' : '').'></textarea>'
+		);
+		$this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getSubFolders('s')).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
 
-		<div class="control-group">
+		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
-			<label class="control-label"><?php printMLText("comment");?>:</label>
+		if($attrdefs) {
-			<div class="controls"><textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea></div>
+			foreach($attrdefs as $attrdef) {
-		</div>
+				$arr = $this->callHook('addFolderAttribute', null, $attrdef);
-
+				if(is_array($arr)) {
-		<div class="control-group">
+					if($arr) {
-			<label class="control-label"><?php printMLText("sequence");?>:</label>
+						$this->formField($arr[0], $arr[1]);
-			<div class="controls"><?php $this->printSequenceChooser($folder->getSubFolders('s')); if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off');?></div>
+					}
-		</div>
+				} else {
-<?php
+					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, ''));
-	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
-	if($attrdefs) {
-		foreach($attrdefs as $attrdef) {
-			$arr = $this->callHook('addFolderAttribute', null, $attrdef);
-			if(is_array($arr)) {
-				if($arr) {
-					echo "<div class=\"control-group\">";
-					echo "	<label class=\"control-label\">".$arr[0].":</label>";
-					echo "	<div class=\"controls\">".$arr[1]."</div>";
-					echo "</div>";
 				}
-			} else {
-?>
-<div class="control-group">
-	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label>
-	<div class="controls"><?php $this->printAttributeEditField($attrdef, '') ?></div>
-</div>
-<?php
 			}
 		}
-	}
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('add_subfolder'));
 ?>
-
-<div class="controls">
-	<input type="submit" class="btn" value="<?php printMLText("add_subfolder");?>">
-</div>
-
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.ApproveDocument.php

@@ -129,35 +129,23 @@ $(document).ready(function() {
 			print "</tr></tbody></table><br>\n";
 		}
 ?>
-	<form method="POST" action="../op/op.ApproveDocument.php" id="form<?= $approvaltype ?>" name="form<?= $approvaltype ?>" enctype="multipart/form-data">
+	<form class="form-horizontal" method="post" action="../op/op.ApproveDocument.php" id="form<?= $approvaltype ?>" name="form<?= $approvaltype ?>" enctype="multipart/form-data">
 	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
-	<table>
-		<tr>
-			<td><?php printMLText("comment")?>:</td>
-			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("approval_file")?>:</td>
-			<td>
 <?php
-	$this->printFileChooser('approvalfile', false);
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" cols="80" rows="4"></textarea>'
+		);
+		$this->formField(
+			getMLText("approval_file"),
+			$this->getFileChooser('approvalfile', false)
+		);
+		$this->formField(
+			getMLText("approval_status"),
+			'<select name="approvalStatus">'.($approvalStatus['status'] != 1 ? '<option value="1">'.getMLText("status_approved").'</option>' : '').($approvalStatus['status'] != -1 ? '<option value="-1">'.getMLText("rejected").'</option>' : '').'</select>'
+		);
+		$this->formSubmit(getMLText('submit_approval'), $approvaltype.'Approval');
 ?>
-			</td>
-		</tr>
-	<tr><td><?php printMLText("approval_status")?>:</td>
-	<td>
-	<select name="approvalStatus">
-<?php if($approvalStatus['status'] != 1) { ?>
-	<option value='1'><?php printMLText("status_approved")?></option>
-<?php } ?>
-<?php if($approvalStatus['status'] != -1) { ?>
-	<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-	</select>
-	</td></tr>
-	<tr><td></td><td>
-	<input type='submit' class="btn" name='<?= $approvaltype ?>Approval' value='<?php printMLText("submit_approval")?>'/></td></tr>
-	</table>
 	<input type='hidden' name='approvalType' value='<?= $approvaltype ?>'/>
 	<?php if($approvaltype == 'grp'): ?>
 	<input type='hidden' name='approvalGroup' value="<?php echo $approvalStatus['required']; ?>" />

views/bootstrap/class.AttributeMgr.php

@@ -189,18 +189,11 @@ $(document).ready( function() {
 			<input type="hidden" name="action" value="addattrdef">
 <?php
 		}
+		$this->formField(
+			getMLText("attrdef_name"),
+			'<input type="text" name="name" value="'.($attrdef ? htmlspecialchars($attrdef->getName()) : '').'">'
+		);
 ?>
-					<div class="control-group">
-						<label class="control-label">
-								<?php printMLText("attrdef_name");?>:
-						</label>
-						<div class="controls">
-							<input type="text" name="name" value="<?php echo $attrdef ? htmlspecialchars($attrdef->getName()) : '' ?>">
-						</div>
-					</div>
-
-
-
 					<div class="control-group">
 						<label class="control-label">
 							<?php printMLText("attrdef_objtype");?>:
@@ -217,62 +210,30 @@ $(document).ready( function() {
 							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option></select>
 						</div>
 					</div>
-
+<?php
-					<div class="control-group">
+		$this->formField(
-						<label class="control-label">
+			getMLText("attrdef_multiple"),
-							<?php printMLText("attrdef_multiple");?>:
+			'<input type="checkbox" value="1" name="multiple"'.($attrdef && $attrdef->getMultipleValues() ? " checked" : "").'/>'
-						</label>
+		);
-						<div class="controls">
+		$this->formField(
-							<input type="checkbox" value="1" name="multiple" <?php echo ($attrdef && $attrdef->getMultipleValues()) ? "checked" : "" ?>/>
+			getMLText("attrdef_minvalues"),
-						</div>
+			'<input type="text" value="'.($attrdef ? $attrdef->getMinValues() : '').'" name="minvalues" />'
-					</div>
+		);
-
+		$this->formField(
-
+			getMLText("attrdef_maxvalues"),
-					<div class="control-group">
+			'<input type="text" value="'.($attrdef ? $attrdef->getMaxValues() : '').'" name="maxvalues" />'
-						<label class="control-label"><?php printMLText("attrdef_minvalues");?>:</label>
+		);
-						<div class="controls">
+		$this->formField(
-							<input type="text" value="<?php echo $attrdef ? $attrdef->getMinValues() : '' ?>" name="minvalues" />
+			getMLText("attrdef_valueset"),
-						</div>
+			(($attrdef && strlen($attrdef->getValueSet()) > 30) ? '<textarea name="valueset" rows="5">'.(($attrdef && $attrdef->getValueSet()) ? $attrdef->getValueSetSeparator().implode("\n".$attrdef->getValueSetSeparator(), $attrdef->getValueSetAsArray()) : '').'</textarea>
-					</div>
+' : '<input type="text" value="'.($attrdef ? $attrdef->getValueSet() : '').'" name="valueset" />')
-
+		);
-
+		$this->formField(
-					<div class="control-group">
+			getMLText("attrdef_regex"),
-						<label class="control-label">
+			'<input type="text" value="'.($attrdef ? $attrdef->getRegex() : '').'" name="regex" />'
-							<?php printMLText("attrdef_maxvalues");?>:
+		);
-						</label>
+		$this->formSubmit('<i class="icon-save"></i> '.getMLText('save'));
-						<div class="controls">
+?>
-							<input type="text" value="<?php echo $attrdef ? $attrdef->getMaxValues() : '' ?>" name="maxvalues" />
-						</div>
-					</div>
-
-
-					<div class="control-group">
-						<label class="control-label">
-							<?php printMLText("attrdef_valueset");?>:
-						</label>
-
-						<div class="controls">
-							<?php if($attrdef && strlen($attrdef->getValueSet()) > 30) { ?>
-							<textarea name="valueset" rows="5"><?php echo ($attrdef && $attrdef->getValueSet()) ? $attrdef->getValueSetSeparator().implode("\n".$attrdef->getValueSetSeparator(), $attrdef->getValueSetAsArray()) : '' ?></textarea>
-							<?php } else { ?>
-							<input type="text" value="<?php echo $attrdef ? $attrdef->getValueSet() : '' ?>" name="valueset" />
-							<?php } ?>
-						</div>
-					</div>
-
-					
-					<div class="control-group">
-						<label class="control-label">
-							<?php printMLText("attrdef_regex");?>:
-						</label>
-						<div class="controls">
-							<input type="text" value="<?php echo $attrdef ? $attrdef->getRegex() : '' ?>" name="regex" />
-						</div>
-					</div>
-
-					<div class="controls">
-						<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
-					</div>
 			</form>
 <?php
 } /* }}} */

views/bootstrap/class.Bootstrap.php

@@ -982,6 +982,20 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		return;
 	} /* }}} */
 
+	function formField($title, $value) { /* {{{ */
+		echo "<div class=\"control-group\">";
+		echo "	<label class=\"control-label\">".$title.":</label>";
+		echo "	<div class=\"controls\">".$value."</div>";
+		echo "</div>";
+		return;
+	} /* }}} */
+
+	function formSubmit($value, $name='') { /* {{{ */
+		echo "<div class=\"controls\">\n";
+		echo "<button type=\"submit\" class=\"btn\"".($name ? ' name="'.$name.'"' : '').">".$value."</button>\n";
+		echo "</div>\n";
+	} /* }}} */
+
 	function getMimeIcon($fileType) { /* {{{ */
 		// for extension use LOWER CASE only
 		$icons = array();
@@ -1082,24 +1096,23 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	function printFileChooser($varname='userfile', $multiple=false, $accept='') { /* {{{ */
-		echo $this->getFileChooser($varname, $multiple, $accept);
+		echo self::getFileChooser($varname, $multiple, $accept);
-		return;
-		$id = preg_replace('/[^A-Za-z]/', '', $varname);
-?>
-	<div id="<?php echo $id; ?>-upload-files">
-		<div id="<?php echo $id; ?>-upload-file" class="upload-file">
-			<div class="input-append">
-				<input type="text" class="form-control" readonly>
-				<span class="btn btn-default btn-file">
-					<?php printMLText("browse");?>&hellip; <input id="<?php echo $id; ?>" type="file" name="<?php echo $varname; ?>"<?php if($multiple) echo " multiple"; ?><?php if($accept) echo " accept=\"".$accept."\""; ?>>
-				</span>
-			</div>
-		</div>
-	</div>
-<?php
 	} /* }}} */
 
-	function printDateChooser($defDate = -1, $varName) { /* {{{ */
+	function printDateChooser($defDate = '', $varName) { /* {{{ */
+		echo self::getDateChooser($defDate, $varName);
+	} /* }}} */
+
+	function getDateChooser($defDate = '', $varName, $lang='') { /* {{{ */
+		$content = '
+			<span class="input-append date span12 datepicker" id="'.$varName.'date" data-date="'.$defDate.'" data-date-format="yyyy-mm-dd"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').'>
+				<input class="span6" size="16" name="'.$varName.'" type="text" value="'.$defDate.'">
+				<span class="add-on"><i class="icon-calendar"></i></span>
+			</span>';
+		return $content;
+	} /* }}} */
+
+	function __printDateChooser($defDate = -1, $varName) { /* {{{ */
 	
 		if ($defDate == -1)
 			$defDate = mktime();
@@ -1137,6 +1150,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	function printSequenceChooser($objArr, $keepID = -1) { /* {{{ */
+		echo $this->getSequenceChooser($objArr, $keepID);
+	} /* }}} */
+
+	function getSequenceChooser($objArr, $keepID = -1) { /* {{{ */
 		if (count($objArr) > 0) {
 			$max = $objArr[count($objArr)-1]->getSequence() + 1;
 			$min = $objArr[0]->getSequence() - 1;
@@ -1144,25 +1161,26 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		else {
 			$max = 1.0;
 		}
-		print "<select name=\"sequence\">\n";
+		$content = "<select name=\"sequence\">\n";
 		if ($keepID != -1) {
-			print "  <option value=\"keep\">" . getMLText("seq_keep");
+			$content .= "  <option value=\"keep\">" . getMLText("seq_keep");
 		}
 		if($this->params['defaultposition'] != 'start')
-			print "  <option value=\"".$max."\">" . getMLText("seq_end");
+			$content .= "  <option value=\"".$max."\">" . getMLText("seq_end");
 		if (count($objArr) > 0) {
-			print "  <option value=\"".$min."\">" . getMLText("seq_start");
+			$content .= "  <option value=\"".$min."\">" . getMLText("seq_start");
 		}
 		if($this->params['defaultposition'] == 'start')
-			print "  <option value=\"".$max."\">" . getMLText("seq_end");
+			$content .= "  <option value=\"".$max."\">" . getMLText("seq_end");
 		for ($i = 0; $i < count($objArr) - 1; $i++) {
 			if (($objArr[$i]->getID() == $keepID) || (($i + 1 < count($objArr)) && ($objArr[$i+1]->getID() == $keepID))) {
 				continue;
 			}
 			$index = ($objArr[$i]->getSequence() + $objArr[$i+1]->getSequence()) / 2;
-			print "  <option value=\"".$index."\">" . getMLText("seq_after", array("prevname" => htmlspecialchars($objArr[$i]->getName())));
+			$content .= "  <option value=\"".$index."\">" . getMLText("seq_after", array("prevname" => htmlspecialchars($objArr[$i]->getName())));
 		}
-		print "</select>";
+		$content .= "</select>";
+		return $content;
 	} /* }}} */
 	
 	function printDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
@@ -1370,59 +1388,63 @@ $(document).ready(function() {
 	} /* }}} */
 
 	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
+		echo self::getAttributeEditField($attrdef, $attribute, $fieldname, $norequire);
+	} /* }}} */
+
+	function getAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
+		$content = '';
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
-			echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
+			$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
-			echo "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
+			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-?>
+        $content .= '<span class="input-append date datepicker" data-date="'.date('Y-m-d').'" data-date-format="yyyy-mm-dd" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
-        <span class="input-append date datepicker" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+					<input id="'.$fieldname.'_'.$attrdef->getId().'" class="span9" size="16" name="'.$fieldname.'['.$attrdef->getId().']" type="text" value="'.($objvalue ? $objvalue : '').'">
-					<input id="<?php echo $fieldname."_".$attrdef->getId();?>" class="span9" size="16" name="<?php echo $fieldname ?>[<?php echo $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
-				</span>
+				</span>';
-<?php
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_email:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').' data-rule-email="true"'." />";
+			$content .= "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').' data-rule-email="true"'." />";
 			break;
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
-				echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
+				$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
-				echo "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
+				$content .= "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
 				if($attrdef->getMultipleValues()) {
-					echo "[]\" multiple";
+					$content .= "[]\" multiple";
 				} else {
-					echo "\"";
+					$content .= "\"";
 				}
-				echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select-deselect\" data-placeholder=\"".getMLText("select_value")."\">";
+				$content .= "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '')." class=\"chzn-select-deselect\" data-placeholder=\"".getMLText("select_value")."\">";
 				if(!$attrdef->getMultipleValues()) {
-					echo "<option value=\"\"></option>";
+					$content .= "<option value=\"\"></option>";
 				}
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();
 				foreach($valueset as $value) {
 					if($value) {
-						echo "<option value=\"".htmlspecialchars($value)."\"";
+						$content .= "<option value=\"".htmlspecialchars($value)."\"";
 						if(is_array($objvalue) && in_array($value, $objvalue))
-							echo " selected";
+							$content .= " selected";
 						elseif($value == $objvalue)
-							echo " selected";
+							$content .= " selected";
-						echo ">".htmlspecialchars($value)."</option>";
+						$content .= ">".htmlspecialchars($value)."</option>";
 					}
 				}
-				echo "</select>";
+				$content .= "</select>";
 			} else {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 				if(strlen($objvalue) > 80) {
-					echo "<textarea id=\"".$fieldname."_".$attrdef->getId()."\" class=\"input-xxlarge\" name=\"".$fieldname."[".$attrdef->getId()."]\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">".htmlspecialchars($objvalue)."</textarea>";
+					$content .= "<textarea id=\"".$fieldname."_".$attrdef->getId()."\" class=\"input-xxlarge\" name=\"".$fieldname."[".$attrdef->getId()."]\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					echo "<input type=\"text\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					$content .= "<input type=\"text\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;
 		}
+		return $content;
 	} /* }}} */
 
 	function printDropFolderChooserHtml($formName, $dropfolderfile="", $showfolders=0) { /* {{{ */
@@ -2750,7 +2772,7 @@ mayscript>
 	} /* }}} */
 
 	/**
-	 * Output HTML Code for jumploader
+	 * Output HTML Code for Fine Uploader
 	 *
 	 * @param string $uploadurl URL where post data is send
 	 * @param integer $folderid id of folder where document is saved
@@ -2758,11 +2780,22 @@ mayscript>
 	 * @param array $fields list of post fields
 	 */
 	function printFineUploaderHtml($prefix='userfile') { /* {{{ */
-?>
+		echo self::getFineUploaderHtml($prefix);
-		<div id="<?php echo $prefix; ?>-fine-uploader"></div>
+	} /* }}} */
-		<input type="hidden" <?php echo ($prefix=='userfile' ? 'class="do_validate"' : ''); ?> id="<?php echo $prefix; ?>-fine-uploader-uuids" name="<?php echo $prefix; ?>-fine-uploader-uuids" value="" />
+
-		<input type="hidden" id="<?php echo $prefix; ?>-fine-uploader-names" name="<?php echo $prefix; ?>-fine-uploader-names" value="" />
+	/**
-<?php
+	 * Get HTML Code for Fine Uploader
+	 *
+	 * @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 getFineUploaderHtml($prefix='userfile') { /* {{{ */
+		$html = '<div id="'.$prefix.'-fine-uploader"></div>
+		<input type="hidden" '.($prefix=='userfile' ? 'class="do_validate" ' : '').'id="'.$prefix.'-fine-uploader-uuids" name="'.$prefix.'-fine-uploader-uuids" value="" />
+		<input type="hidden" id="'.$prefix.'-fine-uploader-names" name="'.$prefix.'-fine-uploader-names" value="" />';
+		return $html;
 	} /* }}} */
 
 	/**

views/bootstrap/class.Calendar.php

@@ -67,46 +67,28 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 ?>
 
-<form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="POST">
+<form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('editevent'); ?>
-
 	<input type="hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
-
+<?php
-		<div class="control-group">
+			$this->formField(
-			<label class="control-label"><?php printMLText("from");?>:</label>
+				getMLText("from"),
-			<div class="controls">
+				$this->getDateChooser(date('Y-m-d', $event["start"]), "from")
-				<?php //$this->printDateChooser($event["start"], "from");?>
+			);
-	    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
+			$this->formField(
-	      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
+				getMLText("to"),
-	      		<span class="add-on"><i class="icon-calendar"></i>
+				$this->getDateChooser(date('Y-m-d', $event["stop"]), "to")
-	    		</span>
+			);
-	    	</div>
+			$this->formField(
-		</div>
+				getMLText("name"),
-		<div class="control-group">
+				'<input type="text" name="name" value="'.htmlspecialchars($event["name"]).'" size="60" required>'
-			<label class="control-label"><?php printMLText("to");?>:</label>
+			);
-			<div class="controls">
+			$this->formField(
-				<?php //$this->printDateChooser($event["stop"], "to");?>
+				getMLText("comment"),
-	    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
+				'<textarea name="comment" rows="4" cols="80"'.($strictformcheck ? ' required' : '').'>'.htmlspecialchars($event["comment"]).'</textarea>'
-	      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
+			);
-	      		<span class="add-on"><i class="icon-calendar"></i></span>
+			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
-	    		</span>
+?>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("name");?>:</label>
-			<div class="controls">
-				<input type="text" name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60" required>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls">
-				<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>><?php echo htmlspecialchars($event["comment"])?></textarea>
-			</div>
-		</div>
-		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
-		</div>
 </form>
 <?php
 			$this->contentContainerEnd();

views/bootstrap/class.Categories.php

@@ -110,17 +110,13 @@ $(document).ready( function() {
 					<input type="hidden" name="action" value="editcategory">
 					<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 				<?php } ?>
-				<div class="control-group">
+<?php
-					<label class="control-label"><?php echo getMLText("name")?>:</label>
+			$this->formField(
-					<div class="controls">
+				getMLText("name"),
-							<input name="name" type="text" value="<?php echo $category ? htmlspecialchars($category->getName()) : '' ?>">&nbsp;
+				'<input type="text" name="name" value="'.($category ? htmlspecialchars($category->getName()) : '').'">'
-					</div>
+			);
-				</div>
+			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
-				<div class="control-group">
+?>
-					<div class="controls">
-						<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
-					</div>
-				</div>
 				</form>
 
 <?php

views/bootstrap/class.ChangePassword.php

@@ -58,13 +58,10 @@ document.form1.newpassword.focus();
 		if ($hash) {
 			echo "<input type='hidden' name='hash' value='".$hash."'/>";
 		}
-?>
+		$this->formField(
-
+			getMLText("password"),
-		 <div class="control-group">
+			'<input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password">'
-			<label class="control-label"><?php printMLText("password");?>:</label>
+		);
-			<div class="controls"><input class="pwd" type="password" rel="strengthbar" name="newpassword" id="password"></div>
-		 </div>
-<?php
 		if($passwordstrength > 0) {
 ?>
 		<div class="control-group">
@@ -75,15 +72,12 @@ document.form1.newpassword.focus();
 		</div>
 <?php
 		}
+		$this->formField(
+			getMLText("confirm_pwd"),
+			'<input type="password" name="newpasswordrepeat" id="passwordrepeat">'
+		);
+		$this->formSubmit(getMLText('submit_password'));
 ?>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("confirm_pwd");?>:</label>
-			<div class="controls"><input type="password" name="newpasswordrepeat" id="passwordrepeat"></div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"></label>
-			<div class="controls"><input class="btn" type="submit" value="<?php printMLText("submit_password") ?>"></div>
-		</div>
 
 </form>
 <?php $this->contentContainerEnd(); ?>

views/bootstrap/class.DocumentNotify.php

@@ -158,10 +158,9 @@ $(document).ready( function() {
 			</select>
 		</div>
 	</div>
-
+<?php
-	<div class="controls">
+					$this->formSubmit(getMLText('add'));
-		<input type="submit" class="btn" value="<?php printMLText("add") ?>">
+?>
-	</div>
 
 </form>
 

views/bootstrap/class.EditAttributes.php

@@ -58,27 +58,15 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 					$arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef);
 					if(is_array($arr)) {
 						if($arr) {
-							echo "<div class=\"control-group\">";
+							$this->formField($arr[0], $arr[1]);
-							echo "<label class=\"control-label\">".$arr[0].":</label>";
-							echo "<div class=\"controls\">".$arr[1]."</div>";
-							echo "</div>";
 						}
 					} else {
-?>
+						$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $version->getAttribute($attrdef)));
-    <div class="control-group">
-	<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?></label>
-        <div class="controls">
-	        <?php $this->printAttributeEditField($attrdef, $version->getAttribute($attrdef)) ?>
-        </div>
-	</div>
-<?php
 					}
 				}
 			}
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
 ?>
-		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
-		</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.EditComment.php

@@ -88,15 +88,13 @@ $(document).ready(function() {
 	<?php echo createHiddenFieldWithKey('editcomment'); ?>
 	<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
 	<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
-	<div class="control-group">
+<?php
-			<label class="control-label"><?php printMLText("comment");?>:</label>
+		$this->formField(
-			<div class="controls">
+			getMLText("comment"),
-				<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea>
+			'<textarea name="comment" rows="4" cols="80">'.htmlspecialchars($version->getComment()).'</textarea>'
-			</div>
+		);
-	</div>
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
-	<div class="controls">
+?>
-		<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
-	</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.EditDocumentFile.php

@@ -50,38 +50,33 @@ class SeedDMS_View_EditDocumentFile extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('editdocumentfile'); ?>
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="fileid" value="<?php echo $file->getID()?>">
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("version");?>:</label>
-		<div class="controls"><select name="version" id="version">
-			<option value=""><?= getMLText('document') ?></option>
 <?php
+		$html = '<select name="version" id="version">
+			<option value="">'.getMLText('document').'</option>';
 		$versions = $document->getContent();
 		foreach($versions as $version)
-			echo "<option value=\"".$version->getVersion()."\"".($version->getVersion() == $file->getVersion() ? " selected" : "").">".getMLText('version')." ".$version->getVersion()."</option>";
+			$html .= "<option value=\"".$version->getVersion()."\"".($version->getVersion() == $file->getVersion() ? " selected" : "").">".getMLText('version')." ".$version->getVersion()."</option>";
+		$html .= "</select>";
+		$this->formField(
+			getMLText("version"),
+			$html
+		);
+		$this->formField(
+			getMLText("name"),
+			'<input name="name" type="text" value="'.htmlspecialchars($file->getName()).'"/>'
+		);
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" rows="4" cols="80">'.htmlspecialchars($file->getComment()).'</textarea>'
+		);
+		$this->formField(
+			getMLText("document_link_public"),
+			'<input name="public" type="checkbox" value="true"'.($file->isPublic() ? " checked" : "").' />'
+		);
+?>
+<?php
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
 ?>
-		</select></div>
-	</div>
-	<div class="control-group">
-			<label class="control-label"><?php printMLText("name");?>:</label>
-			<div class="controls">
-				<input name="name" type="text" value="<?php print htmlspecialchars($file->getName());?>" />
-			</div>
-	</div>
-	<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls">
-				<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($file->getComment());?></textarea>
-			</div>
-	</div>
-	<div class="control-group">
-			<label class="control-label"><?php printMLText("document_link_public");?>:</label>
-			<div class="controls">
-				<input type="checkbox" name="public" value="true"<?php echo ($file->isPublic() ? " checked" : "");?> />
-			</div>
-	</div>
-	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
-	</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.EditFolder.php

@@ -83,27 +83,18 @@ $(document).ready(function() {
 <form class="form-horizontal" action="../op/op.EditFolder.php" id="form1" name="form1" method="post">
 		<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
 		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("name");?>:</label>
-			<div class="controls">
-				<input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60" required>
-			</div>
-		</div>	
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls">
-				<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>><?php print htmlspecialchars($folder->getComment());?></textarea>
-			</div>
-		</div>
 <?php
+		$this->formField(
+			getMLText("name"),
+			'<input type="text" name="name" value="'.htmlspecialchars($folder->getName()).'" size="60" required>'
+		);
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" rows="4" cols="80"'.($strictformcheck ? ' required' : '').'>'.htmlspecialchars($folder->getComment()).'</textarea>'
+		);
 		$parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent();
 		if ($parent && $parent->getAccessMode($user) > M_READ) {
-			print "<div class=\"control-group\">";
+			$this->formField(getMLText("sequence"), $this->getSequenceChooser($parent->getSubFolders('s'), $folder->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
-			print "<label class=\"control-label\">" . getMLText("sequence") . ":</label>";
-			print "<div class=\"controls\">";
-			$this->printSequenceChooser($parent->getSubFolders('s'), $folder->getID());
-			if($orderby != 's') echo "<br />".getMLText('order_by_sequence_off'); 
-			print "</div></div>\n";
 		}
 
 		if($attrdefs) {
@@ -111,27 +102,15 @@ $(document).ready(function() {
 				$arr = $this->callHook('editFolderAttribute', $folder, $attrdef);
 				if(is_array($arr)) {
 					if($arr) {
-						echo "<div class=\"control-group\">";
+						$this->formField($arr[0], $arr[1]);
-						echo "<label class=\"control-label\">".$arr[0]."</label>";
-						echo "<div class=\"controls\">".$arr[1]."</div>";
-						echo "</div>";
 					}
 				} else {
-?>
+					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $folder->getAttribute($attrdef)));
-			<div class="control-group">
-				<label class="control-label"><?php echo htmlspecialchars($attrdef->getName()); ?>:</label>
-				<div class="controls">
-					<?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?>
-				</div>
-			</div>
-<?php
 				}
 			}
 		}
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
 ?>
-			<div class="controls">
-				<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
-			</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.EditUserData.php

@@ -101,116 +101,74 @@ $(document).ready( function() {
 		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form">
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("current_password");?>:</label>
-		<div class="controls">
-			<input id="currentpwd" type="password" name="currentpwd" size="30">
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("new_password");?>:</label>
-		<div class="controls">
-			<input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">
-		</div>
-	</div>
 <?php
-	if($passwordstrength) {
+		$this->formField(
-?>
+			getMLText("current_password"),
-	<div class="control-group">
+			'<input id="currentpwd" type="password" name="currentpwd" size="30">'
-		<label class="control-label"><?php printMLText("password_strength");?>:</label>
+		);
-		<div class="controls">
+		$this->formField(
-			<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>
+			getMLText("new_password"),
-		</div>
+			'<input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30">'
-	</div>
+		);
-<?php
+		if($passwordstrength) {
-	}
+			$this->formField(
-?>
+				getMLText("password_strength"),
-	<div class="control-group">
+				'<div id="strengthbar" class="progress" style="width: 220px; height: 30px; margin-bottom: 8px;"><div class="bar bar-danger" style="width: 0%;"></div></div>'
-		<label class="control-label"><?php printMLText("confirm_pwd");?>:</label>
+			);
-		<div class="controls">
+		}
-			<input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30">
+		$this->formField(
-		</div>
+			getMLText("confirm_pwd"),
-	</div>
+			'<input id="pwdconf" type="Password" id="pwdconf" name="pwdconf">'
-	<div class="control-group">
+		);
-		<label class="control-label"><?php printMLText("name");?>:</label>
+		$this->formField(
-		<div class="controls">
+			getMLText("name"),
-			<input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30">
+			'<input type="text" id="fullname" name="fullname" value="'.htmlspecialchars($user->getFullName()).'">'
-		</div>
+		);
-	</div>
+		$this->formField(
-	<div class="control-group">
+			getMLText("email"),
-		<label class="control-label"><?php printMLText("email");?>:</label>
+			'<input type="text" id="email" name="email" value="'.htmlspecialchars($user->getEmail()).'">'
-		<div class="controls">
+		);
-			<input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30">
+		$this->formField(
-		</div>
+			getMLText("comment"),
-	</div>
+			'<textarea name="comment" rows="4" cols="80">'.htmlspecialchars($user->getComment()).'</textarea>'
-	<div class="control-group">
+		);
-		<label class="control-label"><?php printMLText("comment");?>:</label>
-		<div class="controls">
-			<textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($user->getComment());?></textarea>
-		</div>
-	</div>
 
-<?php	
 		if ($enableuserimage){	
-?>	
+			$this->formField(
-	<div class="control-group">
+				getMLText("user_image"),
-		<label class="control-label"><?php printMLText("user_image");?>:</label>
+				($user->hasImage() ? "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">" : getMLText("no_user_image"))
-		<div class="controls">
+			);
-<?php
+			$this->formField(
-			if ($user->hasImage())
+				getMLText("new_user_image"),
-				print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">";
+				$this->getFileChooser('userfile', false, "image/jpeg")
-			else printMLText("no_user_image");
+			);
-?>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("new_user_image");?>:</label>
-		<div class="controls">
-<?php
-	$this->printFileChooser('userfile', false, "image/jpeg");
-?>
-		</div>
-	</div>
-<?php
 		}
 		if ($enablelanguageselector){	
-?>
+			$html = '<select name="language">';
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("language");?>:</label>
-		<div class="controls">
-			<select name="language">
-<?php
 			$languages = getLanguages();
 			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".getMLText($currLang)."</option>";
+				$html .= "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".getMLText($currLang)."</option>";
 			}
-?>
+			$html .= '</select>';
-			</select>
+			$this->formField(
-		</div>
+				getMLText("language"),
-	</div>
+				$html
-<?php
+			);
 		}
 		if ($enablethemeselector){	
-?>
+			$html = '<select name="theme">';
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("theme");?>:</label>
-		<div class="controls">
-			<select name="theme">
-<?php
 			$themes = UI::getStyles();
 			foreach ($themes as $currTheme) {
-				print "<option value=\"".$currTheme."\" ".(($user->getTheme()==$currTheme) ? "selected" : "").">".$currTheme."</option>";
+				$html .= "<option value=\"".$currTheme."\" ".(($user->getTheme()==$currTheme) ? "selected" : "").">".$currTheme."</option>";
 			}
-?>
+			$html .= '</select>';
-			</select>
+			$this->formField(
-		</div>
+				getMLText("theme"),
-	</div>
+				$html
-<?php
+			);
 		}
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
 ?>
-	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
-	</div>
 </form>
 
 <?php

views/bootstrap/class.ExtensionMgr.php

@@ -146,18 +146,13 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		<form class="form-horizontal" method="post" enctype="multipart/form-data" action="../op/op.ExtensionMgr.php">
 			<?= createHiddenFieldWithKey('extensionmgr') ?>
 			<input type="hidden" name="action" value="upload" />
-			<div class="control-group">
+<?php
-				<label class="control-label" for="upload"><?= getMLText('extension_archive'); ?></label>
+			$this->formField(
-				<div class="controls">
+				getMLText("extension_archive"),
-					<?php $this->printFileChooser('userfile', false); ?>
+				$this->getFileChooser('userfile', false)
-				</div>
+			);
-			</div>
+			$this->formSubmit("<i class=\"icon-upload\"></i> ".getMLText('import_extension'));
-			<div class="control-group">
+?>
-				<label class="control-label" for="enddate"></label>
-				<div class="controls">
-					<button id="upload" type="_submit" class="btn"><i class="icon-upload"></i> <?= getMLText("import_extension"); ?></button>
-				</div>
-			</div>
 		</form>
 <?php
 		} else {

views/bootstrap/class.GroupMgr.php

@@ -189,24 +189,16 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addgroup">
 <?php
 		}
+		$this->formField(
+			getMLText("name"),
+			'<input type="text" name="name" id="name" value="'.($group ? htmlspecialchars($group->getName()) : '').'">'
+		);
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" id="comment" rows="4" cols="50">'.($group ? htmlspecialchars($group->getComment()) : '').'</textarea>'
+		);
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
 ?>
-
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("name");?>:</label>
-			<div class="controls">
-				<input type="text" name="name" id="name" value="<?php print $group ? htmlspecialchars($group->getName()) : '';?>">
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls">
-				<textarea name="comment" id="comment" rows="4" cols="50"><?php print $group ? htmlspecialchars($group->getComment()) : '';?></textarea>
-			</div>
-		</div>
-		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
-		</div>
-
 	</form>
 <?php
 		if($group) {

views/bootstrap/class.ImportFS.php

@@ -67,14 +67,11 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 			$this->printDropFolderChooserHtml("form1", "", 1);
 			print "</div></div>";
 
-			print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('removeFolderFromDropFolder')."</label><div class=\"controls\">";
+			$this->formField(
-			print "<input type='checkbox' name='remove' value='1'/>";
+				getMLText("removeFolderFromDropFolder"),
-			print "</div></div>";
+				'<input type="checkbox" name="remove" value="1"/>'
-
+			);
-			print "<div class=\"control-group\"><label class=\"control-label\">";
+			$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('import'));
-			print "</label><div class=\"controls\">";
-			print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/>";
-			print "</div></div>";
 			print "</form>\n";
 			$this->contentContainerEnd();
 		} else {

views/bootstrap/class.Login.php

@@ -122,21 +122,15 @@ $(document).ready( function() {
 		if ($refer) {
 			echo "<input type='hidden' name='referuri' value='".sanitizeString($refer)."'/>";
 		}
-?>
+		$this->formField(
-	<div class="control-group">
+			getMLText("user_login"),
-		<label class="control-label" for="login"><?php printMLText("user_login");?>:</label>
+			'<input type="text" id="login" name="login" placeholder="login" autocomplete="off" required>'
-		<div class="controls">
+		);
-			<input type="text" id="login" name="login" placeholder="login" autocomplete="off" required>
+		$this->formField(
-		</div>
+			getMLText("password"),
-	</div>
+			'<input type="Password" id="pwd" name="pwd" autocomplete="off" required>'
-	<div class="control-group">
+		);
-		<label class="control-label" for="pwd"><?php printMLText("password");?>:</label>
+		if($enable2factauth) {
-		<div class="controls">
-			<input type="Password" id="pwd" name="pwd" autocomplete="off" required>
-		</div>
-	</div>
-<?php if($enable2factauth) { ?>
-<?php
 			require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
 			require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
 			require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
@@ -145,58 +139,37 @@ $(document).ready( function() {
 			require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
 			require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
 			$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
-//			echo $tfa->getCode('33V4QBXEZH2W7XPN');
+			$this->formField(
-?>
+				getMLText("2_factor_auth"),
-	<div class="control-group">
+				'<input type="Password" id="twofactauth" name="twofactauth" value="" />'
-		<label class="control-label" for="pwd"><?php printMLText("2_factor_auth");?>:</label>
+			);
-		<div class="controls">
+		}
-			<input type="Password" id="twofactauth" name="twofactauth" value="<?php //echo $tfa->getCode('NO3BORB54YPCJMQX'); ?>">
+		if($enableLanguageSelector) {
-		</div>
+			$html = "<select id=\"languageselector\" name=\"lang\">";
-	</div>
+			$html .= "<option value=\"\">-";
-<?php
-	}
-	if($enableLanguageSelector) {
-?>
-	<div class="control-group">
-		<label class="control-label" for="pwd"><?php printMLText("language");?>:</label>
-		<div class="controls">
-<?php
-			print "<select id=\"languageselector\" name=\"lang\">";
-			print "<option value=\"\">-";
 			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
+				$html .= "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
 			}
-			print "</select>";
+			$html .= "</select>";
-?>
+			$this->formField(
-		</div>
+				getMLText("language"),
-	</div>
+				$html
-<?php
+			);
-	}
+		}
-	if($enableThemeSelector) {
+		if($enableThemeSelector) {
-?>
+			$html = "<select id=\"themeselector\" name=\"sesstheme\">";
-	<div class="control-group">
+			$html .= "<option value=\"\">-";
-		<label class="control-label" for="pwd"><?php printMLText("theme");?>:</label>
-		<div class="controls">
-			
-<?php
-			print "<select id=\"themeselector\" name=\"sesstheme\">";
-			print "<option value=\"\">-";
 			foreach ($themes as $currTheme) {
-				print "<option value=\"".$currTheme."\">".$currTheme;
+				$html .= "<option value=\"".$currTheme."\">".$currTheme;
 			}
-			print "</select>";
+			$html .= "</select>";
+			$this->formField(
+				getMLText("theme"),
+				$html
+			);
+		}
+		$this->formSubmit(getMLText('submit_login'));
 ?>
-		</div>
-	</div>
-<?php
-	}
-?>
-	<div class="control-group">
-		<div class="controls">
-		<button type="submit" class="btn"><?php printMLText("submit_login") ?></button>
-		</div>
-	</div>
-		
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.MoveDocument.php

@@ -59,9 +59,9 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
 			<?php $this->printFolderChooserHtml("form1", M_READWRITE, -1, $target);?>
 		</div>
 	</div>
-	<div class="controls">
+<?php
-		<input class="btn" type="submit" value="<?php printMLText("move"); ?>">
+		$this->formSubmit(getMLText('move'));
-	</div>
+?>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.MoveFolder.php

@@ -60,9 +60,9 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
 			<?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?>
 		</div>
 	</div>
-	<div class="controls">
+<?php
-		<input class="btn" type="submit" value="<?php printMLText("move_folder"); ?>">
+		$this->formSubmit(getMLText('move_folder'));
-	</div>
+?>
 </form>
 
 

views/bootstrap/class.OverrideContentStatus.php

@@ -85,32 +85,26 @@ $(document).ready(function() {
 // Display the Review form.
 ?>
 <form class="form-horizontal" method="post" action="../op/op.OverrideContentStatus.php" id="form1" name="form1">
-	<div class="control-group">
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-		<label class="control-label"><?php echo(printMLText("comment"));?>:</label>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-		<div class="controls">
+<?php
-			<textarea name="comment" cols="40" rows="4"></textarea>
+		$this->formField(
-		</div>
+			getMLText("comment"),
-	</div>
+			'<textarea name="comment" rows="4" cols="40"></textarea>'
-	<div class="control-group">
+		);
-		<label class="control-label"><?php echo(printMLText("status")); ?>:</label>
+		$html = '<select name="overrideStatus">
-		<div class="controls">
+				<option value=""></option>';
-			<select name="overrideStatus">
+		if ($overallStatus["status"] == S_OBSOLETE) $html .= "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
-				<option value=''></option>
+		if ($overallStatus["status"] == S_RELEASED) $html .= "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
-	<?php
+		if ($overallStatus["status"] != S_DRAFT) $html .= "<option value='".S_DRAFT."'>".getOverallStatusText(S_DRAFT)."</option>";
-
+		if ($overallStatus["status"] != S_NEEDS_CORRECTION) $html .= "<option value='".S_NEEDS_CORRECTION."'>".getOverallStatusText(S_NEEDS_CORRECTION)."</option>";
-		if ($overallStatus["status"] != S_RELEASED) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
+		$html .= "</select>";
-		if ($overallStatus["status"] != S_OBSOLETE) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
+		$this->formField(
-		if ($overallStatus["status"] != S_DRAFT) echo "<option value='".S_DRAFT."'>".getOverallStatusText(S_DRAFT)."</option>";
+			getMLText("status"),
-		if ($overallStatus["status"] != S_NEEDS_CORRECTION) echo "<option value='".S_NEEDS_CORRECTION."'>".getOverallStatusText(S_NEEDS_CORRECTION)."</option>";
+			$html
-
+		);
-	?>
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('update'));
-	</select>
+?>
-	</div></div>
-	<div class="controls">
-		<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-		<input type='submit' class="btn" name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
-	</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.PasswordForgotten.php

@@ -80,24 +80,17 @@ document.form1.email.focus();
 		}
 ?>
   <p><?php printMLText("password_forgotten_text"); ?></p>
-
+<?php
-		<div class="control-group">
+		$this->formField(
-		<label class="control-label"><?php printMLText("user_login");?>:</label>
+			getMLText("user_login"),
-			<div class="controls">
+			'<input type="text" name="login" id="login">'
-			<input type="text" name="login" id="login">
+		);
-			</div>
+		$this->formField(
-		</div>
+			getMLText("email"),
-		<div class="control-group">
+			'<input type="text" name="email" id="email">'
-			<label class="control-label"><?php printMLText("email");?>:</label>
+		);
-			<div class="controls">
+		$this->formSubmit(getMLText('submit_password_forgotten'));
-				<input type="text" name="email" id="email">
+?>
-			</div>
-		</div>
-
-		<div class="controls">
-			<input class="btn" type="submit" value="<?php printMLText("submit_password_forgotten") ?>">
-		</div>
-
 </form>
 <?php $this->contentContainerEnd(); ?>
 <p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>

views/bootstrap/class.SendLoginData.php

@@ -46,22 +46,13 @@ class SeedDMS_View_SendLoginData extends SeedDMS_Bootstrap_Style {
 <input type="hidden" name="userid" value="<?php print $newuser->getID();?>">
 <input type="hidden" name="action" value="sendlogindata">
 <?php echo createHiddenFieldWithKey('sendlogindata'); ?>
-
+<?php
-<div class="control-group">
+		$this->formField(
-	<label class="control-label" for="assignTo">
+			getMLText("comment"),
-<?php printMLText("comment"); ?>:
+			'<textarea name="comment"></textarea>'
-	</label>
+		);
-	<div class="controls">
+		$this->formSubmit("<i class=\"icon-envelope-alt\"></i> ".getMLText('send_email'));
-		<textarea name="comment"></textarea>
+?>
-	</div>
-</div>
-
-<div class="control-group">
-	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-envelope-alt"></i> <?php printMLText("send_email");?></button>
-	</div>
-</div>
-
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.SetExpires.php

@@ -66,31 +66,26 @@ $(document).ready( function() {
 
 <form class="form-horizontal" action="../op/op.SetExpires.php" method="post">
 <input type="hidden" name="documentid" value="<?php print $document->getID();?>">
-	<div class="control-group">
+<?php
-		<label class="control-label" for="login"><?php printMLText("preset_expires");?>:</label>
+		$html ='
-		<div class="controls">
 			<select name="presetexpdate" id="presetexpdate">
-				<option value="never"><?php printMLText('does_not_expire');?></option>
+				<option value="never">'.getMLText('does_not_expire').'</option>
-				<option value="date"<?php echo ($expdate != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
+				<option value="date"'.($expdate != '' ? " selected" : "").'>'.getMLText('expire_by_date').'</option>
-				<option value="1w"><?php printMLText('expire_in_1w');?></option>
+				<option value="1w">'.getMLText('expire_in_1w').'</option>
-				<option value="1m"><?php printMLText('expire_in_1m');?></option>
+				<option value="1m">'.getMLText('expire_in_1m').'</option>
-				<option value="1y"><?php printMLText('expire_in_1y');?></option>
+				<option value="1y">'.getMLText('expire_in_1y').'</option>
-				<option value="2y"><?php printMLText('expire_in_2y');?></option>
+				<option value="2y">'.getMLText('expire_in_2y').'</option>
-			</select>
+			</select>';
-		</div>
+		$this->formField(
-	</div>
+			getMLText("preset_expires"),
-	<div class="control-group" id="control_expdate">
+			$html
-		<label class="control-label"><?php printMLText("expires");?>:</label>
+		);
-		<div class="controls">
+		$this->formField(
-    <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+			getMLText("expires"),
-      <input class="span3" name="expdate" type="text" value="<?php echo $expdate; ?>">
+			$this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage())
-      <span class="add-on"><i class="icon-calendar"></i></span>
+		);
-    </span>
+		$this->formSubmit("<i class=\"icon-save\"></i> ".getMLText('save'));
-		</div>
+?>
-	</div>
-	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save") ?></button>
-	</div>
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.SetWorkflow.php

@@ -82,29 +82,23 @@ $(document).ready( function() {
 		<input type="hidden" name="version" value="<?php print $latestContent->getVersion(); ?>">
 		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
 
-		<div class="control-group">
-			<label class="control-label">
-				<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
-      		</label>
-      		<div class="controls">
 <?php
-					echo "<select id=\"selector\" class=\"_chzn-select-deselect\" name=\"workflow\" data-placeholder=\"".getMLText('select_workflow')."\">";
+					$html = "<select id=\"selector\" class=\"_chzn-select-deselect\" name=\"workflow\" data-placeholder=\"".getMLText('select_workflow')."\">";
 					$mandatoryworkflow = $user->getMandatoryWorkflow();
 					$workflows=$dms->getAllWorkflows();
 					foreach ($workflows as $workflow) {
-						print "<option value=\"".$workflow->getID()."\"";
+						$html .= "<option value=\"".$workflow->getID()."\"";
 						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
+							$html .= " selected=\"selected\"";
-						print ">". htmlspecialchars($workflow->getName())."</option>";
+						$html .= ">". htmlspecialchars($workflow->getName())."</option>";
 					}
-					echo "</select>";
+					$html .= "</select>";
+					$this->formField(
+						getMLText("workflow"),
+						$html
+					);
+					$this->formSubmit(getMLText('set_workflow'));
 ?>
-			</div>
-		</div>
-
-		<div class="controls">
-			<input type="submit" class="btn" value="<?php printMLText("set_workflow");?>">
-		</div>
 
 		</form>
 <?php

views/bootstrap/class.Settings.php

@@ -474,6 +474,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
       -->
 <?php
 	foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) {
+		if($extconf['config']) {
 		$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".$extconf['title']);
 		foreach($extconf['config'] as $confkey=>$conf) {
 						ob_start();
@@ -567,7 +568,8 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 						$html = ob_get_clean();
 			$this->showConfigPlain($conf['title'], isset($conf['help']) ? $conf['help'] : '', $html);
 					}
-				}
+		}
+	}
 	$this->showEndPaneContent('extensions', $currenttab);
 ?>
   </div>

views/bootstrap/class.Setup2Factor.php

@@ -91,9 +91,9 @@ $(document).ready( function() {
 		<div class="control-group"><label class="control-label"></label><div class="controls">
 		<img src="<?php echo $tfa->getQRCodeImageAsDataUri($sitename, $secret); ?>">
 		</div></div>
-		<div class="control-group"><label class="control-label"></label><div class="controls">
+<?php
-		<input class="btn" type="submit" value="<?php printMLText("submit_2_fact_auth") ?>"><br />
+		$this->formSubmit(getMLText('submit_2_fact_auth'));
-		</div></div>
+?>
 </form>
 <?php
 		if($oldsecret) {

views/bootstrap/class.TransferDocument.php

@@ -44,37 +44,27 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Bootstrap_Style {
 <form class="form-horizontal" action="../op/op.TransferDocument.php" name="form1" method="post">
 <input type="hidden" name="documentid" value="<?php print $document->getID();?>">
 <?php echo createHiddenFieldWithKey('transferdocument'); ?>
-
-<div class="control-group">
-	<label class="control-label" for="assignTo">
-<?php printMLText("transfer_to_user"); ?>:
-	</label>
-	<div class="controls">
-<select name="userid" class="chzn-select">
 <?php
+		$html = '<select name="userid" class="chzn-select">';
 		$owner = $document->getOwner();
 		foreach ($allusers as $currUser) {
 			if ($currUser->isGuest() || ($currUser->getID() == $owner->getID()))
 				continue;
 
-			print "<option value=\"".$currUser->getID()."\"";
+			$html .= "<option value=\"".$currUser->getID()."\"";
 			if($folder->getAccessMode($currUser) < M_READ)
-				print " disabled data-warning=\"".getMLText('transfer_no_read_access')."\"";
+				$html .= " disabled data-warning=\"".getMLText('transfer_no_read_access')."\"";
 			elseif($folder->getAccessMode($currUser) < M_READWRITE)
-				print " data-warning=\"".getMLText('transfer_no_write_access')."\"";
+				$html .= " data-warning=\"".getMLText('transfer_no_write_access')."\"";
-			print ">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName());
+			$html .= ">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName());
 		}
+		$html .= '</select>';
+		$this->formField(
+			getMLText("transfer_to_user"),
+			$html
+		);
+		$this->formSubmit("<i class=\"icon-exchange\"></i> ".getMLText('transfer_document'));
 ?>
-</select>
-	</div>
-</div>
-
-<div class="control-group">
-	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-exchange"></i> <?php printMLText("transfer_document");?></button>
-	</div>
-</div>
-
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.TransferObjects.php

@@ -50,32 +50,22 @@ class SeedDMS_View_TransferObjects extends SeedDMS_Bootstrap_Style {
 <input type="hidden" name="userid" value="<?php print $rmuser->getID();?>">
 <input type="hidden" name="action" value="transferobjects">
 <?php echo createHiddenFieldWithKey('transferobjects'); ?>
-
-<div class="control-group">
-	<label class="control-label" for="assignTo">
-<?php printMLText("transfer_objects_to_user"); ?>:
-	</label>
-	<div class="controls">
-<select name="assignTo" class="chzn-select">
 <?php
+		$html = '<select name="assignTo" class="chzn-select">';
 		foreach ($allusers as $currUser) {
 			if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
 				continue;
 
 			if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count;
-			print "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName());
+			$html .= "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName());
 		}
+		$html .= '</select>';
+		$this->formField(
+			getMLText("transfer_objects_to_user"),
+			$html
+		);
+		$this->formSubmit("<i class=\"icon-share-alt\"></i> ".getMLText('transfer_objects'));
 ?>
-</select>
-	</div>
-</div>
-
-<div class="control-group">
-	<div class="controls">
-		<button type="submit" class="btn"><i class="icon-share-alt"></i> <?php printMLText("transfer_objects");?></button>
-	</div>
-</div>
-
 </form>
 <?php
 		$this->contentContainerEnd();

views/bootstrap/class.TriggerWorkflow.php

@@ -102,19 +102,17 @@ $(document).ready(function() {
 	<div class="row-fluid">
 	<div class="span4">
 	<form class="form-horizontal" method="post" action="../op/op.TriggerWorkflow.php" id="form1" name="form1">
-	<?php echo createHiddenFieldWithKey('triggerworkflow'); ?>
-	<div class="control-group">
-		<label class="control-label"><?php printMLText('comment'); ?>:</label>
-		<div class="controls">
-			<textarea name="comment" cols="80" rows="4"></textarea>
-		</div>
-	</div>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId(); ?>'/>
 	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
 	<input type='hidden' name='transition' value='<?php echo $transition->getID(); ?>'/>
-	<div class="controls">
+	<?php echo createHiddenFieldWithKey('triggerworkflow'); ?>
-		<input type='submit' class="btn" value='<?php printMLText("action_".strtolower($action->getName()), array(), $action->getName()); ?>'/>
+<?php
-	</div>
+		$this->formField(
+			getMLText("comment"),
+			'<textarea name="comment" cols="80" rows="4"></textarea>'
+		);
+		$this->formSubmit(getMLText("action_".strtolower($action->getName()), array(), $action->getName()));
+?>
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">