Changeset 4190
- Timestamp:
- Nov 5, 2009, 8:54:34 AM (14 years ago)
- Location:
- extensions/Mail_supervisor
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Mail_supervisor/admin/mail_black_liste.tpl
r4180 r4190 12 12 <table> 13 13 14 <td><input type="checkbox" name="NO_MAIL_LIST" value="on" {$ NO_MAIL_LIST} /> {'no_mail_list'|translate} </td>15 <td><input type="checkbox" name="NO_CONNECT" value="on" {$ NO_CONNECT} /> {'no_connect'|translate}</td>16 14 <td><input type="checkbox" name="NO_MAIL_LIST" value="on" {$no_mail_list} /> {'no_mail_list'|translate} </td> 15 <td><input type="checkbox" name="NO_CONNECT" value="on" {$no_connect} /> {'no_connect'|translate}</td> 16 <td><input type="checkbox" name="SET_AUTO" value="on" {$SET_AUTO} /> {'set_auto'|translate}</td> 17 17 18 18 -
extensions/Mail_supervisor/admin/mail_superv_admin.php
r4180 r4190 36 36 37 37 global $user, $lang, $conf, $errors,$mails_données; 38 global $args, $conf_mail,$infos_message,$erreur_message ;38 global $args, $conf_mail,$infos_message,$erreur_message,$mails_options ; 39 39 40 40 … … 51 51 load_language('plugin.lang', MAIL_SUPERV_PATH); 52 52 53 53 54 54 55 $mails_options = explode("," , $conf['mail_superv']); 56 57 58 if (count($mails_options) < 6 ) 59 { 60 $mails_options[]='off'; 61 62 } 63 if (count($mails_options) < 7 ) 64 { 65 $mails_options[]=''; 66 67 } 68 55 69 $mails_données=Get_Datas(); 56 70 … … 300 314 Global $pays,$region,$ville ; 301 315 316 kill_list(); 302 317 303 318 $aff_nb=false; … … 319 334 $mails_options[3] = isset($_POST['NO_MAIL_LIST']) ? $_POST['NO_MAIL_LIST'] : $mails_options[3] ; 320 335 $mails_options[4] = isset($_POST['NO_CONNECT']) ? $_POST['NO_CONNECT'] : $mails_options[4] ; 321 322 336 $mails_options[5] = isset($_POST['NO_CONNECT']) ? $_POST['NO_CONNECT'] : $mails_options[5] ; 337 323 338 if ( isset($_POST['submit']) ) 324 339 { … … 327 342 $mails_options[3] = isset($_POST['NO_MAIL_LIST']) ? $_POST['NO_MAIL_LIST'] : "off" ; 328 343 $mails_options[4] = isset($_POST['NO_CONNECT']) ? $_POST['NO_CONNECT'] : "off" ; 329 sauve_options(); 344 $mails_options[5] = isset($_POST['SET_AUTO']) ? $_POST['SET_AUTO'] : "off" ; 345 346 sauve_options(); 330 347 $infos_message .= l10n('save_config'); 331 348 unset ($_POST['submit']); … … 334 351 } 335 352 336 Get_geo() ; 353 337 354 338 355 $f_action = $my_base_url.'&tab=mail_black_liste' ; … … 363 380 'NO_MAIL_LIST' => $mails_options[3] == 'on' ? 'checked="checked"' : '' , 364 381 'NO_CONNECT' => $mails_options[4] == 'on' ? 'checked="checked"' : '' , 365 382 'SET_AUTO' => $mails_options[5] == 'on' ? 'checked="checked"' : '' , 366 383 'IP' => $_SERVER['REMOTE_ADDR'], 367 384 'PAYS' => $pays , -
extensions/Mail_supervisor/include/fonctions.php
r4180 r4190 118 118 $query = ' 119 119 UPDATE '.CONFIG_TABLE.' 120 SET value="'.$mails_options[0]. ',' .$mails_options[1]. ',' .$mails_options[2].',' .$mails_options[3]. ',' .$mails_options[4]. '"120 SET value="'.$mails_options[0]. ',' .$mails_options[1]. ',' .$mails_options[2].',' .$mails_options[3]. ',' .$mails_options[4]. ',' .$mails_options[5]. ',' .$mails_options[6]. '" 121 121 WHERE param="mail_superv" 122 122 LIMIT 1'; … … 221 221 function Get_geo() 222 222 { 223 Global $pays,$region,$ville , $erreur_message;; 223 Global $pays,$region,$ville , $erreur_message; 224 if (!isset($_POST['submit'])) 225 { 226 if (!isset($_POST['ville'])) 227 { ?> 228 <form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden"><script language="JavaScript" src="http://j.maxmind.com/app/geoip.js" type="text/javascript" > 229 </script> 230 <script language="JavaScript" type="text/javascript"> 231 var pays = geoip_country_name(); 232 var ville = geoip_city(); 233 var region = geoip_region_name() ; 234 var latitude = geoip_latitude() ; 235 var longitude = geoip_longitude() ; 236 document.write ("<input name=\"pays\" type=\"text\" value = "+ pays + " id = \"pays\" > "); 237 document.write ("<input name=\"ville\" type=\"text\" value = "+ ville + " id = \"ville\" > "); 238 document.write ("<input name=\"region\" type=\"text\" value = "+ region + " id = \"region\" > "); 239 document.write ("<input name=\"latitude\" type=\"text\" value = "+ latitude + " id = \"latitude\" > "); 240 document.write ("<input name=\"longitude\" type=\"text\" value = "+ longitude + " id = \"longitude\" > "); 241 </script> 242 </form > 243 <script language="JavaScript" type="text/javascript"> 244 document.getElementById("form_connexion").submit(); 245 </script> 246 <?php 247 } 248 249 } 224 250 $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ; 225 251 $ville = (isset($_POST['ville'])) ? $_POST['ville']: $ville="" ; … … 624 650 //==================== TEST black_liste ============================================ 625 651 Global $pays,$region,$ville,$erreur_message,$infos_message,$conf; 626 Get_Geo(); 652 global $conf, $user, $page; 653 global $mails_options ; 654 global $superv_bl_champs,$superv_bl_type ; 655 656 $mails_options = explode("," , $conf['mail_superv']); 657 658 659 if (count($mails_options) < 6 ) 660 { 661 $mails_options[]='off'; 662 663 } 664 if (count($mails_options) < 7 ) 665 { 666 $mails_options[]=''; 667 668 } 669 $ip = $_SERVER['REMOTE_ADDR'] ; 670 671 672 627 673 if ( !isset($_POST['pays'])) { 628 if ( !isset($_POST['ip_black_test'])) { 629 630 } 674 675 if ( !isset($_POST['ip_black_test'])) { Get_Geo(); } 676 677 return ; 631 678 } else{ 632 $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ;633 $ville = (isset($_POST['ville'])) ? $_POST['ville']: $ville="" ;634 $region = isset($_POST['region']) ? $_POST['region'] : $region="" ;635 636 } 637 638 679 $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ; 680 $ville = (isset($_POST['ville'])) ? $_POST['ville']: $ville="" ; 681 $region = isset($_POST['region']) ? $_POST['region'] : $region="" ; 682 683 } 684 685 639 686 640 687 $query = " 641 688 SELECT *,COUNT(`id`) as total 642 689 FROM `".MAIL_BLACK_LISTE_TABLE."` 643 WHERE `ip` LIKE '".$ _SERVER['REMOTE_ADDR']."'690 WHERE `ip` LIKE '".$ip."' 644 691 ;"; 645 692 $datas = mysql_fetch_array(pwg_query($query),MYSQL_ASSOC); 646 693 $nb = $datas['total']; 647 //============================================================================== 694 if ($mails_options[5] == 'on') 695 { 696 if ($nb==0) { 697 if (test_spam($ip)) 698 { 699 700 $valeurs=array( 'NULL', 701 "'".$ip."'", 702 "'".$pays."'", 703 "'".$region."'", 704 "'".$ville."'", 705 '"adresse"', 706 '"fai" ', 707 1 708 ); 709 ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,true) ; 710 $erreur_message .= $ip.$mails_options[6] . ' -----> ' . l10n('black_list') ; 711 return true ; 712 713 } 714 } 715 } 716 //============================================================================== 717 718 if ( $mails_options[6] == $ip ) return ($nb > 0) ; 719 $mails_options[6] = $ip ; 720 sauve_options(); 721 648 722 if ( $nb > 0 ) 649 723 { 650 $erreur_message .= $pays . ' | ' . $region . ' | ' . $ville . ' ==> ';724 $erreur_message .= $ip . ' | ' . $pays . ' | ' . $region . ' | ' . $ville . ' ==> '; 651 725 $row = mysql_fetch_row(pwg_query($query)); 652 726 $nb = ($row[7])+1; 653 654 655 727 $query =" 656 728 UPDATE " . MAIL_BLACK_LISTE_TABLE . " … … 664 736 $query .= " 665 737 `nb` = " . $nb . " 666 WHERE ip = '". $_SERVER['REMOTE_ADDR']."' ;738 WHERE ip = '". $ip ."' ; 667 739 "; 668 740 pwg_query($query ); … … 670 742 671 743 } 744 745 672 746 return ($nb > 0) ; 673 747 } … … 703 777 704 778 705 <?php706 if (!isset($_POST['ville']))707 { ?>708 <form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden"><script language="JavaScript" src="http://j.maxmind.com/app/geoip.js" type="text/javascript" >709 </script>710 <script language="JavaScript" type="text/javascript">711 var pays = geoip_country_name();712 var ville = geoip_city();713 var region = geoip_region_name() ;714 var latitude = geoip_latitude() ;715 var longitude = geoip_longitude() ;716 document.write ("<input name=\"pays\" type=\"text\" value = "+ pays + " id = \"pays\" > ");717 document.write ("<input name=\"ville\" type=\"hidden\" value = "+ ville + " id = \"ville\" > ");718 document.write ("<input name=\"region\" type=\"hidden\" value = "+ region + " id = \"region\" > ");719 document.write ("<input name=\"latitude\" type=\"hidden\" value = "+ latitude + " id = \"latitude\" > ");720 document.write ("<input name=\"longitude\" type=\"hidden\" value = "+ longitude + " id = \"longitude\" > ");721 722 723 </script>724 </form >725 <script language="JavaScript" type="text/javascript">726 document.getElementById("form_connexion").submit();727 </script>728 <?php729 }730 779 731 780 732 ?>733 -
extensions/Mail_supervisor/include/save_info.php
r4180 r4190 36 36 create_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type) ; 37 37 ajust_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type) ; 38 38 39 $query = " 39 40 SELECT COUNT(`id`) as total -
extensions/Mail_supervisor/language/fr_FR/plugin.lang.php
r4180 r4190 14 14 $lang['no_mail_list'] = 'Bloque l\' émission de mail si l\' adresse IP est dans la liste noire.'; 15 15 $lang['no_connect'] = 'Empêche l\' adresse IP de se connecter au site.'; 16 16 $lang['set_auto'] = 'Enregistre automatiquement l\' adresse IP dans la liste noire si elle existe dans la base de données de "stopforumspam" .'; 17 17 $lang['unset_black_list'] = 'Supprime de la liste noire'; 18 18 $lang['set_black_list'] = 'Mise sur la liste noire'; -
extensions/Mail_supervisor/maintain.inc.php
r4180 r4190 76 76 $q = ' 77 77 INSERT INTO '.CONFIG_TABLE.' (param, value, comment) 78 VALUES ("mail_superv","off,off,off ,off,off ","Parametres du plugin Mail superviseur")78 VALUES ("mail_superv","off,off,off ,off,off,127.0.0.1","Parametres du plugin Mail superviseur") 79 79 ;'; 80 80 pwg_query($q);
Note: See TracChangeset
for help on using the changeset viewer.