mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4707 - fla.php doesn't work in a multilingual site

Browse Source
This commit is contained in:
marj
2009-07-18 13:08:37 +00:00
parent 010c06d9af
commit 07fa97d39c
2 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_admin/fla.php
View File

@@ -9,9 +9,9 @@
* Manage/View failed login attempts * Manage/View failed login attempts
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $
* $Revision: 1.7 $ * $Revision: 1.8 $
* $Date: 2008-12-30 13:51:41 $ * $Date: 2009-07-18 13:08:37 $
* $Author: secretr $ * $Author: marj_nl_fr $
* *
*/ */
require_once("../class2.php"); require_once("../class2.php");
@@ -177,11 +177,12 @@ else
{ {
extract($fa);//FIXME kill extract() extract($fa);//FIXME kill extract()
$gen_chardata = str_replace(":::", "<br />", $e107->tp->toHTML($gen_chardata));
$host = $e107->get_host_name(getenv($gen_ip)); $host = $e107->get_host_name(getenv($gen_ip));
$text .= " $text .= "
<tr> <tr>
<td>".$gen->convert_date($gen_datestamp, "forum")."</td> <td>".$gen->convert_date($gen_datestamp, "forum")."</td>
<td>".str_replace(":::", "<br />", htmlentities($gen_chardata, ENT_QUOTES, CHARSET))."</td> <td>".$gen_chardata."</td>
<td>".$e107->ipDecode($fa['gen_ip'])."<br />{$host}</td> <td>".$e107->ipDecode($fa['gen_ip'])."<br />{$host}</td>
<td class='center middle autocheck e-pointer'> <td class='center middle autocheck e-pointer'>
".$frm->checkbox('fladelete[]', $gen_id)." ".$frm->checkbox('fladelete[]', $gen_id)."
@@ -205,7 +206,8 @@ else
$parms = $fla_total.",".$amount.",".$from.",".e_SELF.'?'."[FROM].".$amount; $parms = $fla_total.",".$amount.",".$from.",".e_SELF.'?'."[FROM].".$amount;
$nextprev = $tp->parseTemplate("{NEXTPREV={$parms}}"); $nextprev = $tp->parseTemplate("{NEXTPREV={$parms}}");
if ($nextprev) $text .= "<div class='nextprev-bar'>".$nextprev."</div>"; if ($nextprev)
$text .= "<div class='nextprev-bar'>".$nextprev."</div>";
@@ -240,4 +242,3 @@ function headerjs()
return $ret; return $ret;
} }
?>

17
e107_handlers/login.php
View File

@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/login.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/login.php,v $
| $Revision: 1.23 $ | $Revision: 1.24 $
| $Date: 2009-07-05 18:47:51 $ | $Date: 2009-07-18 13:08:37 $
| $Author: e107steved $ | $Author: marj_nl_fr $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -395,6 +395,9 @@ class userlogin
function logNote($title, $text) function logNote($title, $text)
{ {
global $admin_log; global $admin_log;
$e107 = &e107::getInstance();
$title = $e107->tp->toDB($title);
$text = $e107->tp->toDB($text);
$admin_log->e_log_event(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", $title, $text, FALSE, LOG_TO_ROLLING); $admin_log->e_log_event(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", $title, $text, FALSE, LOG_TO_ROLLING);
} }
@@ -402,8 +405,10 @@ class userlogin
// Make a note of an event in the 'generic' table // Make a note of an event in the 'generic' table
function genNote($fip, $username, $msg1) function genNote($fip, $username, $msg1)
{ {
global $sql, $tp; //global $sql, $tp;
$sql -> db_Insert("generic", "0, 'failed_login', '".time()."', 0, '{$fip}', 0, '".$msg1." ::: ".LAN_LOGIN_1.": ".$tp -> toDB($username)."'"); $e107 = &e107::getInstance();
$message = $e107->tp->toDB($msg1." ::: ".LAN_LOGIN_1.": ".$username);
$e107->sql->db_Insert("generic", "0, 'failed_login', '".time()."', 0, '{$fip}', 0, '{$message}'");
} }
@@ -487,5 +492,3 @@ class userlogin
} }
} }
} }
?>