|
From: <jo...@us...> - 2003-09-20 00:16:09
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv17823/functions
Modified Files:
ical_parser.php init.inc.php list_icals.php
Log Message:
Set magic string $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'.
All previous references to 'all_calendars_combined971' now point at
$ALL_CALENDARS_COMBINED.
Uncommented closing form tag on sidebar.php, and set correct spacing
for the entire sidebar.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** ical_parser.php 19 Sep 2003 20:36:58 -0000 1.103
--- ical_parser.php 20 Sep 2003 00:16:05 -0000 1.104
***************
*** 32,36 ****
// reading the file if it's allowed
$parse_file = true;
! if (($is_webcal == false) && ($save_parsed_cals == 'yes') && ($cal != 'all_calenders_combined971')) {
$realcal_mtime = filemtime($filename);
$parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year;
--- 32,36 ----
// reading the file if it's allowed
$parse_file = true;
! if (($is_webcal == false) && ($save_parsed_cals == 'yes') && ($cal != $ALL_CALENDARS_COMBINED)) {
$realcal_mtime = filemtime($filename);
$parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year;
***************
*** 968,972 ****
// write the new master array to the file
! if (isset($master_array) && is_array($master_array) && $save_parsed_cals == 'yes' && $is_webcal == FALSE && $cal != 'all_calenders_combined971') {
$write_me = serialize($master_array);
$fd = fopen($parsedcal, 'w');
--- 968,972 ----
// write the new master array to the file
! if (isset($master_array) && is_array($master_array) && $save_parsed_cals == 'yes' && $is_webcal == FALSE && $cal != $ALL_CALENDARS_COMBINED) {
$write_me = serialize($master_array);
$fd = fopen($parsedcal, 'w');
***************
*** 990,994 ****
// Set a calender name for all calenders combined
! if ($cal == 'all_calenders_combined971') {
$calendar_name = $all_cal_comb_lang;
}
--- 990,994 ----
// Set a calender name for all calenders combined
! if ($cal == $ALL_CALENDARS_COMBINED) {
$calendar_name = $all_cal_comb_lang;
}
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** init.inc.php 15 Sep 2003 03:18:24 -0000 1.36
--- init.inc.php 20 Sep 2003 00:16:05 -0000 1.37
***************
*** 9,12 ****
--- 9,13 ----
//error_reporting (E_ALL);
+ $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
if (!defined('BASE')) define('BASE', './');
include(BASE.'config.inc.php');
***************
*** 55,59 ****
} else {
if (isset($default_cal_check)) {
! if ($default_cal_check != 'all_calenders_combined971') {
$calcheck = $calendar_path.'/'.$default_cal_check.'.ics';
$calcheckopen = @fopen($calcheck, "r");
--- 56,60 ----
} else {
if (isset($default_cal_check)) {
! if ($default_cal_check != $ALL_CALENDARS_COMBINED) {
$calcheck = $calendar_path.'/'.$default_cal_check.'.ics';
$calcheckopen = @fopen($calcheck, "r");
***************
*** 64,68 ****
}
} else {
! $cal_filename = 'all_calenders_combined971';
}
} else {
--- 65,69 ----
}
} else {
! $cal_filename = $ALL_CALENDARS_COMBINED;
}
} else {
***************
*** 99,103 ****
// empty the filelist array
$cal_filelist = array();
! if ($cal == 'all_calenders_combined971') { // Create an array with the paths to all files to be combined
// Note: code here is similar to code in list_icals.php
// open directory
--- 100,104 ----
// empty the filelist array
$cal_filelist = array();
! if ($cal == $ALL_CALENDARS_COMBINED) { // Create an array with the paths to all files to be combined
// Note: code here is similar to code in list_icals.php
// open directory
Index: list_icals.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** list_icals.php 16 Sep 2003 05:38:34 -0000 1.15
--- list_icals.php 20 Sep 2003 00:16:05 -0000 1.16
***************
*** 39,46 ****
// option to open all (non-web) calenders together
! if ($cal == 'all_calenders_combined971') {
! print "<option value=\"$current_view.php?cal=all_calenders_combined971\" selected>$all_cal_comb_lang</option>";
} else {
! print "<option value=\"$current_view.php?cal=all_calenders_combined971\">$all_cal_comb_lang</option>";
}
--- 39,46 ----
// option to open all (non-web) calenders together
! if ($cal == $ALL_CALENDARS_COMBINED) {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>";
} else {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
}
|