diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/artist.class.php | 2 | ||||
| -rw-r--r-- | lib/class/vauth.class.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php index 67171faa..1409518b 100644 --- a/lib/class/artist.class.php +++ b/lib/class/artist.class.php @@ -223,7 +223,7 @@ class Artist { public function format() { /* Combine prefix and name, trim then add ... if needed */ - $name = truncate_with_ellipsis(trim($this->prefix . " " . $this->name)); + $name = truncate_with_ellipsis(trim($this->prefix . " " . $this->name),Config::get('ellipsis_threshold_artist')); $this->f_name = $name; $this->f_full_name = trim($this->prefix . " " . $this->name); diff --git a/lib/class/vauth.class.php b/lib/class/vauth.class.php index 761e5a65..a7d2dc91 100644 --- a/lib/class/vauth.class.php +++ b/lib/class/vauth.class.php @@ -264,10 +264,10 @@ class vauth { } // end switch on data type $username = Dba::escape($data['username']); - $ip = Dba::escape(ip2int($_SERVER['REMOTE_ADDR'])); + $ip = $_SERVER['REMOTE_ADDR'] ? Dba::escape(ip2int($_SERVER['REMOTE_ADDR'])) : '0'; $type = Dba::escape($data['type']); $value = Dba::escape($data['value']); - $agent = Dba::escape($_SERVER['HTTP_USER_AGENT']); + $agent = Dba::escape(substr($_SERVER['HTTP_USER_AGENT'],0,254)); $expire = Dba::escape(time() + Config::get('session_length')); /* We can't have null things here people */ |