From 6ae53d90af268fa53e41b0a55d7d428029e3feaa Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Fri, 11 Jul 2014 11:56:48 +0000
Subject: [PATCH] Remove message about empty password and first login

---
 .../classes/Mibew/Controller/HomeController.php     |  1 -
 .../Mibew/Controller/Operator/ProfileController.php |  1 -
 .../templates_src/server_side/index.handlebars      | 13 ++++---------
 .../server_side/operator_edit.handlebars            |  9 ++-------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/mibew/libs/classes/Mibew/Controller/HomeController.php b/src/mibew/libs/classes/Mibew/Controller/HomeController.php
index dc1e73cb..7d68f9be 100644
--- a/src/mibew/libs/classes/Mibew/Controller/HomeController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/HomeController.php
@@ -53,7 +53,6 @@ class HomeController extends AbstractController
             'version' => MIBEW_VERSION,
             'localeLinks' => get_locale_links(),
             'needUpdate' => Settings::get('dbversion') != DB_VERSION,
-            'needChangePassword' => check_password_hash($operator['vclogin'], '', $operator['vcpassword']),
             'profilePage' => $base_url . '/operator/operator/' . $operator['operatorid'] . '/edit',
             'updateWizard' => $base_url . '/install/',
             'newFeatures' => Settings::get('featuresversion') != FEATURES_VERSION,
diff --git a/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php b/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php
index 5119f810..70e85895 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php
@@ -93,7 +93,6 @@ class ProfileController extends AbstractController
         $page['stored'] = $request->query->has('stored');
         $page['canmodify'] = $can_modify ? '1' : '';
         $page['canchangelogin'] = is_capable(CAN_ADMINISTRATE, $operator);
-        $page['needChangePassword'] = check_password_hash($operator['vclogin'], '', $operator['vcpassword']);
         $page['title'] = getlocal('Operator details');
         $page['menuid'] = ($op_id == $operator['operatorid']) ? 'profile' : 'operators';
         $page['requirePassword'] = (!$op_id || $page['needChangePassword']);
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
index 8ee43547..09cfcdfb 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
@@ -10,18 +10,13 @@
 
     {{#override "content"}}
         <br/>
-        {{#if needChangePassword}}
-            <div id="formmessage">{{l10n "This is your first time logging in and your password is blank. For security reasons you have to change it."}} {{l10n "Visit your <a href=\"{0}\">Profile Page</a>." profilePage}}</div>
+        {{#if needUpdate}}
+            <div id="formmessage">{{l10n "Please run the <a href=\"{0}\">Update wizard</a> to adjust your database." updateWizard}}</div>
             <br/>
         {{else}}
-            {{#if needUpdate}}
-                <div id="formmessage">{{l10n "Please run the <a href=\"{0}\">Update wizard</a> to adjust your database." updateWizard}}</div>
+            {{#if newFeatures}}
+                <div><div id="formmessage">{{l10n "Congratulations! You now have Mibew Messenger {1} installed. Turn on more features on the <a href=\"{0}\">Optional services</a> page." featuresPage mibewVersion}}</div></div>
                 <br/>
-            {{else}}
-                {{#if newFeatures}}
-                    <div><div id="formmessage">{{l10n "Congratulations! You now have Mibew Messenger {1} installed. Turn on more features on the <a href=\"{0}\">Optional services</a> page." featuresPage mibewVersion}}</div></div>
-                    <br/>
-                {{/if}}
             {{/if}}
         {{/if}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operator_edit.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operator_edit.handlebars
index fa6a7c3a..79edd6ce 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/operator_edit.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/operator_edit.handlebars
@@ -13,13 +13,8 @@
 
         {{> _errors}}
 
-        {{#if needChangePassword}}
-            <div id="formmessage">{{l10n "This is your first time logging in and your password is blank. For security reasons you have to change it."}}</div>
-            <br/>
-        {{else}}
-            {{#if stored}}
-                <div id="formmessage">{{l10n "Changes saved"}}</div>
-            {{/if}}
+        {{#if stored}}
+            <div id="formmessage">{{l10n "Changes saved"}}</div>
         {{/if}}
 
         {{#ifAny opid canmodify}}