diff options
author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-31 15:32:54 -0500 |
---|---|---|
committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-31 15:37:19 -0500 |
commit | 205ce073b52905fa3558ff92fb89e5e5a7b682c0 (patch) | |
tree | 24b5e624bc3bf996ca2ff47827cc7b846f24813f | |
parent | 0b0f4d1634abc0985e6c0790c0af12073e8005c8 (diff) | |
download | ampache-205ce073b52905fa3558ff92fb89e5e5a7b682c0.tar.gz ampache-205ce073b52905fa3558ff92fb89e5e5a7b682c0.tar.bz2 ampache-205ce073b52905fa3558ff92fb89e5e5a7b682c0.zip |
Fix the session type exception for use_auth=false
The table definition changed slightly and the old workaround didn't
work. If auth is disabled, we really don't care that much, so just drop
the attempt to constrain type in that case.
-rw-r--r-- | lib/class/session.class.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/class/session.class.php b/lib/class/session.class.php index 68bc16e4..a4d3d576 100644 --- a/lib/class/session.class.php +++ b/lib/class/session.class.php @@ -272,14 +272,13 @@ class Session { } break; case 'interface': - // Build a list of enabled authentication types - $types = Config::get('auth_methods'); - if (!Config::get('use_auth')) { - $types[] = ''; + $sql = 'SELECT * FROM `session` WHERE `id` = ? AND `expire` > ?'; + if (Config::get('use_auth')) { + // Build a list of enabled authentication types + $types = Config::get('auth_methods'); + $enabled_types = implode("','", $types); + $sql .= " AND `type` IN('$enabled_types')"; } - $enabled_types = implode("','", $types); - $sql = 'SELECT * FROM `session` WHERE `id` = ? AND `expire` > ? ' . - "AND `type` IN('$enabled_types')"; $db_results = Dba::read($sql, array($key, time())); if (Dba::num_rows($db_results)) { |