diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-12 06:22:57 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2008-12-12 06:22:57 +0000 |
| commit | f624f9143722a6e32f702f6e75f24ae457f85d8c (patch) | |
| tree | 01632d35bb38e6602e5a4ecd00bebe2fb45855a6 /functions/init.inc.php | |
| parent | 2fb022abbfa5eeac033992841ca11d9642bc4508 (diff) | |
| download | phpicalendar-f624f9143722a6e32f702f6e75f24ae457f85d8c.tar.gz phpicalendar-f624f9143722a6e32f702f6e75f24ae457f85d8c.tar.bz2 phpicalendar-f624f9143722a6e32f702f6e75f24ae457f85d8c.zip | |
misc changes for new config model
Diffstat (limited to 'functions/init.inc.php')
| -rw-r--r-- | functions/init.inc.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/functions/init.inc.php b/functions/init.inc.php index fee5d72..0b9f77b 100644 --- a/functions/init.inc.php +++ b/functions/init.inc.php @@ -149,13 +149,13 @@ if (count($local_cals) > 0) { $add_cpath = ''; if (isset($cpath) && $cpath !='') $add_cpath = "$cpath/"; - if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { + if (($phpiCal_config->download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'.$filename; $download_filename = $filename; - } elseif ($download_uri != '') { - $newurl = eregi_replace("^(http://)", "", $download_uri); + } elseif ($phpiCal_config->download_uri != '') { + $newurl = eregi_replace("^(http://)", "", $phpiCal_config->download_uri); $subscribe_path = 'webcal://'.$newurl.'/'.$add_cpath.basename($filename); - $download_filename = $download_uri.'/'.$add_cpath.basename($filename); + $download_filename = $phpiCal_config->download_uri.'/'.$add_cpath.basename($filename); } else { $subscribe_path = $add_cpath; $download_filename = $add_cpath; |