diff options
| author | Wesley Miaw <josuah@users.sourceforge.net> | 2003-11-24 04:05:37 +0000 |
|---|---|---|
| committer | Wesley Miaw <josuah@users.sourceforge.net> | 2003-11-24 04:05:37 +0000 |
| commit | ab88aa25e6d76bb56ea43a798768e966d29bef46 (patch) | |
| tree | fa61e8ccad7153bd723faee99fe9409eceff8f64 /includes/login.php | |
| parent | 10db09b2d4a060f69872cf088f0bb65b16856835 (diff) | |
| download | phpicalendar-ab88aa25e6d76bb56ea43a798768e966d29bef46.tar.gz phpicalendar-ab88aa25e6d76bb56ea43a798768e966d29bef46.tar.bz2 phpicalendar-ab88aa25e6d76bb56ea43a798768e966d29bef46.zip | |
Added HTTP authentication support. Modifications to non-HTTP
authentication login so that the two are mutually exclusive.
Moved calendar <option> listing into calendar_functions.php so it can
be shared by the navigation (via list_icals.php) and also by the
preferences.php file.
Fixed typo of $show_login to $allow_login.
Added E_ERROR to the debug error level, so fatal errors are logged.
Diffstat (limited to 'includes/login.php')
| -rw-r--r-- | includes/login.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/login.php b/includes/login.php index f374c31..06b7381 100644 --- a/includes/login.php +++ b/includes/login.php @@ -1,6 +1,7 @@ <?php - // Hide the login block if logged in or there are no lock usernames. - if (!isset($username) && $show_login == 'yes') { + // Hide the login block if logged in, there are no lock usernames, + // or if authenticated via HTTP. + if ($username == '' && $allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) { // Set the login table width if not set. if (!isset($login_width)) $login_width = "100%"; |