From 27a23f68c043c0e408d902858d869642558816ac Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Wed, 24 Dec 2014 12:50:27 +0000
Subject: [PATCH] Remove unneeded versions

Fixes #97
---
 .../libs/classes/Mibew/Controller/HomeController.php   |  5 +----
 .../Mibew/Controller/Settings/FeaturesController.php   |  4 ----
 src/mibew/libs/classes/Mibew/Maintenance/Installer.php |  4 ++--
 src/mibew/libs/classes/Mibew/Settings.php              |  1 -
 src/mibew/libs/common/constants.php                    | 10 ----------
 .../default/templates_src/server_side/index.handlebars |  7 +------
 6 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/mibew/libs/classes/Mibew/Controller/HomeController.php b/src/mibew/libs/classes/Mibew/Controller/HomeController.php
index e0661ca9..24a1e069 100644
--- a/src/mibew/libs/classes/Mibew/Controller/HomeController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/HomeController.php
@@ -52,11 +52,8 @@ class HomeController extends AbstractController
         $page = array(
             'version' => MIBEW_VERSION,
             'localeLinks' => get_locale_links(),
-            'needUpdate' => version_compare(Settings::get('dbversion'), DB_VERSION, '<'),
+            'needUpdate' => version_compare(Settings::get('dbversion'), MIBEW_VERSION, '<'),
             'profilePage' => $this->generateUrl('operator_edit', array('operator_id' => $operator['operatorid'])),
-            'updateWizard' => $this->generateUrl('update'),
-            'newFeatures' => Settings::get('featuresversion') != FEATURES_VERSION,
-            'featuresPage' => $this->generateUrl('settings_features'),
             'isOnline' => $is_online,
             'warnOffline' => true,
             'title' => getlocal('Home'),
diff --git a/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php b/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php
index 6786a3ab..51c7ed15 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Settings/FeaturesController.php
@@ -43,10 +43,6 @@ class FeaturesController extends AbstractController
             'errors' => array(),
         );
 
-        if (Settings::get('featuresversion') != FEATURES_VERSION) {
-            Settings::set('featuresversion', FEATURES_VERSION);
-        }
-
         // Load all needed options and fill form with them.
         $options = $this->getOptionsList();
         foreach ($options as $opt) {
diff --git a/src/mibew/libs/classes/Mibew/Maintenance/Installer.php b/src/mibew/libs/classes/Mibew/Maintenance/Installer.php
index 34736fbb..c86deefa 100644
--- a/src/mibew/libs/classes/Mibew/Maintenance/Installer.php
+++ b/src/mibew/libs/classes/Mibew/Maintenance/Installer.php
@@ -428,7 +428,7 @@ class Installer
                     'INSERT INTO {config} (vckey, vcvalue) VALUES (:key, :value)',
                     array(
                         ':key' => 'dbversion',
-                        ':value' => DB_VERSION,
+                        ':value' => MIBEW_VERSION,
                     )
                 );
             }
@@ -625,7 +625,7 @@ class Installer
      */
     protected function tablesNeedUpdate()
     {
-        return version_compare($this->getDatabaseVersion(), DB_VERSION, '<');
+        return version_compare($this->getDatabaseVersion(), MIBEW_VERSION, '<');
     }
 
     /**
diff --git a/src/mibew/libs/classes/Mibew/Settings.php b/src/mibew/libs/classes/Mibew/Settings.php
index 10a168d8..7bad9e63 100644
--- a/src/mibew/libs/classes/Mibew/Settings.php
+++ b/src/mibew/libs/classes/Mibew/Settings.php
@@ -68,7 +68,6 @@ class Settings
         // Set default values
         $this->settings = array(
             'dbversion' => 0,
-            'featuresversion' => 0,
             'title' => 'Your Company',
             'hosturl' => 'http://mibew.org',
             'logo' => '',
diff --git a/src/mibew/libs/common/constants.php b/src/mibew/libs/common/constants.php
index f871a903..35a01ad0 100644
--- a/src/mibew/libs/common/constants.php
+++ b/src/mibew/libs/common/constants.php
@@ -22,16 +22,6 @@
  */
 define('MIBEW_VERSION', '2.0.0-beta.1');
 
-/**
- * Current version of database structure
- */
-define('DB_VERSION', '2.0.0-beta.1');
-
-/**
- * Current version of implemented features
- */
-define('FEATURES_VERSION', '2.0.0-beta.1');
-
 /**
  * Prefix for session variables.
  * Provide an ability to instal several mibew instances on one server.
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 389c3a32..266163e6 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,13 +10,8 @@
     {{#override "content"}}
         <br/>
         {{#if needUpdate}}
-            <div id="form-message">{{l10n "Please run the <a href=\"{0}\">Update wizard</a> to adjust your database." updateWizard}}</div>
+            <div id="form-message">{{l10n "Please run the <a href=\"{0}\">Update wizard</a> to adjust your database." (route "update")}}</div>
             <br/>
-        {{else}}
-            {{#if newFeatures}}
-                <div><div id="form-message">{{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}}
 
         <div id="dashboard">