diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-02-01 01:06:46 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-02-01 01:06:46 +0000 |
commit | b9a2603025483deefbf7636de3f6c0786e95d293 (patch) | |
tree | 5d2ece594fbed8a58874830c42d8182f025ef16b /lib/class/user.class.php | |
parent | 1891fd835cc3cd60d7c3a2ec8bf90b51ca261bf0 (diff) | |
download | ampache-b9a2603025483deefbf7636de3f6c0786e95d293.tar.gz ampache-b9a2603025483deefbf7636de3f6c0786e95d293.tar.bz2 ampache-b9a2603025483deefbf7636de3f6c0786e95d293.zip |
Finish IPv6 support
Diffstat (limited to 'lib/class/user.class.php')
-rw-r--r-- | lib/class/user.class.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 29c9b05d..de07b156 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -344,7 +344,7 @@ class User extends database_object { $db_results = Dba::query($sql); if ($row = Dba::fetch_assoc($db_results)) { - $ip = $row['ip'] ? $row['ip'] : '1'; + $ip = $row['ip'] ? $row['ip'] : NULL; return $ip; } @@ -585,11 +585,12 @@ class User extends database_object { debug_event('User Ip', 'Login from ip adress: ' . $sip,'3'); } - $ip = sprintf("%u",ip2long($sip)); + $ip = Dba::escape(inet_pton($sip)); $date = time(); $user = $this->id; + $agent = Dba::escape($_SERVER['HTTP_USER_AGENT']); - $sql = "INSERT INTO `ip_history` (`ip`,`user`,`date`) VALUES ('$ip','$user','$date')"; + $sql = "INSERT INTO `ip_history` (`ip`,`user`,`date`,`agent`) VALUES ('$ip','$user','$date','$agent')"; $db_results = Dba::query($sql); /* Clean up old records... sometimes */ |