diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-28 11:55:43 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-28 11:55:43 +0000 |
| commit | 6bdbb8f7ae793f146d98fdf63e7e037f37847bed (patch) | |
| tree | e71be26962a946afd072de5aae0b5a44cf8ef792 /functions/calendar_functions.php | |
| parent | 19b3d5225182fa112d0d17ef12e38bebcea41138 (diff) | |
| download | phpicalendar-6bdbb8f7ae793f146d98fdf63e7e037f37847bed.tar.gz phpicalendar-6bdbb8f7ae793f146d98fdf63e7e037f37847bed.tar.bz2 phpicalendar-6bdbb8f7ae793f146d98fdf63e7e037f37847bed.zip | |
obfuscate list_webcals links to hide user:pass (bug 1819552)
Diffstat (limited to 'functions/calendar_functions.php')
| -rw-r--r-- | functions/calendar_functions.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/functions/calendar_functions.php b/functions/calendar_functions.php index 48bc9ba..8f02bd7 100644 --- a/functions/calendar_functions.php +++ b/functions/calendar_functions.php @@ -184,7 +184,7 @@ function getCalendarName($cal_path) { // // $cals = The calendars (entire path, e.g. from availableCalendars). function display_ical_list($cals, $pick=FALSE) { - global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $phpiCal_config; + global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $list_webcals, $phpiCal_config; // Print each calendar option. $return = ''; foreach ($cals as $cal_tmp) { @@ -193,15 +193,15 @@ function display_ical_list($cals, $pick=FALSE) { // Only display the calendar name, replace all instances of "32" with " ", // and remove the .ics suffix. $cal_displayname_tmp = getCalendarName($cal_tmp); - $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); + #$cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); #overwrite the display name if we already have a real name if (is_numeric(array_search($cal_tmp, $cal_filelist))){ $cal_displayname_tmp = $cal_displaynames[array_search($cal_tmp,$cal_filelist)]; }else{ # pull the name from the $cal_tmp file - $cal_tmp = str_replace('webcal://','http://',$cal_tmp); + $cal_tmp2 = str_replace('webcal://','http://',$cal_tmp); - $ifile = @fopen($cal_tmp, "r"); + $ifile = @fopen($cal_tmp2, "r"); if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); while (!feof($ifile)) { $line = fgets($ifile, 1024); @@ -241,7 +241,9 @@ function display_ical_list($cals, $pick=FALSE) { // Encode the calendar path. $cal_encoded_tmp = urlencode($cal_tmp); - + if(in_array($cal_tmp, $list_webcals)){ + $cal_encoded_tmp = md5($phpiCal_config->salt.$cal_tmp);; + } // Display the option. // // The submitted calendar will be encoded, and always use http:// |