From 25820ec7b9316b05e258b6e8527497b7951fc8b3 Mon Sep 17 00:00:00 2001
From: amma35 <amandine.manceau@infotel.com>
Date: Fri, 2 Dec 2016 16:00:53 +0100
Subject: [PATCH] Update xml Change version

---
 addressing.xml                             |  2 +-
 hook.php                                   | 13 +++++++------
 setup.php                                  |  2 +-
 sql/{empty-3.0.0.sql => empty-2.5.0.sql}   |  0
 sql/{update-3.0.0.sql => update-2.5.0.sql} |  0
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename sql/{empty-3.0.0.sql => empty-2.5.0.sql} (100%)
 rename sql/{update-3.0.0.sql => update-2.5.0.sql} (100%)

diff --git a/addressing.xml b/addressing.xml
index c663731..280f533 100644
--- a/addressing.xml
+++ b/addressing.xml
@@ -26,7 +26,7 @@
    </authors>
    <versions>
       <version>
-          <num>2.4.0</num>
+          <num>2.5.0</num>
           <compatibility>9.1.1</compatibility>
       </version>
       <version>
diff --git a/hook.php b/hook.php
index d073c7e..988609f 100644
--- a/hook.php
+++ b/hook.php
@@ -37,7 +37,7 @@ function plugin_addressing_install() {
        &&!TableExists("glpi_plugin_addressing")
        && !TableExists("glpi_plugin_addressing_configs")) {
 
-      $DB->runFile(GLPI_ROOT ."/plugins/addressing/sql/empty-3.0.0.sql");
+      $DB->runFile(GLPI_ROOT ."/plugins/addressing/sql/empty-2.5.0.sql");
 
    } else {
       
@@ -85,9 +85,9 @@ function plugin_addressing_install() {
          $DB->runFile(GLPI_ROOT ."/plugins/addressing/sql/update-2.4.0.sql");
       }
 
-      //Version 3.0.0
+      //Version 2.5.0
       if (!FieldExists("glpi_plugin_addressing_addressings", "locations_id") && !FieldExists("glpi_plugin_addressing_addressings", "fqdns_id")) {
-         $DB->runFile(GLPI_ROOT ."/plugins/addressing/sql/update-3.0.0.sql");
+         $DB->runFile(GLPI_ROOT ."/plugins/addressing/sql/update-2.5.0.sql");
       }
 
    }
@@ -125,7 +125,7 @@ function plugin_addressing_install() {
    //Add all rights for current user profile
    PluginAddressingProfile::createFirstAccess($_SESSION['glpiactiveprofile']['id']);
    //Drop old profile table : not used anymore
-   $migration = new Migration("3.0.0");
+   $migration = new Migration("2.5.0");
    $migration->dropTable('glpi_plugin_addressing_profiles');
 
    return true;
@@ -138,9 +138,10 @@ function plugin_addressing_uninstall() {
    include_once (GLPI_ROOT."/plugins/addressing/inc/profile.class.php");
    include_once (GLPI_ROOT."/plugins/addressing/inc/menu.class.php");
    
-   $migration = new Migration("3.0.0");
+   $migration = new Migration("2.5.0");
    $tables = array("glpi_plugin_addressing_addressings",
-                   "glpi_plugin_addressing_configs");
+                   "glpi_plugin_addressing_configs",
+                   "glpi_plugin_addressing_filters");
 
    foreach($tables as $table) {
       $migration->dropTable($table);
diff --git a/setup.php b/setup.php
index 81aa2f5..3eca4b3 100644
--- a/setup.php
+++ b/setup.php
@@ -68,7 +68,7 @@ function plugin_version_addressing() {
 
    return array(
       'name'           => _n('IP Adressing', 'IP Adressing', 2, 'addressing'),
-      'version'        => '3.0.0',
+      'version'        => '2.5.0',
       'author'         => 'Gilles Portheault, Xavier Caillaud, Remi Collet, Nelly Mahu-Lasson',
       'license'        => 'GPLv2+',
       'homepage'       => 'https://github.com/pluginsGLPI/addressing',
diff --git a/sql/empty-3.0.0.sql b/sql/empty-2.5.0.sql
similarity index 100%
rename from sql/empty-3.0.0.sql
rename to sql/empty-2.5.0.sql
diff --git a/sql/update-3.0.0.sql b/sql/update-2.5.0.sql
similarity index 100%
rename from sql/update-3.0.0.sql
rename to sql/update-2.5.0.sql