Ticket #1485076: http_auth_svn.diff

index.php

@@ -144 +144 @@
   }
 }
 
+// not logged in -> try to log in using the HTTP authentication credentials if available and configured to do so
+// mostly copied from the normal login procedure (=> refactor)
+if ($CONFIG['reuse_http_auth'] && empty($USER->ID) && isset($_SERVER['PHP_AUTH_USER'])) {
+  $host = $RCMAIL->autoselect_host();
 
+// check if client supports cookies
+  if (empty($_COOKIE))
+    {
+      $OUTPUT->show_message("cookiesdisabled", 'warning');
+    }
+  else if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW']) &&
+           $RCMAIL->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'], $host))
+  {
+// create new session ID
+  unset($_SESSION['temp']);
+  sess_regenerate_id();
+
+// send auth cookie if necessary
+  $RCMAIL->authenticate_session();
+
+// send redirect
+    header( 'refresh: 1');
+
+  exit;
+  }
+else
+  {
+  $OUTPUT->show_message($IMAP->error_code == -1 ? 'imaperror' : 'loginfailed', 'warning');
+  $RCMAIL->kill_session();
+  }
+}
+
 // not logged in -> show login page
 if (empty($RCMAIL->user->ID)) {
   // check if installer is still active