Merge branch 'develop'

application/config/application.php

@@ -5,7 +5,7 @@
  * Do not modify it unless you know what you're doing.
  */
 
-$app = [ 'name' => 'Bacula-Web', 'version' => '8.2.0',
+$app = [ 'name' => 'Bacula-Web', 'version' => '8.2.1',
         'routes' => [   'home' => 'Dashboard', 
                         'test' => 'Test',
                         'jobs' => 'Jobs',

application/views/templates/footer.tpl

@@ -5,7 +5,6 @@
         <script src="vendor/datatables/datatables/media/js/jquery.dataTables.min.js"></script>
         <script src="vendor/datatables/datatables/media/js/dataTables.bootstrap.min.js"></script>
         <script src="vendor/components/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"></script>
-        <script src="vendor/1000hz/bootstrap-validator/dist/validator.min.js"></script>
 
         <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
         <script src="application/assets/js/ie10-viewport-bug-workaround.js"></script>
@@ -15,6 +14,9 @@
             var config_language = "{php}echo FileConfig::get_Value('language');{/php};"
         </script>
 
+        <!-- Bootstrap validator -->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
+
         <script src="application/assets/js/default.js"></script>
     </body>
 </html>

application/views/usersettings.view.php

@@ -24,6 +24,7 @@ public function __construct() {
         $this->templateName = 'usersettings.tpl';
         $this->name = 'User settings';
         $this->title = '';
+        $this->username = '';
 
         $this->userauth = new UserAuth();
 
@@ -32,7 +33,11 @@ public function __construct() {
 
     public function prepare() {
 
-        $this->assign( 'username', $_SESSION['username']);
+        $this->username = $_SESSION['username'];
+        $this->assign( 'username', $this->username);
+
+        $user = $this->userauth->getData($this->username);
+        $this->assign( 'email', $user['email']);
 
         // Check if password reset have been requested
         if( isset( $_REQUEST['action'])) {

composer.json

@@ -24,7 +24,6 @@
       "smarty/smarty": "2.6.*",
       "smarty-gettext/smarty-gettext": "@stable",
       "components/font-awesome": "4.*",
-      "1000hz/bootstrap-validator": "@stable",
       "datatables/datatables": "@stable"
 	},
 	"autoload": {

core/utils/cutils.class.php

@@ -64,6 +64,11 @@ public static function format_Number($number, $decimal = 0)
     {
         // Getting localized numeric formating information
         $locale = localeconv();
+
+        // Check if thousands_sep is set
+        if (empty($locale['thousands_sep'])) {
+           $locale['thousands_sep'] = '.';
+        }
 
         // Return formated number
         return number_format($number, $decimal, $locale['decimal_point'], $locale['thousands_sep']);

docs/Changelog

@@ -1,4 +1,27 @@
-=== Release 8.2.0 (Januray 6 2019)
+=== Release 8.2.1 (Jan 28 2019)
+
+Changelog
+
+- General
+	- Fixed missing bootstrap-validator package using Composer (#0288)
+	- Fixed issue with missing formating information while using Bacula-Web in
+	a different language (#0286)
+
+- User settings
+	- Fixed missing email address in user settings (#0287)
+
+- Documentation
+
+- Development
+	- Minor PHP code improvements and fixes
+
+- Fixed bug(s)
+
+- 0000286 [bug-php] Handle missing localized numeric and monetary formatting information
+- 0000287 [bug-php] Email address not displayed in user settings page
+- 0000288 [packaging] Fix missing bootstrap-validator using Composer
+
+=== Release 8.2.0 (January 6 2019)
 
 Changelog
 
@@ -16,15 +39,15 @@ Changelog
 - Documentation
 	- Fixed instructions to download tar.gz archive
 	- Documentation have been impproved with a good amount of fixes and
-	improvments
+	improvements
 	- Updated Composer manual installation (redirect to Composer.org web site)
 	- Upgrade paragraph has been fixed (see #0275)
 	- Add missing package installation for RHEL/Centos 6 users (see #0283)
 
 - Development
 	- Upgraded symfony/process to version 3.4.19
 	- Upgraded Smarty and Smarty-Gettext components
-	- Huge ammount ot of PHP code improvments and fixes
+	- Huge amount of PHP code improvements and fixes
 
 Fixed bug(s)
 
@@ -249,7 +272,7 @@ Changelog
 	- Documentation got cleaned up, restructured and updated
 - Development
 	- Remove static php class with PDO
-	- Large amount of code improvments and cleanup
+	- Large amount of code improvements and cleanup
 	- Use Composer autoloader
 	- Improve application exception handling
 	- Add CodeClimate for CI
@@ -371,8 +394,8 @@ Changelog
   - Total of bytes used now displayed for each pool
   - Display slot number of volumes (if using a library)
 - General: 
-  - PHP 5.6 and higher version compatibility improvments
-  - Many code fixes and improvments
+  - PHP 5.6 and higher version compatibility improvements
+  - Many code fixes and improvements
 - Pools and volumes report: Volumes table now display slot number
 - Jobs report: you can filter jobs with status "Terminated with errors"
 - Translation: Portuguese brazilian have been updated and added Japanese
@@ -480,7 +503,7 @@ New features
 
 Changelog
 
-- General: Several code improvments
+- General: Several code improvements
 - General: Web UI have been reworked using Twitter Bootstrap, JQuery and FontAwesome
 - Jobs report: Fix link problem with jobs name containing space(s)
 - Updated Smarty to version 2.6.28
@@ -525,8 +548,8 @@ Fixed bugs / New features
 
 Changelog
 
-- General php code improvments
-- Renamed docs folder to DOCS - General CSS code cleanup and improvments
+- General php code improvements
+- Renamed docs folder to DOCS - General CSS code cleanup and improvements
 - Fixed smarty-gettext version (using latest version, even if it's outdated)
 - Job logs report: Added message "No log(s) for this job" in Job logs report page when logs are missing
 - General: New Navigation "Back" link on top of each page (except Dashboard)
@@ -566,7 +589,7 @@ Fixed bugs / new features
 
 Changelog
 
-- General: code cleanup and improvment
+- General: code cleanup and improvement
 - General: improved header look and feel (cleaned up html and css)
 - General: ability to use home icon in the header to show the dashboard
 - General: improved exception handling by showing exception trace
@@ -595,7 +618,7 @@ Changelog
 - Dashboard: Fixed items order for Pools and volumes status widget
 - Job report page: Display "No job(s) to display" when there's no jobs result instead of an empty table
 - Job logs page: Fixed bug with "odd and even" row in job logs table
-- General: Header look and feel improvments
+- General: Header look and feel improvements
 - General: Updated bug tracker url in header
 
 Fixed bugs / new features
@@ -615,8 +638,8 @@ Changelog
 
 - improved look and feel in general
 - improved look and feel of grids in all pages
-- code improvments with PHP PDO classes and starting kind of MVC
-- code improvments for graph rendering php class
+- code improvements with PHP PDO classes and starting kind of MVC
+- code improvements for graph rendering php class
 - updated application exception messages 
 - cleaned up and splitted CSS code
 - Dashboard: fixed legend items order for Pools and volumes status widget
@@ -651,13 +674,13 @@ Fixed bugs / New features
 === Release 5.2.10 (August 9th 2012) ===
 
 - upgraded Smarty gettext plugin to version 0.9.1
-- many CSS code improvments
-- SQLite database support improvments
+- many CSS code improvements
+- SQLite database support improvements
 - fixed database size with SQLite in dashboard
 - added SQLite PDO support in test page
 - test page display template cache full path
 - files structure have been improved and cleaned up
-- many internal code improvments
+- many internal code improvements
 - fixed bugy CSS with Internet Explorer
 - improved design of dashboard
 - in job reports page, restore jobs were displaying empty value for pool, replaced now by N/A
@@ -692,7 +715,7 @@ Changelog
 - Fixed client architecture field in Client report page
 - Improved exceptions and error handling
 - Fixed bug with last used volume in dashboard (not used volumes not displayed)
-- PHP code improvment
+- PHP code improvement
 
 Fixed bugs / New features
 

docs/source/index.rst

@@ -13,7 +13,7 @@ Bacula-Web documentation
   :target: https://github.com/bacula-web/bacula-web
   :alt: Bacula-Web logo
 
-**Version:** 8.2.0
+**Version:** 8.2.1
 
 .. toctree::
    :maxdepth: 2