mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 21:27:25 +02:00
Bugtracker #4707 - fla.php doesn't work in a multilingual site
This commit is contained in:
@@ -9,9 +9,9 @@
|
||||
* Manage/View failed login attempts
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $
|
||||
* $Revision: 1.7 $
|
||||
* $Date: 2008-12-30 13:51:41 $
|
||||
* $Author: secretr $
|
||||
* $Revision: 1.8 $
|
||||
* $Date: 2009-07-18 13:08:37 $
|
||||
* $Author: marj_nl_fr $
|
||||
*
|
||||
*/
|
||||
require_once("../class2.php");
|
||||
@@ -177,11 +177,12 @@ else
|
||||
{
|
||||
extract($fa);//FIXME kill extract()
|
||||
|
||||
$gen_chardata = str_replace(":::", "<br />", $e107->tp->toHTML($gen_chardata));
|
||||
$host = $e107->get_host_name(getenv($gen_ip));
|
||||
$text .= "
|
||||
<tr>
|
||||
<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 class='center middle autocheck e-pointer'>
|
||||
".$frm->checkbox('fladelete[]', $gen_id)."
|
||||
@@ -205,7 +206,8 @@ else
|
||||
|
||||
$parms = $fla_total.",".$amount.",".$from.",".e_SELF.'?'."[FROM].".$amount;
|
||||
$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;
|
||||
}
|
||||
?>
|
||||
|
@@ -12,9 +12,9 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/login.php,v $
|
||||
| $Revision: 1.23 $
|
||||
| $Date: 2009-07-05 18:47:51 $
|
||||
| $Author: e107steved $
|
||||
| $Revision: 1.24 $
|
||||
| $Date: 2009-07-18 13:08:37 $
|
||||
| $Author: marj_nl_fr $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@@ -395,6 +395,9 @@ class userlogin
|
||||
function logNote($title, $text)
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -402,8 +405,10 @@ class userlogin
|
||||
// Make a note of an event in the 'generic' table
|
||||
function genNote($fip, $username, $msg1)
|
||||
{
|
||||
global $sql, $tp;
|
||||
$sql -> db_Insert("generic", "0, 'failed_login', '".time()."', 0, '{$fip}', 0, '".$msg1." ::: ".LAN_LOGIN_1.": ".$tp -> toDB($username)."'");
|
||||
//global $sql, $tp;
|
||||
$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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
Reference in New Issue
Block a user