summaryrefslogtreecommitdiffstats
path: root/login.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-24 06:32:17 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-24 06:32:17 +0000
commit74ff21838d600bc36014953db8e6c51db7ce33a4 (patch)
treea9e982401f0c7e0a8027e4a9336eea780cbedf12 /login.php
parentf6ea76097eec3f0b5d39d5e6320242a743f74ac1 (diff)
downloadampache-74ff21838d600bc36014953db8e6c51db7ce33a4.tar.gz
ampache-74ff21838d600bc36014953db8e6c51db7ce33a4.tar.bz2
ampache-74ff21838d600bc36014953db8e6c51db7ce33a4.zip
changed alpha4 to beta1, updated translation base files, corrected mysql_auth logic
Diffstat (limited to 'login.php')
-rw-r--r--login.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/login.php b/login.php
index 553e8df3..a41853fe 100644
--- a/login.php
+++ b/login.php
@@ -110,6 +110,7 @@ if ($auth['success']) {
// Not sure if it was me or php tripping out,
// but naming this 'user' didn't work at all
//
+ session_start();
$_SESSION['userdata'] = $auth;
//
@@ -128,6 +129,7 @@ if ($auth['success']) {
if (substr($_POST['referrer'],0,strlen(Config::get('web_path'))) == Config::get('web_path') AND
!strstr($_POST['referrer'],"install.php") AND
!strstr($_POST['referrer'],"login.php") AND
+ !strstr($_POST['referrer'],'logout.php') AND
!strstr($_POST['referrer'],"update.php") AND
!strstr($_POST['referrer'],"activate.php") AND
!strstr($_POST['referrer'],"admin")) {
@@ -138,10 +140,6 @@ if ($auth['success']) {
header("Location: " . Config::get('web_path') . "/index.php");
exit();
} // auth success
-/* If auth failed then setup the error */
-else {
- Error::add('general',$auth['error']);
-}
require Config::get('prefix') . '/templates/show_login_form.inc.php';