Changeset 6251


Ignore:
Timestamp:
May 20, 2010, 6:59:47 PM (10 years ago)
Author:
Eric
Message:

[NBC_UserAdvManager]

  • Bug 1551 re-fixed - There was some problems remaining with old version upgrades
  • Bug 1655 fixed - Navigation bar is usefull again
Location:
extensions/NBC_UserAdvManager/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

    r5762 r6251  
    519519  );
    520520
    521 $template->assign('NAVBAR', $navbar);
     521$template->assign('navbar', $navbar);
    522522
    523523// +-----------------------------------------------------------------------+
     
    10391039  );
    10401040
    1041 $template->assign('NAVBAR', $navbar);
     1041$template->assign('navbar', $navbar);
    10421042
    10431043// +-----------------------------------------------------------------------+
     
    14731473  );
    14741474
    1475 $template->assign('NAVBAR', $navbar);
     1475$template->assign('navbar', $navbar);
    14761476
    14771477// +-----------------------------------------------------------------------+
  • extensions/NBC_UserAdvManager/trunk/changelog.txt.php

    r5762 r6251  
    167167            Bug 1572 fixed - Fix unable to read resource: "ConfirmMail.tpl"
    168168            Bug 1574 fixed - Beautifying ConfirmMail page
    169             Bug 1576 partially fixed - Compatibility with other database systems than MySql like PostgreSql or Sqlite. Using Piwigo's pwg_db_### integrated functions. There are 2 php functions for mysql still missing for PostgreSql and Sqlite
    170             Bug 1586 fixed - Links to official forum topic support and bugtacker were added in plugin's admin page 
     169            Bug 1576 fixed - Compatibility with other database systems than MySql like PostgreSql or Sqlite. Using Piwigo's pwg_db_### integrated functions.
     170            Bug 1586 fixed - Links to official forum topic support and bugtacker were added in plugin's admin page
     171
     172-- 2.15.2 : Bug 1551 re-fixed - There was some problems remaining with old version upgrades
     173            Some translations revisited
     174            Bug 1655 fixed - Navigation bar is usefull again
    171175*/
    172176?>
  • extensions/NBC_UserAdvManager/trunk/main.inc.php

    r5633 r6251  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.15.1
     4Version: 2.15.2
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
  • extensions/NBC_UserAdvManager/trunk/maintain.inc.php

    r5762 r6251  
    9191WHERE param = "nbc_UserAdvManager"
    9292;';
    93   $count = pwg_db_num_rows(pwg_query($query));
    94 
    95 /* If old params exist an upgrade is needed */
    96 /* **************************************** */
    97   if ($count == 1)
    98   {
    99 /* Check for upgrade from 2.10 to 2.11 */
    100 /* *********************************** */
    101     $query = '
     93  $count1 = pwg_db_num_rows(pwg_query($query));
     94 
     95  $query = '
    10296SELECT *
    10397  FROM '.CONFIG_TABLE.'
    10498WHERE param = "nbc_UserAdvManager_ConfirmMail"
    10599;';
    106     $count = pwg_db_num_rows(pwg_query($query));
    107  
    108     if ($count == 0)
     100  $count2 = pwg_db_num_rows(pwg_query($query));
     101
     102/* If old params exist an upgrade is needed */
     103/* **************************************** */
     104  if ($count1 == 1)
     105  {
     106/* Check for upgrade from 2.10 to 2.11 */
     107/* *********************************** */
     108    if ($count1 == 1 and $count2 == 0)
    109109    {
    110110    /* upgrade from branch 2.10 to 2.11 */
     
    128128    $fields = mysql_list_fields($conf['db_base'],USER_CONFIRM_MAIL_TABLE);
    129129    $nb_fields = mysql_num_fields($fields);
    130 
    131 //  $query = '
    132 //SELECT *
    133 //FROM '.USER_CONFIRM_MAIL_TABLE.'
    134 //;';
    135 
    136 //  $result = pwg_query($query);
    137        
    138 //      $numfields = mysql_num_fields($result);
    139130
    140131    if ($nb_fields < 6)
     
    158149/* Check for upgrade from 2.14 to 2.15 */
    159150/* *********************************** */
    160         $query1 = '
     151    //if ($count1 == 1 or $count2 == 1)
     152    //{
     153    /* upgrade from branch 2.14 to 2.15 */
     154    /* ******************************** */
     155      upgrade_214_215();
     156    //}
     157  }
     158
     159/* Check if old version is > 2.15 */
     160/* ****************************** */
     161   $query = '
    161162SELECT param
    162163  FROM '.CONFIG_TABLE.'
    163 WHERE param = "nbc_UserAdvManager"
    164 ;';
    165     $count1 = mysql_num_rows(pwg_query($query1));
     164WHERE param LIKE \"UserAdvManager%\"
     165;';
     166  $count = pwg_db_num_rows(pwg_query($query));
    166167 
    167     $query1 = '
    168 SELECT param
    169   FROM '.CONFIG_TABLE.'
    170 WHERE param = "nbc_UserAdvManager_ConfirmMail"
    171 ;';
    172     $count2 = mysql_num_rows(pwg_query($query1));
    173  
    174     if ($count1 == 1 or $count2 == 1)
    175     {
    176     /* upgrade from branch 2.14 to 2.15 */
    177     /* ******************************** */
    178       upgrade_214_215();
    179     }
    180   }
    181  
    182 /* Check for upgrade from 2.15 to 2.xx */
    183 /* *********************************** */
     168  if ($count == 2)
     169  {
     170    upgrade_2151_2152();
     171  }
     172
     173load_conf_from_db('param like \'UserAdvManager\\_%\'');
    184174}
    185175
Note: See TracChangeset for help on using the changeset viewer.