Ignore:
Timestamp:
09/22/10 17:44:21 (9 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/Register_FluxBB/branches/2.3/main.inc.php

    r6899 r7002  
    22/* 
    33Plugin Name: Register FluxBB 
    4 Version: 2.3.3 
     4Version: 2.3.4 
    55Description: Link user registration from Piwigo to FluxBB forum (registration, password changing, deletion) - Original Nicco's NBC_LinkUser2PunBB plugin upgraded to Piwigo / Liez l'inscription des utilisateurs de Piwigo avec votre forum FluxBB - Portage du plugin NBC_LinkUser2PunBB de Nicco vers Piwigo 
    66Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=252 
     
    6464                      - Bug 1855 fixed : Improvement of use of UAM bridge (fixes php notices) 
    6565                      - Several language files fix 
     66 
     672.3.4     - 22/09/10  - Compatibility with Plugin Adult_Content 
    6668-------------------------------------------------------------------------------- 
    6769*/ 
     
    99101  global $conf; 
    100102         
    101   include_once (REGFLUXBB_PATH.'include/functions.inc.php'); 
    102  
    103   // Warning : FluxBB uses Sha1 hash instead of md5 for Piwigo! 
    104   FluxBB_Adduser($register_user['id'], $register_user['username'], sha1($_POST['password']), $register_user['email']); 
     103  // Exclusion of Adult_Content users 
     104  if ($register_user['username'] != "16" and $register_user['username'] != "18") 
     105  { 
     106    include_once (REGFLUXBB_PATH.'include/functions.inc.php'); 
     107 
     108    // Warning : FluxBB uses Sha1 hash instead of md5 for Piwigo! 
     109    FluxBB_Adduser($register_user['id'], $register_user['username'], sha1($_POST['password']), $register_user['email']); 
     110  } 
    105111} 
    106112 
Note: See TracChangeset for help on using the changeset viewer.