aboutsummaryrefslogtreecommitdiffstats
path: root/preferences.php
diff options
context:
space:
mode:
authorWesley Miaw <josuah@users.sourceforge.net>2003-11-24 04:05:37 +0000
committerWesley Miaw <josuah@users.sourceforge.net>2003-11-24 04:05:37 +0000
commitab88aa25e6d76bb56ea43a798768e966d29bef46 (patch)
treefa61e8ccad7153bd723faee99fe9409eceff8f64 /preferences.php
parent10db09b2d4a060f69872cf088f0bb65b16856835 (diff)
downloadphpicalendar-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 'preferences.php')
-rw-r--r--preferences.php37
1 files changed, 1 insertions, 36 deletions
diff --git a/preferences.php b/preferences.php
index 7c67ec7..2aa7ba0 100644
--- a/preferences.php
+++ b/preferences.php
@@ -2,7 +2,6 @@
define('BASE','./');
include(BASE.'functions/ical_parser.php');
-include(BASE.'functions/calendar_functions.php');
$display_date = $preferences_lang;
if ($cookie_uri == '') {
@@ -158,41 +157,7 @@ include (BASE.'includes/header.inc.php');
// Begin Calendar Selection
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
- $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED);
- foreach ($filelist as $file) {
- $cal_filename_tmp = substr($file,0,-4);
- $cal_tmp = urlencode($cal_filename_tmp);
- $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
- if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
- if ($cal_tmp == $cookie_calendar) {
- print "<option value=\"$cal_tmp\" selected>$cal_displayname_tmp $calendar_lang</option>\n";
- } else {
- print "<option value=\"$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n";
- }
- }
- }
- // add option to open all (non-web) calenders together
- // Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here
- if ($cookie_calendar == $ALL_CALENDARS_COMBINED) {
- print "<option value=\"$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>\n";
- } else {
- print "<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>\n";
- }
-
- foreach($list_webcals as $cal_tmp) {
- if ($cal_tmp != '') {
- $cal_displayname_tmp = basename($cal_tmp);
- $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
- $cal_displayname_tmp = substr($cal_displayname_tmp,0,-4);
- $cal_encoded_tmp = urlencode($cal_tmp);
- if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
- print "<option value=\"$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>\n";
- } else {
- print "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>\n";
- }
- }
- }
- closedir($dir_handle);
+ display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
print "</select>\n";
?>
</td>

© 2014-2024 Faster IT GmbH | imprint | privacy policy