Changeset 22091 for extensions/Register_FluxBB/admin/admin.php
- Timestamp:
- Apr 9, 2013, 6:17:32 PM (11 years ago)
- File:
-
- 1 edited
-
extensions/Register_FluxBB/admin/admin.php (modified) (24 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/Register_FluxBB/admin/admin.php
r22039 r22091 137 137 138 138 139 // +------------------------------------------------------------+140 // | Migration and Audit |141 // +------------------------------------------------------------+142 //if (isset($_POST['Migration']))143 //{144 // array_push($page['infos'], l10n('Mig_Start').'<br><br>');145 //146 // array_push($page['infos'], l10n('Mig_Del_Link').'<br><br>');147 //148 // $query = 'TRUNCATE '.Register_FluxBB_ID_TABLE.';';149 // $result = pwg_query($query);150 //151 // $msg_Mig_Del_AllUsers = '';152 //153 // $query = '154 //SELECT username, id155 //FROM '.FluxBB_USERS_TABLE.'156 //;';157 //158 // $result = pwg_query($query);159 //160 // while ($row = pwg_db_fetch_assoc($result))161 // {162 // if((stripslashes($row['username']) != stripslashes($conf_Register_FluxBB['FLUXBB_GUEST'])) and (stripslashes($row['username']) != stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN'])))163 // {164 // $msg_Mig_Del_AllUsers .= '<br> - '.l10n('Mig_Del_User').stripslashes($row['username']);165 //166 // FluxBB_Deluser($row['id'], false);167 // }168 // }169 //170 // array_push($page['infos'], l10n('Mig_Del_AllUsers').$msg_Mig_Del_AllUsers.'<br><br>');171 //172 // $query = '173 //SELECT id, username, password, mail_address174 //FROM '.USERS_TABLE.'175 //WHERE username NOT IN ("18","16")176 //;';177 //178 // $result = pwg_query($query);179 //180 // $registred = time();181 // $registred_ip = $_SERVER['REMOTE_ADDR'];182 //183 // $msg_Mig_Add_AllUsers = '';184 //185 // while ($row = pwg_db_fetch_assoc($result))186 // {187 // if((stripslashes($row['username']) != 'guest') and (stripslashes($row['username']) != stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN'])))188 // {189 // $msg_Mig_Add_AllUsers .= '<br> - '.l10n('Mig_Add_User').stripslashes($row['username']);190 //191 // FluxBB_Adduser($row['id'], stripslashes($row['username']), $row['password'], $row['mail_address']);192 // }193 // }194 //195 // array_push($page['infos'], l10n('Mig_Add_AllUsers').$msg_Mig_Add_AllUsers.'<br><br>');196 //197 // $query = '198 //SELECT id, username, password, mail_address199 //FROM '.USERS_TABLE.'200 //WHERE username = "'.$conf_Register_FluxBB['FLUXBB_ADMIN'].'"201 //AND username NOT IN ("18","16")202 //;';203 //204 // $row = pwg_db_fetch_assoc(pwg_query($query));205 //206 // if (!empty($row))207 // {208 // array_push($page['infos'], l10n('Sync_User').stripslashes($row['username']).'<br><br>');209 //210 // FluxBB_Updateuser($row['id'], stripslashes($row['username']), $row['password'], $row['mail_address']);211 // }212 //213 // array_push($page['infos'], l10n('Mig_End'));214 //}215 //else if (isset($_POST['Audit']))216 //{217 // Audit_PWG_FluxBB();218 //}219 220 221 139 // +--------------------------------------------------------+ 222 140 // | Synch and Audit | … … 240 158 FROM '.USERS_TABLE.' 241 159 WHERE username NOT IN ("18","16") 160 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 242 161 GROUP BY BINARY username 243 162 HAVING COUNT(*) > 1 … … 269 188 FROM '.FluxBB_USERS_TABLE.' 270 189 WHERE BINARY username = BINARY "'.$row['username'].'" 190 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 271 191 ;'; 272 192 … … 310 230 AND pwg.username = bb.username 311 231 AND pwg.username NOT IN ("18","16") 232 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 312 233 AND pwg.mail_address = bb.email 313 234 ;'; … … 318 239 { 319 240 $msg_error_Link_Break .= '<br>'.l10n('New_Link').stripslashes($row['pwg_user']).' ('.$row['pwg_mail'].')'; 320 FluxBB_Linkuser($row['pwg_id'], $row['bb_id'] );241 FluxBB_Linkuser($row['pwg_id'], $row['bb_id'], "NOK"); 321 242 } 322 243 … … 333 254 WHERE BINARY pwg.username <> BINARY bb.username 334 255 AND pwg.username NOT IN ("18","16") 256 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 335 257 ;'; 336 258 … … 390 312 INNER JOIN '.USERS_TABLE.' as pwg ON link.id_user_pwg = pwg.id 391 313 WHERE pwg.username NOT IN ("18","16") 314 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 392 315 GROUP BY link.id_user_pwg, link.id_user_FluxBB 393 316 HAVING COUNT(*) > 1 … … 400 323 $msg_error_Link_Bad .= '<br>'.l10n('Link_Dup').$row['nbr_dup'].' = '.stripslashes($row['pwg_user']).' -- '.stripslashes($row['bb_user']).')'; 401 324 402 FluxBB_Linkuser($row['pwg_id'], $row['bb_id'] );325 FluxBB_Linkuser($row['pwg_id'], $row['bb_id'], "NOK"); 403 326 } 404 327 … … 408 331 $msg_error_Link_Bad = l10n('Sync_Link_Bad').$msg_error_Link_Bad; 409 332 410 // $query = ' 411 //SELECT pwg.id as pwg_id, pwg.username as username, pwg.password as pwg_pwd, pwg.mail_address as pwg_eml, FluxBB.id as bb_id, FluxBB.password as bb_pwd, FluxBB.email as bb_eml 412 //FROM '.FluxBB_USERS_TABLE.' AS FluxBB 413 //INNER JOIN '.Register_FluxBB_ID_TABLE.' AS link ON link.id_user_FluxBB = FluxBB.id 414 //INNER JOIN '.USERS_TABLE.' as pwg ON link.id_user_pwg = pwg.id 415 //AND BINARY pwg.username = BINARY FluxBB.username 416 //ORDER BY LOWER(pwg.username) 417 //;'; 418 // 419 // $result = pwg_query($query); 420 // 421 // while($row = pwg_db_fetch_assoc($result)) 422 // { 423 // if ( ($row['pwg_pwd'] != $row['bb_pwd']) or ($row['pwg_eml'] != $row['bb_eml']) ) 424 // { 425 // $msg_error_Synchro .= '<br>'.l10n('Sync_User').stripslashes($row['username']); 426 // 427 // $query = ' 428 //SELECT id, username, password, mail_address 429 //FROM '.USERS_TABLE.' 430 //WHERE BINARY id = "'.$row['pwg_id'].'" 431 //AND "'.$row['username'].'" NOT IN ("18","16") 432 //;'; 433 // 434 // $data = pwg_db_fetch_assoc(pwg_query($query)); 435 // 436 // if (!empty($data)) 437 // FluxBB_Updateuser($data['id'], stripslashes($data['username']), $data['password'], $data['mail_address']); 438 // } 439 // } 333 $query = ' 334 SELECT pwg.id as pwg_id, pwg.username as username, pwg.mail_address as pwg_eml, FluxBB.id as bb_id, FluxBB.email as bb_eml 335 FROM '.FluxBB_USERS_TABLE.' AS FluxBB 336 INNER JOIN '.Register_FluxBB_ID_TABLE.' AS link ON link.id_user_FluxBB = FluxBB.id 337 INNER JOIN '.USERS_TABLE.' as pwg ON link.id_user_pwg = pwg.id 338 AND BINARY pwg.username = BINARY FluxBB.username 339 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 340 ORDER BY LOWER(pwg.username) 341 ;'; 342 343 $result = pwg_query($query); 344 345 while($row = pwg_db_fetch_assoc($result)) 346 { 347 if ($row['pwg_eml'] != $row['bb_eml']) 348 { 349 $msg_error_Synchro .= '<br>'.l10n('Sync_User').stripslashes($row['username']); 350 351 $query = ' 352 SELECT id, username, mail_address 353 FROM '.USERS_TABLE.' 354 WHERE BINARY id = "'.$row['pwg_id'].'" 355 AND "'.$row['username'].'" NOT IN ("18","16") 356 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 357 ;'; 358 359 $data = pwg_db_fetch_assoc(pwg_query($query)); 360 361 if (!empty($data)) 362 Synch_FluxBB_Updateuser($data['id'], stripslashes($data['username']), $data['mail_address']); 363 } 364 } 440 365 441 366 if ($msg_error_Synchro == '') … … 444 369 $msg_error_Synchro = l10n('Sync_DataUser').$msg_error_Synchro; 445 370 446 // $query = ' 447 //SELECT username, mail_address FROM '.USERS_TABLE.' 448 //WHERE BINARY username <> BINARY "guest" 449 //AND username NOT IN ("18","16") 450 //AND id not in ( 451 // SELECT id_user_pwg FROM '.Register_FluxBB_ID_TABLE.' 452 // ) 453 //AND BINARY username not in ( 454 // SELECT username FROM '.FluxBB_USERS_TABLE.' 455 // ) 456 //ORDER BY LOWER(username) 457 //;'; 458 // 459 // $result = pwg_query($query); 460 // 461 // while($row = pwg_db_fetch_assoc($result)) 462 // { 463 // $msg_error_PWG2FluxBB .= '<br>'.l10n('Add_User').stripslashes($row['username']).' ('.$row['mail_address'].')'; 464 // 465 // $query = ' 466 //SELECT id, username, password, mail_address 467 //FROM '.USERS_TABLE.' 468 //WHERE BINARY username = BINARY "'.$row['username'].'" 469 //AND username NOT IN ("18","16") 470 //LIMIT 1 471 //;'; 472 // 473 // $data = pwg_db_fetch_assoc(pwg_query($query)); 474 // 475 // if (!empty($data)) 476 // FluxBB_Adduser($data['id'], stripslashes($data['username']), $data['password'], $data['mail_address']); 477 // } 371 $query = ' 372 SELECT username, mail_address FROM '.USERS_TABLE.' 373 WHERE BINARY username <> BINARY "guest" 374 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 375 AND username NOT IN ("18","16") 376 AND id not in ( 377 SELECT id_user_pwg FROM '.Register_FluxBB_ID_TABLE.' 378 ) 379 AND BINARY username not in ( 380 SELECT username FROM '.FluxBB_USERS_TABLE.' 381 ) 382 ORDER BY LOWER(username) 383 ;'; 384 385 $result = pwg_query($query); 386 387 while($row = pwg_db_fetch_assoc($result)) 388 { 389 $msg_error_PWG2FluxBB .= '<br>'.l10n('Add_User').stripslashes($row['username']).' ('.$row['mail_address'].')'; 390 391 $query = ' 392 SELECT id, username, mail_address 393 FROM '.USERS_TABLE.' 394 WHERE BINARY username = BINARY "'.$row['username'].'" 395 AND username NOT IN ("18","16") 396 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 397 LIMIT 1 398 ;'; 399 400 $data = pwg_db_fetch_assoc(pwg_query($query)); 401 402 if (!empty($data)) 403 Synch_FluxBB_Adduser($data['id'], stripslashes($data['username']), $data['mail_address']); 404 } 478 405 479 406 if ($msg_error_PWG2FluxBB == '') … … 485 412 SELECT id, username, email FROM '.FluxBB_USERS_TABLE.' 486 413 WHERE BINARY username <> BINARY "'.$conf_Register_FluxBB['FLUXBB_GUEST'].'" 414 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'" 487 415 AND id not in ( 488 416 SELECT id_user_FluxBB FROM '.Register_FluxBB_ID_TABLE.' … … 573 501 FROM '.USERS_TABLE.' 574 502 WHERE username NOT IN ("18","16") 575 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"576 503 GROUP BY BINARY username 577 504 HAVING COUNT(*) > 1 … … 606 533 FROM '.FluxBB_USERS_TABLE.' 607 534 WHERE BINARY username = BINARY "'.$row['username'].'" 608 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"609 535 ;'; 610 536 $subresult = pwg_query($subquery); … … 651 577 ) 652 578 AND pwg.username = bb.username 653 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"654 579 AND pwg.username NOT IN ("18","16") 655 580 AND pwg.mail_address = bb.email … … 691 616 INNER JOIN '.USERS_TABLE.' as pwg ON link.id_user_pwg = pwg.id 692 617 WHERE pwg.username <> bb.username 693 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"694 618 AND pwg.username NOT IN ("18","16") 695 619 ;'; … … 773 697 INNER JOIN '.USERS_TABLE.' as pwg ON link.id_user_pwg = pwg.id 774 698 WHERE pwg.username NOT IN ("18","16") 775 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"776 699 GROUP BY link.id_user_pwg, link.id_user_FluxBB 777 700 HAVING COUNT(*) > 1 … … 808 731 // ------------------------------------------- 809 732 $query = ' 810 SELECT pwg. username as username, pwg.password as pwg_pwd, pwg.mail_address as pwg_eml, FluxBB.password as bb_pwd, FluxBB.email as bb_eml733 SELECT pwg.id as pwg_id, pwg.username as username, pwg.mail_address as pwg_eml, FluxBB.email as bb_eml 811 734 FROM '.FluxBB_USERS_TABLE.' AS FluxBB 812 735 INNER JOIN '.Register_FluxBB_ID_TABLE.' AS link ON link.id_user_FluxBB = FluxBB.id 813 736 INNER JOIN '.USERS_TABLE.' as pwg ON link.id_user_pwg = pwg.id 814 737 WHERE BINARY pwg.username = BINARY FluxBB.username 815 AND pwg.username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"816 738 AND pwg.username NOT IN ("18","16") 817 739 ORDER BY LOWER(pwg.username) … … 822 744 while($row = pwg_db_fetch_assoc($result)) 823 745 { 824 if (($row['pwg_pwd'] != $row['bb_pwd']) or ($row['pwg_eml'] != $row['bb_eml'])) 825 { 826 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro').stripslashes($row['username']); 827 828 $msg_error_Synchro .= ' <a href="'; 829 830 $msg_error_Synchro .= add_url_params($page_Register_FluxBB_admin, array( 831 'action' => 'sync_user', 832 'username' => stripslashes($row['username']), 833 )); 834 835 $msg_error_Synchro .= '" title="'.l10n('Sync_User').stripslashes($row['username']).'"'; 836 837 $msg_error_Synchro .= $conf_Register_FluxBB['FLUXBB_CONFIRM']=='false' ? ' onclick="return confirm(\''.l10n('Are you sure?').'\');" ' : ' '; 838 839 $msg_error_Synchro .= '><img src="'.REGFLUXBB_PATH.'/admin/template/icon/user_refresh.png" alt="'.l10n('Sync_User').stripslashes($row['username']).'" /></a>'; 840 841 if ($row['pwg_pwd'] != $row['bb_pwd']) 746 if (($row['pwg_eml'] != $row['bb_eml']) or Reg_FluxBB_PwdSynch($row['pwg_id'])) 747 { 748 if ($row['pwg_eml'] != $row['bb_eml'] and Reg_FluxBB_PwdSynch($row['pwg_id'])) 749 { 750 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro').stripslashes($row['username']); 751 752 $msg_error_Synchro .= ' <a href="'; 753 754 $msg_error_Synchro .= add_url_params($page_Register_FluxBB_admin, array( 755 'action' => 'sync_user', 756 'username' => stripslashes($row['username']), 757 )); 758 759 $msg_error_Synchro .= '" title="'.l10n('Sync_User').stripslashes($row['username']).'"'; 760 761 $msg_error_Synchro .= $conf_Register_FluxBB['FLUXBB_CONFIRM']=='false' ? ' onclick="return confirm(\''.l10n('Are you sure?').'\');" ' : ' '; 762 763 $msg_error_Synchro .= '><img src="'.REGFLUXBB_PATH.'/admin/template/icon/user_refresh.png" alt="'.l10n('Sync_User').stripslashes($row['username']).'" /></a>'; 764 765 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro_Mail').'<br>-- PWG = '.$row['pwg_eml'].'<br>-- FluxBB = '.$row['bb_eml']; 766 842 767 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro_Pswd'); 843 844 if ($row['pwg_eml'] != $row['bb_eml']) 768 } 769 elseif ($row['pwg_eml'] != $row['bb_eml'] and !Reg_FluxBB_PwdSynch($row['pwg_id'])) 770 { 771 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro').stripslashes($row['username']); 772 773 $msg_error_Synchro .= ' <a href="'; 774 775 $msg_error_Synchro .= add_url_params($page_Register_FluxBB_admin, array( 776 'action' => 'sync_user', 777 'username' => stripslashes($row['username']), 778 )); 779 780 $msg_error_Synchro .= '" title="'.l10n('Sync_User').stripslashes($row['username']).'"'; 781 782 $msg_error_Synchro .= $conf_Register_FluxBB['FLUXBB_CONFIRM']=='false' ? ' onclick="return confirm(\''.l10n('Are you sure?').'\');" ' : ' '; 783 784 $msg_error_Synchro .= '><img src="'.REGFLUXBB_PATH.'/admin/template/icon/user_refresh.png" alt="'.l10n('Sync_User').stripslashes($row['username']).'" /></a>'; 785 845 786 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro_Mail').'<br>-- PWG = '.$row['pwg_eml'].'<br>-- FluxBB = '.$row['bb_eml']; 787 } 788 elseif ($row['pwg_eml'] = $row['bb_eml'] and Reg_FluxBB_PwdSynch($row['pwg_id'])) 789 { 790 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro').stripslashes($row['username']); 791 792 $msg_error_Synchro .= '<br>'.l10n('Error_Synchro_Pswd'); 793 } 846 794 } 847 795 else if ($conf_Register_FluxBB['FLUXBB_DETAIL'] == 'true') … … 851 799 if ($msg_error_Synchro <> '') 852 800 $msg_error_Synchro = l10n('Audit_Synchro').$msg_error_Synchro; 853 801 854 802 if ($msg_ok_Synchro <> '') 855 803 if ($msg_error_Synchro <> '') … … 863 811 WHERE BINARY username <> BINARY "guest" 864 812 AND username NOT IN ("18","16") 865 AND username <> "'.stripslashes($conf_Register_FluxBB['FLUXBB_ADMIN']).'"866 813 AND id not in ( 867 814 SELECT id_user_pwg FROM '.Register_FluxBB_ID_TABLE.' … … 902 849 SELECT id, username, email FROM '.FluxBB_USERS_TABLE.' 903 850 WHERE BINARY username <> BINARY "'.$conf_Register_FluxBB['FLUXBB_GUEST'].'" 904 AND BINARY username <> BINARY "'.$conf_Register_FluxBB['FLUXBB_ADMIN'].'"905 851 AND id not in ( 906 852 SELECT id_user_FluxBB FROM '.Register_FluxBB_ID_TABLE.' … … 1004 950 else if (isset($_GET['action']) and ($_GET['action']=='new_link') and isset($_GET['pwg_id']) and isset($_GET['bb_id'])) 1005 951 { 1006 FluxBB_Linkuser($_GET['pwg_id'], $_GET['bb_id'] );952 FluxBB_Linkuser($_GET['pwg_id'], $_GET['bb_id'], "NOK"); 1007 953 1008 954 Audit_PWG_FluxBB(); 1009 955 } 1010 //else if (isset($_GET['action']) and ($_GET['action']=='sync_user') and isset($_GET['username'])) 1011 //{ 1012 // $query = ' 1013 //SELECT id AS id_pwg, username, password, mail_address 1014 //FROM '.USERS_TABLE.' 1015 //WHERE BINARY username = BINARY "'.pwg_db_real_escape_string($_GET['username']).'" 1016 //AND username NOT IN ("18","16") 1017 //LIMIT 1 1018 //;'; 1019 // 1020 // $data = pwg_db_fetch_assoc(pwg_query($query)); 1021 // 1022 // if (!empty($data)) 1023 // { 1024 // FluxBB_Updateuser($data['id_pwg'], stripslashes($data['username']), $data['password'], $data['mail_address']); 1025 // } 1026 // 1027 // Audit_PWG_FluxBB(); 1028 //} 1029 else if (isset($_GET['action']) and ($_GET['action']=='add_user') and isset($_GET['username'])) 1030 { 1031 $query = ' 1032 SELECT id, username, password, mail_address 956 else if (isset($_GET['action']) and ($_GET['action']=='sync_user') and isset($_GET['username'])) 957 { 958 $query = ' 959 SELECT id AS id_pwg, username, mail_address 1033 960 FROM '.USERS_TABLE.' 1034 961 WHERE BINARY username = BINARY "'.pwg_db_real_escape_string($_GET['username']).'" … … 1038 965 1039 966 $data = pwg_db_fetch_assoc(pwg_query($query)); 1040 967 1041 968 if (!empty($data)) 1042 FluxBB_Adduser($data['id'], stripslashes($data['username']), $data['password'], $data['mail_address']); 969 { 970 Synch_FluxBB_Updateuser($data['id_pwg'], stripslashes($data['username']), $data['mail_address']); 971 } 972 973 Audit_PWG_FluxBB(); 974 } 975 else if (isset($_GET['action']) and ($_GET['action']=='add_user') and isset($_GET['username'])) 976 { 977 $query = ' 978 SELECT id, username, mail_address 979 FROM '.USERS_TABLE.' 980 WHERE BINARY username = BINARY "'.pwg_db_real_escape_string($_GET['username']).'" 981 AND username NOT IN ("18","16") 982 LIMIT 1 983 ;'; 984 985 $data = pwg_db_fetch_assoc(pwg_query($query)); 986 987 if (!empty($data)) 988 Synch_FluxBB_Adduser($data['id'], stripslashes($data['username']), $data['mail_address']); 1043 989 1044 990 Audit_PWG_FluxBB(); … … 1046 992 else if (isset($_GET['action']) and ($_GET['action']=='del_user') and isset($_GET['id'])) 1047 993 { 1048 FluxBB_Deluser( $_GET['id'], true);994 FluxBB_Deluser($_GET['id'], true); 1049 995 1050 996 Audit_PWG_FluxBB();
Note: See TracChangeset
for help on using the changeset viewer.
