Changeset 6295
- Timestamp:
- May 23, 2010, 4:42:51 PM (14 years ago)
- Location:
- extensions/Register_FluxBB/branches/2.2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Register_FluxBB/branches/2.2/admin/admin.php
r5606 r6295 82 82 $result = pwg_query($query); 83 83 84 while($row = mysql_fetch_array($result))84 while($row = pwg_db_fetch_assoc($result)) 85 85 $msg_error_PWG_Dup .= '<br>'.l10n('Error_PWG_Dup').$row['nbr_dup'].' x '.stripslashes($row['username']); 86 86 … … 100 100 $result = pwg_query($query); 101 101 102 while($row = mysql_fetch_array($result))102 while($row = pwg_db_fetch_assoc($result)) 103 103 { 104 104 $msg_error_FluxBB_Dup .= '<br>'.l10n('Error_FluxBB_Dup').$row['nbr_dup'].' x '.stripslashes($row['username']); … … 111 111 $subresult = pwg_query($subquery); 112 112 113 while($subrow = mysql_fetch_array($subresult))113 while($subrow = pwg_db_fetch_assoc($subresult)) 114 114 { 115 115 $msg_error_FluxBB_Dup .= '<br>id:'.$subrow['id'].'='.stripslashes($subrow['username']).' ('.$subrow['email'].')'; … … 157 157 $result = pwg_query($query); 158 158 159 while($row = mysql_fetch_array($result))159 while($row = pwg_db_fetch_assoc($result)) 160 160 { 161 161 $msg_error_Link_Break .= '<br>'.l10n('Error_Link_Break').stripslashes($row['pwg_user']).' ('.$row['pwg_mail'].')'; … … 196 196 $result = pwg_query($query); 197 197 198 while($row = mysql_fetch_array($result))198 while($row = pwg_db_fetch_assoc($result)) 199 199 { 200 200 $msg_error_Link_Bad .= '<br>'.l10n('Error_Link_Del').stripslashes($row['pwg_user']).' ('.$row['pwg_mail'].')'.' -- '.stripslashes($row['bb_user']).' ('.$row['bb_mail'].')'; … … 245 245 ;"; 246 246 247 $Compteur = mysql_fetch_array(pwg_query($query));247 $Compteur = pwg_db_fetch_assoc(pwg_query($query)); 248 248 249 249 if (!empty($Compteur) and $Compteur['nbr_dead'] > 0) … … 278 278 $result = pwg_query($query); 279 279 280 while($row = mysql_fetch_array($result))280 while($row = pwg_db_fetch_assoc($result)) 281 281 { 282 282 $msg_error_Link_Bad .= '<br>'.l10n('Error_Link_Dup').$row['nbr_dup'].' = '.stripslashes($row['pwg_user']).' -- '.stripslashes($row['bb_user']).')'; … … 318 318 $result = pwg_query($query); 319 319 320 while($row = mysql_fetch_array($result))320 while($row = pwg_db_fetch_assoc($result)) 321 321 { 322 322 if ( ($row['pwg_pwd'] != $row['bb_pwd']) or ($row['pwg_eml'] != $row['bb_eml']) ) … … 373 373 $result = pwg_query($query); 374 374 375 while($row = mysql_fetch_array($result))375 while($row = pwg_db_fetch_assoc($result)) 376 376 { 377 377 $msg_error_PWG2FluxBB .= '<br>'.l10n('Error_PWG2FluxBB').stripslashes($row['username']).' ('.$row['mail_address'].')'; … … 415 415 $result = pwg_query($query); 416 416 417 while($row = mysql_fetch_array($result))417 while($row = pwg_db_fetch_assoc($result)) 418 418 { 419 419 $msg_error_FluxBB2PWG .= '<br>'.l10n('Error_FluxBB2PWG').stripslashes($row['username']).' ('.$row['email'].')'; … … 513 513 SELECT id AS id_pwg, username, password, mail_address 514 514 FROM ".USERS_TABLE." 515 WHERE BINARY username = BINARY '". mysql_real_escape_string($_GET['username'])."'515 WHERE BINARY username = BINARY '".pwg_db_real_escape_string($_GET['username'])."' 516 516 LIMIT 1 517 517 ;"; 518 518 519 $data = mysql_fetch_array(pwg_query($query));519 $data = pwg_db_fetch_assoc(pwg_query($query)); 520 520 521 521 if (!empty($data)) … … 531 531 SELECT id, username, password, mail_address 532 532 FROM ".USERS_TABLE." 533 WHERE BINARY username = BINARY '". mysql_real_escape_string($_GET['username'])."'533 WHERE BINARY username = BINARY '".pwg_db_real_escape_string($_GET['username'])."' 534 534 LIMIT 1 535 535 ;"; 536 536 537 $data = mysql_fetch_array(pwg_query($query));537 $data = pwg_db_fetch_assoc(pwg_query($query)); 538 538 539 539 if (!empty($data)) … … 633 633 $result = pwg_query($query); 634 634 635 while ($row = mysql_fetch_array($result))635 while ($row = pwg_db_fetch_assoc($result)) 636 636 { 637 637 if((stripslashes($row['username']) != stripslashes($conf_Register_FluxBB[2])) and (stripslashes($row['username']) != stripslashes($conf_Register_FluxBB[1]))) … … 658 658 $msg_Mig_Add_AllUsers = ''; 659 659 660 while ($row = mysql_fetch_array($result))660 while ($row = pwg_db_fetch_assoc($result)) 661 661 { 662 662 if((stripslashes($row['username']) != 'guest') and (stripslashes($row['username']) != stripslashes($conf_Register_FluxBB[1]))) … … 677 677 ;"; 678 678 679 $row = mysql_fetch_array(pwg_query($query));679 $row = pwg_db_fetch_assoc(pwg_query($query)); 680 680 681 681 if (!empty($row)) … … 736 736 $result = pwg_query($query); 737 737 738 while($row = mysql_fetch_array($result))738 while($row = pwg_db_fetch_assoc($result)) 739 739 $msg_error_PWG_Dup .= '<br>'.l10n('Error_PWG_Dup').$row['nbr_dup'].' x '.stripslashes($row['username']); 740 740 … … 752 752 $result = pwg_query($query); 753 753 754 while($row = mysql_fetch_array($result))754 while($row = pwg_db_fetch_assoc($result)) 755 755 { 756 756 $msg_error_FluxBB_Dup .= '<br>'.l10n('Error_FluxBB_Dup').$row['nbr_dup'].' x '.stripslashes($row['username']); … … 764 764 $subresult = pwg_query($subquery); 765 765 766 while($subrow = mysql_fetch_array($subresult))766 while($subrow = pwg_db_fetch_assoc($subresult)) 767 767 { 768 768 $msg_error_FluxBB_Dup .= '<br>id:'.$subrow['id'].'='.stripslashes($subrow['username']).' ('.$subrow['email'].')'; … … 809 809 $result = pwg_query($query); 810 810 811 while($row = mysql_fetch_array($result))811 while($row = pwg_db_fetch_assoc($result)) 812 812 { 813 813 $msg_error_Link_Break .= '<br>'.l10n('New_Link').stripslashes($row['pwg_user']).' ('.$row['pwg_mail'].')'; … … 832 832 $result = pwg_query($query); 833 833 834 while($row = mysql_fetch_array($result))834 while($row = pwg_db_fetch_assoc($result)) 835 835 { 836 836 $msg_error_Link_Bad .= '<br>'.l10n('Link_Del').stripslashes($row['pwg_user']).' ('.$row['pwg_mail'].')'.' -- '.stripslashes($row['bb_user']).' ('.$row['bb_mail'].')'; … … 859 859 ;"; 860 860 861 $Compteur = mysql_fetch_array(pwg_query($query));861 $Compteur = pwg_db_fetch_assoc(pwg_query($query)); 862 862 863 863 if ( !empty($Compteur) and $Compteur['nbr_dead'] > 0) … … 892 892 $result = pwg_query($query); 893 893 894 while($row = mysql_fetch_array($result))894 while($row = pwg_db_fetch_assoc($result)) 895 895 { 896 896 $msg_error_Link_Bad .= '<br>'.l10n('Link_Dup').$row['nbr_dup'].' = '.stripslashes($row['pwg_user']).' -- '.stripslashes($row['bb_user']).')'; … … 916 916 $result = pwg_query($query); 917 917 918 while($row = mysql_fetch_array($result))918 while($row = pwg_db_fetch_assoc($result)) 919 919 { 920 920 if ( ($row['pwg_pwd'] != $row['bb_pwd']) or ($row['pwg_eml'] != $row['bb_eml']) ) … … 928 928 ;"; 929 929 930 $data = mysql_fetch_array(pwg_query($query));930 $data = pwg_db_fetch_assoc(pwg_query($query)); 931 931 932 932 if (!empty($data)) … … 955 955 $result = pwg_query($query); 956 956 957 while($row = mysql_fetch_array($result))957 while($row = pwg_db_fetch_assoc($result)) 958 958 { 959 959 $msg_error_PWG2FluxBB .= '<br>'.l10n('Add_User').stripslashes($row['username']).' ('.$row['mail_address'].')'; … … 966 966 ;"; 967 967 968 $data = mysql_fetch_array(pwg_query($query));968 $data = pwg_db_fetch_assoc(pwg_query($query)); 969 969 970 970 if (!empty($data)) … … 992 992 $result = pwg_query($query); 993 993 994 while($row = mysql_fetch_array($result))994 while($row = pwg_db_fetch_assoc($result)) 995 995 { 996 996 $msg_error_FluxBB2PWG .= '<br>'.l10n('Error_FluxBB2PWG').stripslashes($row['username']).' ('.$row['email'].')'; -
extensions/Register_FluxBB/branches/2.2/admin/template/register_fluxbb.css
r5606 r6295 32 32 background-color:#c2f5c2; 33 33 } 34 35 .mod{ 36 margin: 5px; 37 padding: 50px 50px 10px 10px; 38 font-weight:bold; 39 background-repeat: no-repeat; 40 background-position: 5px 5px; 41 padding: 5px 60px 0pt 60px; 42 min-height: 20px; 43 } 44 45 .mod { 46 color: #f22; 47 background-color: #ffd5dc; 48 } -
extensions/Register_FluxBB/branches/2.2/include/functions.inc.php
r5606 r6295 14 14 ;"; 15 15 16 $data = mysql_fetch_array(pwg_query($query));16 $data = pwg_db_fetch_row(pwg_query($query)); 17 17 18 18 if (!empty($data)) … … 65 65 ;"; 66 66 67 $o_default_user_group = mysql_fetch_array(pwg_query($query));67 $o_default_user_group = pwg_db_fetch_assoc(pwg_query($query)); 68 68 69 69 $query = " … … 73 73 ;"; 74 74 75 $o_server_timezone = mysql_fetch_array(pwg_query($query));75 $o_server_timezone = pwg_db_fetch_assoc(pwg_query($query)); 76 76 77 77 $query = " … … 81 81 ;"; 82 82 83 $o_default_lang = mysql_fetch_array(pwg_query($query));83 $o_default_lang = pwg_db_fetch_assoc(pwg_query($query)); 84 84 85 85 $query = " … … 89 89 ;"; 90 90 91 $o_default_style = mysql_fetch_array(pwg_query($query));91 $o_default_style = pwg_db_fetch_assoc(pwg_query($query)); 92 92 93 93 $query = ' … … 105 105 ) 106 106 VALUES( 107 '". mysql_real_escape_string($login)."',107 '".pwg_db_real_escape_string($login)."', 108 108 ". ( isset($o_default_user_group['conf_value']) ? "'".$o_default_user_group['conf_value']."'" : '' ) .", 109 109 '".$password."', … … 120 120 $result = pwg_query($query); 121 121 122 $bb_id = mysql_insert_id();122 $bb_id = pwg_db_insert_id(); 123 123 124 124 FluxBB_Linkuser($pwg_id, $bb_id); … … 135 135 ;"; 136 136 137 $data = mysql_fetch_array(pwg_query($query));137 $data = pwg_db_fetch_assoc(pwg_query($query)); 138 138 139 139 if (!empty($data)) … … 157 157 ;"; 158 158 159 $data0 = mysql_fetch_array(pwg_query($query0));159 $data0 = pwg_db_fetch_assoc(pwg_query($query0)); 160 160 161 161 // Si égale à VRAI, suppression de tous les posts et topics … … 173 173 $subquery = " 174 174 DELETE FROM ".FluxBB_TOPICS_TABLE." 175 WHERE BINARY poster = BINARY '". mysql_real_escape_string($data0['username'])."'175 WHERE BINARY poster = BINARY '".pwg_db_real_escape_string($data0['username'])."' 176 176 ;"; 177 177 … … 210 210 ;"; 211 211 212 $row = mysql_fetch_array(pwg_query($query));212 $row = pwg_db_fetch_assoc(pwg_query($query)); 213 213 214 214 if (!empty($row)) … … 216 216 $query = " 217 217 UPDATE ".FluxBB_USERS_TABLE." 218 SET username = '". mysql_real_escape_string($username)."', email = '".$adresse_mail."', password = '".$password."'218 SET username = '".pwg_db_real_escape_string($username)."', email = '".$adresse_mail."', password = '".$password."' 219 219 WHERE id = ".$row['FluxBB_id']." 220 220 ;"; … … 229 229 SELECT id as FluxBB_id 230 230 FROM ".FluxBB_USERS_TABLE." 231 WHERE BINARY username = BINARY '". mysql_real_escape_string($username)."'232 ;"; 233 234 $row = mysql_fetch_array(pwg_query($query));231 WHERE BINARY username = BINARY '".pwg_db_real_escape_string($username)."' 232 ;"; 233 234 $row = pwg_db_fetch_assoc(pwg_query($query)); 235 235 236 236 if (!empty($row)) … … 238 238 $query = " 239 239 UPDATE ".FluxBB_USERS_TABLE." 240 SET username = '". mysql_real_escape_string($username)."', email = '".$adresse_mail."', password = '".$password."'240 SET username = '".pwg_db_real_escape_string($username)."', email = '".$adresse_mail."', password = '".$password."' 241 241 WHERE id = ".$row['FluxBB_id']." 242 242 ;"; -
extensions/Register_FluxBB/branches/2.2/language/en_UK/plugin.lang.php
r5606 r6295 32 32 $lang['Confirm_true'] = ' --> Delete confirmation'; 33 33 $lang['Confirm_false'] = ' --> Confirmation mandatory before actions in audit'; 34 $lang['No_Reg_advise'] = '<b>About the registration of users on the forum FluxBB</b><br><br>35 For easiest way for your users, I advise you to change 2 things:<br>36 <b>* In FluxBB\'s administration panel, change "Allow new registrations" to NO (in: Options - Registration)</b><br><br>37 <b>* Modify the file</b> : [FluxBBRoot]/lang/English/register.php by replacing the following line :38 <div class="info">\'No new regs\' => \'This forum is not accepting new users.\'</div>39 <b>with :</b>40 <div class="info">\'No new regs\' => \'<a href="http://[YourPiwigoRoot]/register.php" > Go here to register </a><br/><br/>\'</div>41 <br>42 Of course you should also make the same change for other languages of your FluxBB forum.<br>';43 34 44 35 $lang['save_config'] ='Settings saved'; … … 122 113 $lang['Mig_End'] = '<b>Migration done !</b>'; 123 114 $lang['Title_Tab'] = 'Register_FluxBB - Version: '; 115 116 // --------- Starting below: New or revised $lang ---- from version 2.2.2 117 $lang['No_Reg_advise'] = '<b>About the registration of users on the forum FluxBB</b><br><br> 118 For better integration, it is advisable to make the following 3 changes to your FluxBB forum (<b>Warning: These changes will disappear when updating the forum</b>):<br> 119 <b>* In FluxBB\'s administration panel, change "Allow new registrations" to NO (in: Options - Registration)</b> 120 <br> 121 <br> 122 <b>* Modify the file</b> : [FluxBBRoot]/lang/English/register.php by replacing the following line: 123 <div class="mod">\'No new regs\' => \'This forum is not accepting new users.\'</div> 124 <b>with :</b> 125 <div class="info">\'No new regs\' => \'<a href="http://[YourPiwigoRoot]/register.php" > Go here to register </a><br/><br/>\'</div> 126 <br> 127 Of course you should also make the same change for other languages of your FluxBB forum. 128 <br> 129 <br> 130 <b>* Modify the file</b> : [FluxBBRoot]/login.php by replacing the line 69: 131 <div class="mod">message($lang_login[\'Wrong user/pass\'].\'<a href="login.php?action=forget"></div> 132 <b>with :</b> 133 <div class="info">message($lang_login[\'Wrong user/pass\'].\'<a href="../[VotreRacineDePiwigo]/identification.php"></div> 134 <br> 135 and at line 216: 136 <div class="mod"><a href="login.php?action=forget" tabindex="5"><?php echo $lang_login[\'Forgotten pass\']</a></p></div> 137 <b>with :</b> 138 <div class="info"><a href="../[VotreRacineDePiwigo]/identification.php" tabindex="5"><?php echo $lang_login[\'Forgotten pass\']</a></p></div> 139 <br>'; 140 // --------- End: New or revised $lang ---- from version 2.2.2 124 141 ?> -
extensions/Register_FluxBB/branches/2.2/language/fr_FR/plugin.lang.php
r5606 r6295 32 32 $lang['Confirm_true'] = ' --> Supprime les confirmations'; 33 33 $lang['Confirm_false'] = ' --> Confirmation obligatoire avant action dans l\'audit'; 34 $lang['No_Reg_advise'] = '<b>A propos de l\'enregistrement d\'utilisateur sur le forum FluxBB</b><br><br>35 Pour plus de facilité pour vos utilisateurs, je vous conseille de modifier 2 choses:<br>36 <b>* modifier dans l\'interface d\'administration de FluxBB "Autoriser les nouvelles inscriptions" à NON ( dans : Options - Inscriptions )</b><br><br>37 <b>* modifier le fichier</b> : [RacineDeFluxBB]/lang/French/register.php en remplacant la ligne suivante:38 <div class="info">\'No new regs\' => \'Ce forum n\\\'accepte pas de nouveaux utilisateurs.\'</div>39 <b>par :</b>40 <div class="info">\'No new regs\' => \'<a href="http://[VotreRacineDePiwigo]/register.php" > Cliquez ici pour vous inscrire </a><br/><br/>\'</div>41 <br>42 Bien sur vous devez aussi faire le même changement pour les autres langues de votre forum FluxBB.<br>';43 34 44 35 $lang['save_config'] ='Configuration enregistrée.'; … … 122 113 $lang['Mig_End'] = '<b>Migration finie !</b>'; 123 114 $lang['Title_Tab'] = 'Register_FluxBB - Version: '; 115 116 117 // --------- Starting below: New or revised $lang ---- from version 2.2.2 118 $lang['No_Reg_advise'] = '<b>A propos de l\'enregistrement d\'utilisateur sur le forum FluxBB</b><br><br> 119 Pour une meilleur intégration, il est conseille d\'apporter les 3 modifications suivantes à votre forum FluxBB (<b>Attention! Ces modifications disparaitront en cas de mise à jour du forum</b>):<br> 120 <b>* Modifier dans l\'interface d\'administration de FluxBB "Autoriser les nouvelles inscriptions" à NON ( dans : Options - Inscriptions )</b> 121 <br> 122 <br> 123 <b>* Modifier le fichier</b> : [RacineDeFluxBB]/lang/French/register.php en remplacant la ligne suivante: 124 <div class="mod">\'No new regs\' => \'Ce forum n\\\'accepte pas de nouveaux utilisateurs.\'</div> 125 <b>par :</b> 126 <div class="info">\'No new regs\' => \'<a href="http://[VotreRacineDePiwigo]/register.php" > Cliquez ici pour vous inscrire </a><br/><br/>\'</div> 127 <br> 128 Et reporter cette modification pour toutes les langues gérées sur votre forum. 129 <br> 130 <br> 131 <b>* Modifier le fichier</b> : [RacineDeFluxBB]/login.php en remplacant à la ligne 69: 132 <div class="mod">message($lang_login[\'Wrong user/pass\'].\'<a href="login.php?action=forget"></div> 133 <b>par :</b> 134 <div class="info">message($lang_login[\'Wrong user/pass\'].\'<a href="../[VotreRacineDePiwigo]/identification.php"></div> 135 <br> 136 à la ligne 216: 137 <div class="mod"><a href="login.php?action=forget" tabindex="5"><?php echo $lang_login[\'Forgotten pass\']</a></p></div> 138 <b>par :</b> 139 <div class="info"><a href="../[VotreRacineDePiwigo]/identification.php" tabindex="5"><?php echo $lang_login[\'Forgotten pass\']</a></p></div> 140 <br>'; 141 // --------- End: New or revised $lang ---- from version 2.2.2 124 142 ?> -
extensions/Register_FluxBB/branches/2.2/main.inc.php
r5658 r6295 2 2 /* 3 3 Plugin Name: Register FluxBB 4 Version: 2.2. 14 Version: 2.2.2 5 5 Description: 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 6 6 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=252 … … 46 46 47 47 2.2.1 - 04/04/10 - Bug 1577 fixed : Multiple database support 48 49 2.2.2 - 23/05/10 - Bug 1674 fixed : Adding of mods for Fluxbb when users loose their password 50 - Adding of German language (Thx to duke) 48 51 49 52 -------------------------------------------------------------------------------- … … 167 170 ;'; 168 171 169 list($current_password) = mysql_fetch_row(pwg_query($query));172 list($current_password) = pwg_db_fetch_row(pwg_query($query)); 170 173 171 174 if ($conf['pass_convert']($_POST['password']) != $current_password) … … 186 189 ;'; 187 190 188 list($username) = mysql_fetch_row(pwg_query($query));191 list($username) = pwg_db_fetch_row(pwg_query($query)); 189 192 190 193 FluxBB_Updateuser($user['id'], stripslashes($username), sha1($_POST['use_new_pwd']), $_POST['mail_address']);
Note: See TracChangeset
for help on using the changeset viewer.