Changeset 14919


Ignore:
Timestamp:
05/12/12 14:56:29 (8 years ago)
Author:
Eric
Message:

r14918 merged from trunk:
Code refactory - New version 2.4.4 hard coded
Compatilibity with Piwigo 2.4 and FluxBB 1.5 verifyed
language/fr_FR/plugin.lang.php sentence fixed

Location:
extensions/Register_FluxBB/branches/2.4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/Register_FluxBB/branches/2.4/admin/admin.php

    r14903 r14919  
    621621  $conf_Register_FluxBB = isset($conf['Register_FluxBB']) ? explode(";" , $conf['Register_FluxBB']) : array(); 
    622622 
     623// If UAM exists and if UAM ConfirmMail is set, we can set this feature 
     624  if (function_exists('FindAvailableConfirmMailID')) 
     625  { 
     626    $conf_UAM = unserialize($conf['UserAdvManager']); 
     627 
     628    if (isset($conf_UAM[1]) and ($conf_UAM[1] == 'true' or $conf_UAM[1] == 'local') and (isset($conf_UAM[2]) and $conf_UAM[2] <> '-1')) 
     629    { 
     630      $UAM_bridge = true; 
     631    } 
     632    else $UAM_bridge = false; 
     633  } 
     634 
    623635  $template->assign( 
    624636    array 
     
    635647      'FluxBB_DETAILS_TRUE'  => (isset($conf_Register_FluxBB[5]) and $conf_Register_FluxBB[5] == 'true') ? 'checked="checked"' : '', 
    636648      'FluxBB_DETAILS_FALSE' => (isset($conf_Register_FluxBB[5]) and $conf_Register_FluxBB[5] == 'false') ? 'checked="checked"' : '', 
     649      'UAM_BRIDGE'           => $UAM_bridge, 
     650      'FluxBB_UAM_LINK_TRUE' => (isset($conf_Register_FluxBB[6]) and $conf_Register_FluxBB[6] == 'true') ? 'checked="checked"' : '', 
     651      'FluxBB_UAM_LINK_FALSE'=> (isset($conf_Register_FluxBB[6]) and $conf_Register_FluxBB[6] == 'false') ? 'checked="checked"' : '', 
     652      'FluxBB_GROUP'         => $conf_Register_FluxBB[7], 
    637653    ) 
    638654  ); 
    639655 
    640 // If UAM exists and if UAM ConfirmMail is set, we can set this feature 
    641   if (function_exists('FindAvailableConfirmMailID')) 
    642   {   
    643     $conf_UAM = unserialize($conf['UserAdvManager']); 
    644     $UAM_bridge = false; 
    645      
    646     if (isset($conf_UAM[1]) and ($conf_UAM[1] == 'true' or $conf_UAM[1] == 'local') and isset($conf_UAM[2]) and $conf_UAM[2] != '-1') 
    647     { 
    648       $UAM_bridge = true; 
    649     } 
    650    
    651     $template->assign( 
    652       array 
    653       ( 
    654         'UAM_BRIDGE'            => $UAM_bridge, 
    655         'FluxBB_UAM_LINK_TRUE'  => (isset($conf_Register_FluxBB[6]) and $conf_Register_FluxBB[6] == 'true') ? 'checked="checked"' : '', 
    656         'FluxBB_UAM_LINK_FALSE' => (isset($conf_Register_FluxBB[6]) and $conf_Register_FluxBB[6] == 'false') ? 'checked="checked"' : '', 
    657         'FluxBB_GROUP'          => $conf_Register_FluxBB[7], 
    658       ) 
    659     ); 
    660   } 
    661      
    662656  $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/manage.tpl'); 
    663657  $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content'); 
  • extensions/Register_FluxBB/branches/2.4/include/functions.inc.php

    r9885 r14919  
    121121;"; 
    122122 
    123         $o_default_user_group = pwg_db_fetch_assoc(pwg_query($query)); 
     123        $o_user_group = pwg_db_fetch_assoc(pwg_query($query)); 
    124124       
    125125        $query = " 
    126126UPDATE ".FluxBB_USERS_TABLE." 
    127 SET group_id = ".$o_default_user_group['conf_value']."  
     127SET group_id = ".$o_user_group['conf_value']."  
    128128WHERE id = ".FluxBB_Searchuser($user['id'])." 
    129129;"; 
     
    311311{ 
    312312  $query = " 
    313 SELECT id_user_FluxBB, id_user_pwg FROM ".Register_FluxBB_ID_TABLE." 
     313SELECT id_user_FluxBB, id_user_pwg 
     314FROM ".Register_FluxBB_ID_TABLE." 
    314315WHERE id_user_pwg = ".$id_user_pwg." 
    315316LIMIT 1 
  • extensions/Register_FluxBB/branches/2.4/language/fr_FR/plugin.lang.php

    r7982 r14919  
    129129  <br>'; 
    130130$lang['About_Reg'] = 'A propos de l\'enregistrement d\'utilisateur sur le forum FluxBB'; 
    131 $lang['Bridge_UAM'] = 'Validation d\'accès au forum via le plugin UserAdvManager (UAM): Activez ici le pont entre les deux plugins qui vous permettra d\'interdir l\'accès à votre forum FluxBB tant que l\'utilisateur n\'a pas validé son inscription à la galerie (la fonction correspondante doit être active sur UAM).'; 
     131$lang['Bridge_UAM'] = 'Validation d\'accès au forum via le plugin UserAdvManager (UAM): Activez ici le pont entre les deux plugins qui vous permettra d\'interdire l\'accès à votre forum FluxBB tant que l\'utilisateur n\'a pas validé son inscription à la galerie (la fonction correspondante doit être active sur UAM).'; 
    132132$lang['Bridge_UAM_true'] = ' --> Pont Register_FluxBB / UAM activé'; 
    133133$lang['Bridge_UAM_false'] = ' --> Pont Register_FluxBB / UAM désactivé (par défaut)'; 
  • extensions/Register_FluxBB/branches/2.4/main.inc.php

    r10627 r14919  
    22/* 
    33Plugin Name: Register FluxBB 
    4 Version: 2.4.3 
     4Version: 2.4.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://piwigo.org/ext/extension_view.php?eid=252 
     
    8181 
    82822.4.3     - 26/04/11  - Small CSS bug fixed 
     83 
     842.4.4     - 11/05/12  - Small code refactory 
     85                        Compatibility with Piwigo 2.4 and FluxBB 1.5 verifyed 
    8386-------------------------------------------------------------------------------- 
    8487*/ 
Note: See TracChangeset for help on using the changeset viewer.