[PHPiCalendar-Commits] phpicalendar config.inc.php,1.130,1.131 preferences.php,1.37,1.38

[<jo...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv30895

Modified Files:
	config.inc.php preferences.php 
Log Message:
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.


Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** config.inc.php	24 Nov 2003 03:15:57 -0000	1.130
--- config.inc.php	24 Nov 2003 04:05:37 -0000	1.131
***************
*** 44,48 ****
  $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
  $show_completed			= 'no';				// Show completed todos on your todo list.
! $show_login				= 'no';				// Set to yes to prompt for login to unlock calendars.
  
  // Webdav style publishing
--- 44,48 ----
  $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
  $show_completed			= 'no';				// Show completed todos on your todo list.
! $allow_login			= 'no';				// Set to yes to prompt for login to unlock calendars.
  
  // Webdav style publishing
***************
*** 81,84 ****
  // add more lines as necessary
  
! 
! ?>
--- 81,88 ----
  // add more lines as necessary
  
! $apache_map['user1'] = array('');			// Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array('');			// authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array('');			// given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array('');			// Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
! // add more lines as necessary
! ?>
\ No newline at end of file

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** preferences.php	24 Nov 2003 03:35:51 -0000	1.37
--- preferences.php	24 Nov 2003 04:05:37 -0000	1.38
***************
*** 3,7 ****
  define('BASE','./');
  include(BASE.'functions/ical_parser.php');
- include(BASE.'functions/calendar_functions.php');
  $display_date = $preferences_lang;
  
--- 3,6 ----
***************
*** 159,197 ****
  												//
  												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);
  												print "</select>\n";
  											?>
--- 158,162 ----
  												//
  												print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! 												display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  												print "</select>\n";
  											?>