mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-26 23:42:52 +02:00
Code Issues Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Cameron 2019-02-24 11:35:51 -08:00
parent d994785e63
commit e52a660f24
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/iphandler_class.php
View File

@ -889,7 +889,7 @@ class eIPHandler
// do other checks - main IP check is in _construct()
if($this->actionCount)
{
$ip = $this->getip(); // This will be in normalised IPV6 form
$ip = $this->getIP(); // This will be in normalised IPV6 form
if ($ip !== e107::LOCALHOST_IP && ($ip !== e107::LOCALHOST_IP2) && ($ip !== $this->serverIP)) // Check host name, user email to see if banned
{
@ -1049,7 +1049,7 @@ class eIPHandler
}
if (!$ban_ip)
{
$ban_ip = $this->getip();
$ban_ip = $this->getIP();
}
$ban_ip = preg_replace('/[^\w@\.:]*/', '', urldecode($ban_ip)); // Make sure no special characters
if (!$ban_ip)
@ -1636,8 +1636,8 @@ class banlistManager
// Now run through the database updating times
$numRet = 0;
$pref['ban_durations'] = e107::getPref('ban_durations');
$ourDb = e107::getDB(); // Should be able to use $sql, $sql2 at this point
$writeDb = e107::getDB('sql2');
$ourDb = e107::getDb(); // Should be able to use $sql, $sql2 at this point
$writeDb = e107::getDb('sql2');
foreach ($ipAction as $ipKey => $ipInfo)
{

2
e107_handlers/plugin_class.php
View File

@ -517,7 +517,7 @@ class e_plugin
$toRemove = array();
$save = false;
if ($rows = $sql->retrieve("plugin", "*", "plugin_id != '' ORDER by plugin_path ", true))
if ($rows = $sql->retrieve("plugin", "*", "plugin_id != 0 ORDER by plugin_path ", true))
{
foreach($rows as $row)