Changeset 10046

Show
Ignore:
Timestamp:
04/04/11 19:06:11 (2 years ago)
Author:
Eric
Message:

r10045 merged from trunk to branch 2.2

Location:
extensions/HistoryIPExcluder/branches/2.2
Files:
1 added
2 modified

Legend:

Unmodified
Added
Removed

  • extensions/HistoryIPExcluder/branches/2.2/main.inc.php

    r10043 r10046  
    22/* 
    33Plugin Name: History IP Excluder 
    4 Version: 2.2.2 
    5 Description: Permet l'exclusion d'une IP ou d'une plage d'IP de l'historique et de les blacklister à l'inscription - Base MySql seulement! / Excludes one IP or a range of IP from the history and to blacklist them on registration - MySql database only! 
     4Version: 2.2.3 
     5Description: Permet l'exclusion d'une IP ou d'une plage d'IP de l'historique et de les blacklister à l'inscription / Excludes one IP or a range of IP from the history and to blacklist them on registration 
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=147 
    77Author: Nicco, Eric 
    … …  
    3030 
    31312.2.2             - Another bug fixed on plugin upgrade from 2.2.x version 
     32 
     332.2.3             - Improved update mechanism. When no structural update of database is necessary, it sets the correct version number in plugin's configuration 
    3234 
    3335-------------------------------------------------------------------------------- 

  • extensions/HistoryIPExcluder/branches/2.2/maintain.inc.php

    r10043 r10046  
    6060  global $conf; 
    6161   
     62  include_once (HIPE_PATH.'include/dbupgrade.inc.php'); 
     63   
    6264/* Check for upgrade from 2.0.0 to 2.0.1 */ 
    6365/* *************************************** */ 
    … …  
    98100  } 
    99101 
    100   /* upgrade from version 2.2.0 to 2.2.1 */ 
    101   /* *********************************** */ 
    102   $HIPE_Config = unserialize($conf['HistoryIPConfig']); 
    103   if ($HIPE_Config['Version'] == '2.2.0') 
    104   { 
    105     upgrade_220(); 
    106   } 
     102  /* Global version number upgrade */ 
     103  /* ***************************** */ 
     104  global_version_update(); 
    107105} 
    108106 
    … …  
    131129  }   
    132130} 
    133  
    134  
    135 function upgrade_200() 
    136 { 
    137   global $conf; 
    138    
    139   $q = ' 
    140 UPDATE '.CONFIG_TABLE.' 
    141 SET param = "HistoryIPExcluder" 
    142 WHERE param = "nbc_HistoryIPExcluder" 
    143 ;'; 
    144   pwg_query($q); 
    145  
    146   $q = ' 
    147 UPDATE '.CONFIG_TABLE.' 
    148 SET comment = "History IP Excluder parameters" 
    149 WHERE comment = "Parametres nbc History IP Excluder" 
    150 ;'; 
    151   pwg_query($q); 
    152  
    153   upgrade_210(); 
    154 } 
    155  
    156 function upgrade_210() 
    157 { 
    158   global $conf; 
    159    
    160   $default = array ( 
    161     'Blacklist' => "0", 
    162     'Version'=> "2.1.1", 
    163   ); 
    164  
    165   $q = ' 
    166 INSERT INTO '.CONFIG_TABLE.' (param,value,comment) 
    167 VALUES ("HistoryIPConfig","'.addslashes(serialize($default)).'","History IP Excluder options"); 
    168 '; 
    169        
    170   pwg_query($q); 
    171 } 
    172  
    173 function upgrade_211() 
    174 { 
    175   global $conf; 
    176  
    177 // Update plugin version 
    178   $query = ' 
    179 SELECT value 
    180   FROM '.CONFIG_TABLE.' 
    181 WHERE param = "HistoryIPConfig" 
    182 ;'; 
    183   $result = pwg_query($query); 
    184    
    185   $conf_HIPE = pwg_db_fetch_assoc($result); 
    186      
    187   $Newconf_HIPE = unserialize($conf_HIPE['value']); 
    188    
    189   $Newconf_HIPE['Version'] = '2.2.0'; 
    190    
    191   $update_conf = serialize($Newconf_HIPE); 
    192  
    193   $query = ' 
    194 UPDATE '.CONFIG_TABLE.' 
    195 SET value="'.addslashes($update_conf).'" 
    196 WHERE param="HistoryIPConfig" 
    197 LIMIT 1 
    198 ;'; 
    199  
    200         pwg_query($query); 
    201  
    202   // Create new HIPE entry in plugins table  
    203   $query = ' 
    204 INSERT INTO '.PLUGINS_TABLE.' (id, state, version) 
    205 VALUES ("HistoryIPExcluder","active","2.2.0") 
    206 ;'; 
    207    
    208   pwg_query($query); 
    209  
    210   // Delete old plugin entry in plugins table  
    211   $query = ' 
    212 DELETE FROM '.PLUGINS_TABLE.' 
    213 WHERE id="nbc_HistoryIPExcluder" 
    214 LIMIT 1 
    215 ;'; 
    216    
    217   pwg_query($query); 
    218  
    219   // rename directory 
    220   if (!rename(PHPWG_PLUGINS_PATH.'nbc_HistoryIPExcluder', PHPWG_PLUGINS_PATH.'HistoryIPExcluder')) 
    221   { 
    222     die('Fatal error on plugin upgrade process : Unable to rename directory ! Please, rename manualy the plugin directory name from ../plugins/nbc_HistoryIPExcluder to ../plugins/HistoryIPExcluder.'); 
    223   } 
    224 } 
    225  
    226  
    227 function upgrade_220() 
    228 { 
    229   global $conf; 
    230  
    231 // Update plugin version 
    232   $query = ' 
    233 SELECT value 
    234   FROM '.CONFIG_TABLE.' 
    235 WHERE param = "HistoryIPConfig" 
    236 ;'; 
    237   $result = pwg_query($query); 
    238    
    239   $conf_HIPE = pwg_db_fetch_assoc($result); 
    240      
    241   $Newconf_HIPE = unserialize($conf_HIPE['value']); 
    242    
    243   $Newconf_HIPE['Version'] = '2.2.1'; 
    244    
    245   $update_conf = serialize($Newconf_HIPE); 
    246  
    247   $query = ' 
    248 UPDATE '.CONFIG_TABLE.' 
    249 SET value="'.addslashes($update_conf).'" 
    250 WHERE param="HistoryIPConfig" 
    251 LIMIT 1 
    252 ;'; 
    253  
    254         pwg_query($query); 
    255 } 
    256131?>