Merge branch 'seeddms-5.1.x'

CHANGELOG

@@ -116,6 +116,11 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.36
+--------------------------------------------------------------------------------
+- fix sql statement for creating temp. tables (sqlite)
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.35
 --------------------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-VERSION=5.1.2
+VERSION=5.1.3
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -363,7 +363,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.2';
+			$this->version = '5.1.3';
 	} /* }}} */
 
 	/**

SeedDMS_Core/Core/inc.DBAccessPDO.php

@@ -370,7 +370,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` AS ".
-						"SELECT `tblDocumentReviewLog`.`reviewID`, ".
+						"SELECT `tblDocumentReviewLog`.`reviewID` AS `reviewID`, ".
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
@@ -411,7 +411,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` AS ".
-						"SELECT `tblDocumentApproveLog`.`approveID`, ".
+						"SELECT `tblDocumentApproveLog`.`approveID` AS `approveID`, ".
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` "; //.

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-03-23</date>
+ <date>2017-07-13</date>
  <time>06:34:50</time>
  <version>
-  <release>5.1.2</release>
+  <release>5.1.3</release>
-  <api>5.1.2</api>
+  <api>5.1.3</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,13 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
-if the owner tries to access them
-Check return value of onPreRemove[Document|Folder], return from calling method if bool
-Add SeedDMS_Core_DMS::getDocumentList()
-Limit number of duplicate files to 1000
-Add hook on(Pre|Post)RemoveContent
-Add hook onAttributeValidate
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1189,7 +1182,7 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
    </notes>
   </release>
   <release>
-   <date>2017-03-23</date>
+   <date>2017-07-11</date>
    <time>06:38:12</time>
    <version>
     <release>4.3.35</release>
@@ -1204,6 +1197,22 @@ SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
 do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set
    </notes>
   </release>
+  <release>
+   <date>2017-03-22</date>
+   <time>06:38:12</time>
+   <version>
+    <release>4.3.36</release>
+    <api>4.3.36</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- fix sql statement for creating temp. tables (sqlite)
+   </notes>
+  </release>
   <release>
    <date>2016-01-22</date>
    <time>14:34:58</time>
@@ -1399,6 +1408,21 @@ all sql statements can be logged to a file
 do not sort some temporary tables anymore, because it causes an error in mysql if            sql_mode=only_full_group_by is set
    </notes>
   </release>
+  <release>
+   <date>2017-07-13</date>
+   <time>07:07:02</time>
+   <version>
+    <release>5.0.13</release>
+    <api>5.0.13</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+   </notes>
+  </release>
   <release>
    <date>2017-02-20</date>
    <time>07:07:02</time>
@@ -1431,5 +1455,27 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
 - all changes from 5.0.11 merged
    </notes>
   </release>
+  <release>
+   <date>2017-03-23</date>
+   <time>06:34:50</time>
+   <version>
+    <release>5.1.2</release>
+    <api>5.1.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
+if the owner tries to access them
+Check return value of onPreRemove[Document|Folder], return from calling method if bool
+Add SeedDMS_Core_DMS::getDocumentList()
+Limit number of duplicate files to 1000
+Add hook on(Pre|Post)RemoveContent
+Add hook onAttributeValidate
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.2";
+	public $_number = "5.1.3";
 	private $_string = "SeedDMS";
 
 	function __construct() {

install/install.php

@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.1.2");
+define("SEEDDMS_VERSION", "5.1.3");
 
 require_once('../inc/inc.ClassSettings.php');
 

languages/ar_EG/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 (1274)
+//    Translators: Admin (1275)
 
 $text = array(
 '2_factor_auth' => '',
@@ -609,6 +609,7 @@ URL: [url]',
 'js_no_approval_group' => 'من فضلك اختر مجموعة الموافقة',
 'js_no_approval_status' => 'من فضلك اختر حالة الموافقة',
 'js_no_comment' => 'لايوجد تعليق',
+'js_no_currentpwd' => '',
 'js_no_email' => 'اكتب بريدك الالكتروني',
 'js_no_file' => 'من فضلك اختر ملف',
 'js_no_keywords' => 'من فضلك اختر بعض الكلمات البحثية',
@@ -643,7 +644,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل <a href="%s">صفحة التحميل</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'ﻉﺮﺿ ﻚﻟ ﺎﻠﺻﻼﺤﻳﺎﺗ',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'ملف محلي',
@@ -1386,6 +1387,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1459,6 +1461,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'ﺖﻐﻳﺭ ﺎﻠﺣﺎﻟﺓ ﻢﻋ ﺎﻟﺰﻤﻧ',
 'to' => 'الى',
 'toggle_manager' => 'رجح مدير',

languages/bg_BG/lang.inc

@@ -540,6 +540,7 @@ $text = array(
 'js_no_approval_group' => 'Изберете утвърждаваща група',
 'js_no_approval_status' => 'Изберете статусът на утвърждаване',
 'js_no_comment' => 'Няма коментар',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Въведете своя Email',
 'js_no_file' => 'Изберете файл',
 'js_no_keywords' => 'Укажете ключови думи',
@@ -1251,6 +1252,7 @@ $text = array(
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1324,6 +1326,8 @@ $text = array(
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '',
 'to' => 'към',
 'toggle_manager' => 'Превключи мениджър',

languages/ca_ES/lang.inc

@@ -545,6 +545,7 @@ URL: [url]',
 'js_no_approval_group' => 'Si us plau, seleccioneu grup d\'aprovació',
 'js_no_approval_status' => 'Si us plau, seleccioneu l\'estat d\'aprovació',
 'js_no_comment' => 'No hi ha comentaris',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Si us plau, escriviu la vostra adreça de correu electrònic',
 'js_no_file' => 'Si us plau, seleccioneu un arxiu',
 'js_no_keywords' => 'Si us plau, especifiqueu mots clau',
@@ -1256,6 +1257,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1329,6 +1331,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versió [version]:[status]',
 'to' => 'Fins',
 'toggle_manager' => 'Intercanviar manager',

languages/cs_CZ/lang.inc

@@ -616,6 +616,7 @@ URL: [url]',
 'js_no_approval_group' => 'Prosím, vyberte skupinu pro schválení',
 'js_no_approval_status' => 'Prosím, vyberte stav schválení',
 'js_no_comment' => 'Žádný komentář',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Napište svou emailovou adresu',
 'js_no_file' => 'Prosím, vyberte soubor',
 'js_no_keywords' => 'Zadejte nějaká klíčová slova',
@@ -1395,6 +1396,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uživatel odstraněn',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Nastavení uloženo',
 'splash_substituted_user' => 'Zaměněný uživatel',
@@ -1468,6 +1470,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Verze [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Přepnout správce',

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 (2420), dgrutsch (22)
+//    Translators: Admin (2424), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -627,6 +627,7 @@ URL: [url]',
 'js_no_approval_group' => 'Wählen Sie bitte eine Freigabe-Gruppe aus',
 'js_no_approval_status' => 'Wählen Sie bitte einen Freigabe-Status aus',
 'js_no_comment' => 'Geben Sie einen Kommentar an',
+'js_no_currentpwd' => 'Bitte das aktuelle Passwort eintragen',
 'js_no_email' => 'Geben Sie eine Email-Adresse an',
 'js_no_file' => 'Bitte wählen Sie eine Datei',
 'js_no_keywords' => 'Geben Sie einige Stichwörter an',
@@ -1451,6 +1452,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Dokumentenliste gelöscht',
 'splash_rm_user' => 'Benutzer gelöscht',
 'splash_saved_file' => 'Version gespeichert',
+'splash_save_user_data' => 'Benutzerdaten gespeichert',
 'splash_send_download_link' => 'Download-Link per E-Mail verschickt.',
 'splash_settings_saved' => 'Einstellungen gesichert',
 'splash_substituted_user' => 'Benutzer gewechselt',
@@ -1524,6 +1526,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'bevorstehende Freigabe',
 'timeline_skip_status_change_2' => 'freigegeben',
 'timeline_skip_status_change_3' => 'im Workflow',
+'timeline_skip_status_change_4' => 'In Revision',
+'timeline_skip_status_change_5' => 'Entwurf',
 'timeline_status_change' => 'Version [version]: [status]',
 'to' => 'bis',
 'toggle_manager' => 'Managerstatus wechseln',

languages/el_GR/lang.inc

@@ -540,6 +540,7 @@ $text = array(
 'js_no_approval_group' => '',
 'js_no_approval_status' => '',
 'js_no_comment' => '',
+'js_no_currentpwd' => '',
 'js_no_email' => '',
 'js_no_file' => '',
 'js_no_keywords' => '',
@@ -1262,6 +1263,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1335,6 +1337,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '',
 'to' => 'Προς',
 'toggle_manager' => '',

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 (1545), dgrutsch (9), netixw (14)
+//    Translators: Admin (1550), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -628,6 +628,7 @@ URL: [url]',
 'js_no_approval_group' => 'Please select a approval group',
 'js_no_approval_status' => 'Please select the approval status',
 'js_no_comment' => 'There is no comment',
+'js_no_currentpwd' => 'Please enter your current password',
 'js_no_email' => 'Type in your Email-address',
 'js_no_file' => 'Please select a file',
 'js_no_keywords' => 'Specify some keywords',
@@ -1446,6 +1447,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Transmittal deleted',
 'splash_rm_user' => 'User removed',
 'splash_saved_file' => 'Version saved',
+'splash_save_user_data' => 'User data saved',
 'splash_send_download_link' => 'Download link sent by email.',
 'splash_settings_saved' => 'Settings saved',
 'splash_substituted_user' => 'Substituted user',
@@ -1518,7 +1520,9 @@ URL: [url]',
 'timeline_skip_status_change_0' => 'pending review',
 'timeline_skip_status_change_1' => 'pending approval',
 'timeline_skip_status_change_2' => 'released',
-'timeline_skip_status_change_3' => 'within workflow',
+'timeline_skip_status_change_3' => 'in workflow',
+'timeline_skip_status_change_4' => 'in revision',
+'timeline_skip_status_change_5' => 'draft',
 'timeline_status_change' => 'Version [version]: [status]',
 'to' => 'To',
 'toggle_manager' => 'Toggle manager',

languages/es_ES/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: acabello (20), Admin (1021), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1022), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -405,7 +405,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con esta operación se creará un volcado a fichero del contenido de la base de datos. Después de la creación del volcado el fichero se guardará en la carpeta de datos de su servidor.',
 'dump_list' => 'Ficheros de volcado existentes',
 'dump_remove' => 'Eliminar fichero de volcado',
-'duplicates' => '',
+'duplicates' => 'Duplicados',
 'duplicate_content' => 'Contenido duplicado',
 'edit' => 'editar',
 'edit_attributes' => 'Editar atributos',
@@ -616,6 +616,7 @@ URL: [url]',
 'js_no_approval_group' => 'Por favor, seleccione grupo de aprobación',
 'js_no_approval_status' => 'Por favor, seleccione el estado de aprobación',
 'js_no_comment' => 'No hay comentarios',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Escriba su dirección de correo electrónico',
 'js_no_file' => 'Por favor, seleccione un archivo',
 'js_no_keywords' => 'Especifique palabras clave',
@@ -1401,6 +1402,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuario eliminado',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Configuración guardada',
 'splash_substituted_user' => 'Usuario sustituido',
@@ -1474,6 +1476,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'aprovaciones pendientes',
 'timeline_skip_status_change_2' => 'versiones',
 'timeline_skip_status_change_3' => 'con flujo de trabajo',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versión [version]: [estado]',
 'to' => 'Hasta',
 'toggle_manager' => 'Intercambiar mánager',

languages/fr_FR/lang.inc

@@ -628,6 +628,7 @@ URL: [url]',
 'js_no_approval_group' => 'Veuillez sélectionner un groupe d’approbation',
 'js_no_approval_status' => 'Veuillez sélectionner le statut d’approbation',
 'js_no_comment' => 'Il n\'y a pas de commentaires',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Saisissez votre adresse e-mail',
 'js_no_file' => 'Veuillez sélectionner un fichier',
 'js_no_keywords' => 'Spécifiez quelques mots-clés',
@@ -1396,6 +1397,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Utilisateur supprimé',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => 'Lien de téléchargement envoyé par e-mail',
 'splash_settings_saved' => 'Configuration sauvegardée',
 'splash_substituted_user' => 'Utilisateur de substitution',
@@ -1469,6 +1471,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'en attente d\'approbation',
 'timeline_skip_status_change_2' => 'publié',
 'timeline_skip_status_change_3' => 'encore dans un workflow',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Version [version] : [status]',
 'to' => 'Au',
 'toggle_manager' => 'Basculer \'Responsable\'',

languages/hr_HR/lang.inc

@@ -621,6 +621,7 @@ Internet poveznica: [url]',
 'js_no_approval_group' => 'Molim odaberite grupu odobrenja',
 'js_no_approval_status' => 'Molim odaberite status odobrenja',
 'js_no_comment' => 'Nema komentara',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Upišite vašu e-mail adresu',
 'js_no_file' => 'Molim odaberite datoteku',
 'js_no_keywords' => 'Odredite neke ključne riječi',
@@ -1422,6 +1423,7 @@ Internet poveznica: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Korisnik uklonjen',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Postavke pohranjene',
 'splash_substituted_user' => 'Zamjenski korisnik',
@@ -1495,6 +1497,8 @@ Internet poveznica: [url]',
 'timeline_skip_status_change_1' => 'na čekanju za odobrenje',
 'timeline_skip_status_change_2' => 'oslobođeno',
 'timeline_skip_status_change_3' => 's tokom rada',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Verzija [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Zamjeni upravitelja',

languages/hu_HU/lang.inc

@@ -616,6 +616,7 @@ URL: [url]',
 'js_no_approval_group' => 'Kérjük válasszon egy jóváhagyó csoportot',
 'js_no_approval_status' => 'Kérjük válasszon jóváhagyási állapotot',
 'js_no_comment' => 'Nincs megjegyzés',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Adja meg email címét',
 'js_no_file' => 'Kérjük válasszon egy állományt',
 'js_no_keywords' => 'Adjon meg kulcsszavakat',
@@ -1400,6 +1401,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Felhasználó eltávolítva',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Beállítások elmentve',
 'splash_substituted_user' => 'Helyettesített felhasználó',
@@ -1473,6 +1475,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'jóváhagyásra vár',
 'timeline_skip_status_change_2' => 'kiadva',
 'timeline_skip_status_change_3' => 'munkafolyamat alatt',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '[version]: [status] Verzio',
 'to' => 'ig',
 'toggle_manager' => 'Kulcs kezelő',

languages/it_IT/lang.inc

@@ -622,6 +622,7 @@ URL: [url]',
 'js_no_approval_group' => 'Si prega di selezionare un gruppo di approvazione',
 'js_no_approval_status' => 'Si prega di selezionare lo stato di approvazione',
 'js_no_comment' => 'Non ci sono commenti',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Scrivi il tuo indirizzo di Email',
 'js_no_file' => 'Per favore seleziona un file',
 'js_no_keywords' => 'Specifica alcune parole-chiave',
@@ -1434,6 +1435,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Trasmissione cancellato',
 'splash_rm_user' => 'Utente eliminato',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Impostazioni salvate',
 'splash_substituted_user' => 'Utente sostituito',
@@ -1507,6 +1509,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'in attesa di approvazione',
 'timeline_skip_status_change_2' => 'rilasciato',
 'timeline_skip_status_change_3' => 'nel workflow',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versione [version]: Stato',
 'to' => 'A',
 'toggle_manager' => 'Gestore',

languages/ko_KR/lang.inc

@@ -621,6 +621,7 @@ URL: [url]',
 'js_no_approval_group' => '승인 그룹을 선택하세요',
 'js_no_approval_status' => '승인 상태를 선택하세요',
 'js_no_comment' => '코멘트가 없습니다',
+'js_no_currentpwd' => '',
 'js_no_email' => '당신의 이메일 주소를 입력',
 'js_no_file' => '파일을 선택하세요',
 'js_no_keywords' => '몇 가지 키워드를 지정',
@@ -1415,6 +1416,7 @@ URL : [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '사용자 제거',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '설정 저장',
 'splash_substituted_user' => '전환된 사용자',
@@ -1488,6 +1490,8 @@ URL : [url]',
 'timeline_skip_status_change_1' => '승인 대기',
 'timeline_skip_status_change_2' => '발표',
 'timeline_skip_status_change_3' => '워크 플로우',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '버전 [version]: [status]',
 'to' => '마감일',
 'toggle_manager' => '전환 매니저',

languages/nl_NL/lang.inc

@@ -614,6 +614,7 @@ URL: [url]',
 'js_no_approval_group' => 'Selecteer a.u.b. een Goedkeuring Groep',
 'js_no_approval_status' => 'Selecteer a.u.b. een Goedkeuring Status',
 'js_no_comment' => 'Er zijn geen commentaren',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Voer uw e-mail adres in',
 'js_no_file' => 'Selecteer een bestand',
 'js_no_keywords' => 'Specificeer een aantal sleutelwoorden',
@@ -1428,6 +1429,7 @@ URL: [url]',
 'splash_rm_transmittal' => 'Verzending verwijderd',
 'splash_rm_user' => 'Gebruiker verwijderd',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Instellingen opgeslagen',
 'splash_substituted_user' => 'Invallers gebruiker',
@@ -1501,6 +1503,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'wacht op goedkeuring',
 'timeline_skip_status_change_2' => 'gepubliceerd',
 'timeline_skip_status_change_3' => 'binnen de workflow',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versie [version]: [status]',
 'to' => 'aan',
 'toggle_manager' => 'Wijzig Beheerder',

languages/pl_PL/lang.inc

@@ -609,6 +609,7 @@ URL: [url]',
 'js_no_approval_group' => 'Proszę wybrać grupę odpowiedzalną za akceptację',
 'js_no_approval_status' => 'Proszę wybrać status akceptacji',
 'js_no_comment' => 'Proszę dodać komentarz',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Wprowadź swój adres email',
 'js_no_file' => 'Proszę wybrać plik',
 'js_no_keywords' => 'Wybierz jakieś słowa kluczowe',
@@ -1380,6 +1381,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Użytkownika usunięto',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Zmiany zapisano',
 'splash_substituted_user' => 'Zmieniono użytkownika',
@@ -1453,6 +1455,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'oczekuje na zatwierdzenie',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => 'w obiegu',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Wersja [wersja]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Przełączanie zarządcy',

languages/pt_BR/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 (945), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (946), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -306,7 +306,7 @@ URL: [url]',
 'docs_in_reception_no_access' => '',
 'docs_in_revision_no_access' => '',
 'document' => 'Documento',
-'documentcontent' => '',
+'documentcontent' => 'Conteúdo do Documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos em Processo',
@@ -615,6 +615,7 @@ URL: [url]',
 'js_no_approval_group' => '',
 'js_no_approval_status' => '',
 'js_no_comment' => 'não há comentário',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Digite seu endereço de e-mail',
 'js_no_file' => 'Por favor selecione um arquivo',
 'js_no_keywords' => 'Especifique algumas palavras-chave',
@@ -1398,6 +1399,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuário removido',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Configurações salvas',
 'splash_substituted_user' => 'Usuário substituido',
@@ -1471,6 +1473,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'aprovação pendente',
 'timeline_skip_status_change_2' => 'liberado',
 'timeline_skip_status_change_3' => 'dentro do fluxo de trabalho',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versão [versão]: [estado]',
 'to' => 'To',
 'toggle_manager' => 'Toggle manager',

languages/ro_RO/lang.inc

@@ -621,6 +621,7 @@ URL: [url]',
 'js_no_approval_group' => 'Vă rugăm să selectați un grup de aprobare',
 'js_no_approval_status' => 'Vă rugăm să selectați statusul de aprobare',
 'js_no_comment' => 'Nu există comentarii',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Introduceti adresa dumneavoastra de email',
 'js_no_file' => 'Vă rugăm să selectați un fișier',
 'js_no_keywords' => 'Specificați câteva cuvinte cheie',
@@ -1423,6 +1424,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uilizator eliminat',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Setări salvate',
 'splash_substituted_user' => 'Utilizator substituit',
@@ -1496,6 +1498,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'așteaptă aprobare',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => 'în proces',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versiune [versiune]: [stare]',
 'to' => 'La',
 'toggle_manager' => 'Comută Manager',

languages/ru_RU/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 (1644)
+//    Translators: Admin (1647)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -572,13 +572,13 @@ URL: [url]',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Задача индексирования поставлена в очередь',
 'index_converters' => 'Индексирование документов',
 'index_done' => '',
 'index_error' => '',
 'index_folder' => 'Полнотекстовый индекс',
 'index_pending' => '',
-'index_waiting' => '',
+'index_waiting' => 'Ожидание',
 'individuals' => 'Пользователи',
 'indivіduals_in_groups' => 'Пользователи группы',
 'inherited' => 'унаследованный',
@@ -621,6 +621,7 @@ URL: [url]',
 'js_no_approval_group' => 'Выберите утверждающую группу',
 'js_no_approval_status' => 'Выберите статус утверждения',
 'js_no_comment' => 'Нет комментария',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Введите свой e-mail',
 'js_no_file' => 'Выберите файл',
 'js_no_keywords' => 'Укажите метки',
@@ -797,7 +798,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Разрешены только .jpg-изображения',
 'order_by_sequence_off' => 'Сортировка последовательности выключена в настройках. Если вы хотите применить этот эффект, вам необходимо его включить',
 'original_filename' => 'Исходное имя файла',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Общий прогресс индексации',
 'owner' => 'Владелец',
 'ownership_changed_email' => 'Владелец изменён',
 'ownership_changed_email_body' => 'Изменён владелец
@@ -1430,6 +1431,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Пользователь удалён',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Настройки сохранены',
 'splash_substituted_user' => 'Пользователь переключён',
@@ -1503,6 +1505,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'ожидает подтверждения',
 'timeline_skip_status_change_2' => 'утверждён',
 'timeline_skip_status_change_3' => 'в процессе',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Версия [version]: [status]',
 'to' => 'До',
 'toggle_manager' => 'Изменить как менеджера',

languages/sk_SK/lang.inc

@@ -544,6 +544,7 @@ URL: [url]',
 'js_no_approval_group' => 'Prosím, vyberte skupinu pre schválenie',
 'js_no_approval_status' => 'Prosím, vyberte stav schválenia',
 'js_no_comment' => 'Žiadny komentár',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Napíšte svoju emailovú adresu',
 'js_no_file' => 'Prosím, vyberte súbor',
 'js_no_keywords' => 'Zadajte nejaké kľúčové slová',
@@ -1255,6 +1256,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1328,6 +1330,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Verzia [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',

languages/sv_SE/lang.inc

@@ -609,6 +609,7 @@ URL: [url]',
 'js_no_approval_group' => 'Välj en grupp som ska godkänna',
 'js_no_approval_status' => 'Välj godkännandestatus',
 'js_no_comment' => 'Det finns inga kommentarer',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Ange din e-postadress',
 'js_no_file' => 'Välj en fil',
 'js_no_keywords' => 'Skriv några nyckelord',
@@ -1386,6 +1387,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Användare har tagits bort',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Inställningar sparat',
 'splash_substituted_user' => 'Bytt användare',
@@ -1459,6 +1461,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Version [version]: [status]',
 'to' => 'till',
 'toggle_manager' => 'Byt manager',

languages/tr_TR/lang.inc

@@ -615,6 +615,7 @@ URL: [url]',
 'js_no_approval_group' => 'Lütfen bir onay grubu seçiniz',
 'js_no_approval_status' => 'Lütfen onay durumu seçiniz',
 'js_no_comment' => 'Açıklama yok',
+'js_no_currentpwd' => '',
 'js_no_email' => 'E-posta adresinizi yazınız',
 'js_no_file' => 'Lütfen dosya seçiniz',
 'js_no_keywords' => 'Anahtar kelime belirleyiniz',
@@ -1402,6 +1403,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Kullanıcı silindi',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Ayarlar kaydedildi',
 'splash_substituted_user' => 'Yerine geçilen kullanıcı',
@@ -1475,6 +1477,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => 'serbest olanlar',
 'timeline_skip_status_change_3' => 'iş akışı içinde',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versiyon [version]: [status]',
 'to' => 'Kime',
 'toggle_manager' => 'Değişim yönetimi',

languages/uk_UA/lang.inc

@@ -621,6 +621,7 @@ URL: [url]',
 'js_no_approval_group' => 'Оберіть групу затвердження',
 'js_no_approval_status' => 'Оберіть статус затвердження',
 'js_no_comment' => 'Немає коментаря',
+'js_no_currentpwd' => '',
 'js_no_email' => 'Введіть свій e-mail',
 'js_no_file' => 'Оберіть файл',
 'js_no_keywords' => 'Вкажіть ключові слова',
@@ -1423,6 +1424,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Користувача видалено',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => 'Налаштування збережено',
 'splash_substituted_user' => 'Користувача переключено',
@@ -1496,6 +1498,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'очікую підтвердження',
 'timeline_skip_status_change_2' => 'затверджений',
 'timeline_skip_status_change_3' => 'у процесі',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Версія [version]: [status]',
 'to' => 'До',
 'toggle_manager' => 'Змінити ознаку менеджера',

languages/zh_CN/lang.inc

@@ -546,6 +546,7 @@ URL: [url]',
 'js_no_approval_group' => '请选择审核组',
 'js_no_approval_status' => '请选择审核状态',
 'js_no_comment' => '没有添加说明',
+'js_no_currentpwd' => '',
 'js_no_email' => '输入您的e-mail',
 'js_no_file' => '请选择一个文件',
 'js_no_keywords' => '指定关键字',
@@ -1257,6 +1258,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1330,6 +1332,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '版本 [版本]: [状态]',
 'to' => '到',
 'toggle_manager' => '角色切换',

languages/zh_TW/lang.inc

@@ -544,6 +544,7 @@ URL: [url]',
 'js_no_approval_group' => '請選擇審核組',
 'js_no_approval_status' => '請選擇審核狀態',
 'js_no_comment' => '沒有添加說明',
+'js_no_currentpwd' => '',
 'js_no_email' => '輸入您的e-mail',
 'js_no_file' => '請選擇一個檔',
 'js_no_keywords' => '指定關鍵字',
@@ -1255,6 +1256,7 @@ URL: [url]',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
 'splash_saved_file' => '',
+'splash_save_user_data' => '',
 'splash_send_download_link' => '',
 'splash_settings_saved' => '',
 'splash_substituted_user' => '',
@@ -1328,6 +1330,8 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_4' => '',
+'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '版本 [版本號]:[狀態]',
 'to' => '到',
 'toggle_manager' => '角色切換',

op/op.EditUserData.php

@@ -127,6 +127,8 @@ if (isset($_FILES["userfile"]) && is_uploaded_file($_FILES["userfile"]["tmp_name
 	$user->setImage($_FILES["userfile"]["tmp_name"], $_FILES["userfile"]["type"]);
 }
 
+$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_save_user_data')));
+
 add_log_line("?user=".$user->getLogin());
 
 header("Location:../out/out.MyAccount.php");

views/bootstrap/class.AddFile.php

@@ -68,6 +68,12 @@ $(document).ready( function() {
 				timeout: 1500,
 			});
 		},
+		highlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
+		},
+		unhighlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
+		},
 <?php
 		if($enablelargefileupload) {
 ?>

views/bootstrap/class.AddSubFolder.php

@@ -35,37 +35,7 @@ class SeedDMS_View_AddSubFolder extends SeedDMS_Bootstrap_Style {
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript');
 ?>
-function checkForm()
-{
-	msg = new Array();
-	if (document.form1.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready( function() {
-/*	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-*/
 	$("#form1").validate({
 		invalidHandler: function(e, validator) {
 			noty({
@@ -77,6 +47,12 @@ $(document).ready( function() {
 				timeout: 1500,
 			});
 		},
+		highlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
+		},
+		unhighlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
+		},
 		messages: {
 			name: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>"

views/bootstrap/class.EditDocument.php

@@ -36,41 +36,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
 		header('Content-Type: application/javascript');
 		$this->printKeywordChooserJs('form1');
 ?>
-function checkForm()
-{
-	msg = new Array();
-	if ($("#name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-	?>
-	if ($("#comment").val() == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if ($("#keywords").val() == "") msg.push("<?php printMLText("js_no_keywords");?>");
-<?php
-	}
-?>
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
 $(document).ready( function() {
-/*
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-*/
 	$("#form1").validate({
 		invalidHandler: function(e, validator) {
 			noty({

views/bootstrap/class.EditFolder.php

@@ -35,37 +35,7 @@ class SeedDMS_View_EditFolder extends SeedDMS_Bootstrap_Style {
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
-function checkForm()
-{
-	msg = new Array();
-	if (document.form1.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-/*
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-*/
 	$("#form1").validate({
 		invalidHandler: function(e, validator) {
 			noty({
@@ -77,6 +47,12 @@ $(document).ready(function() {
 				timeout: 1500,
 			});
 		},
+		highlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
+		},
+		unhighlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
+		},
 		messages: {
 			name: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>"

views/bootstrap/class.EditUserData.php

@@ -34,35 +34,7 @@ class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 ?>
-function checkForm()
-{
-	msg = new Array();
-	if ($("#pwd").val() != $("#pwdconf").val()) msg.push("<?php printMLText("js_pwd_not_conf");?>");
-	if ($("#fullname").val() == "") msg.push("<?php printMLText("js_no_name");?>");
-	if ($("#email").val() == "") msg.push("<?php printMLText("js_no_email");?>");
-//	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
 $(document).ready( function() {
-/*
-	$('body').on('submit', '#form', function(ev){
-		if(checkForm()) return;
-		ev.preventDefault();
-	});
-*/
 	$("#form").validate({
 		invalidHandler: function(e, validator) {
 			noty({
@@ -74,7 +46,16 @@ $(document).ready( function() {
 				timeout: 1500,
 			});
 		},
+		highlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(validClass).addClass(errorClass);
+		},
+		unhighlight: function(e, errorClass, validClass) {
+			$(e).parent().parent().removeClass(errorClass).addClass(validClass);
+		},
 		rules: {
+			currentpwd: {
+				required: true
+			},
 			fullname: {
 				required: true
 			},
@@ -87,6 +68,7 @@ $(document).ready( function() {
 			}
 		},
 		messages: {
+			currentpwd: "<?php printMLText("js_no_currentpwd");?>",
 			fullname: "<?php printMLText("js_no_name");?>",
 			email: {
 				required: "<?php printMLText("js_no_email");?>",