aboutsummaryrefslogtreecommitdiffstats
path: root/preferences.php
diff options
context:
space:
mode:
authorJim Hu <jimhu@users.sourceforge.net>2008-12-28 19:30:41 +0000
committerJim Hu <jimhu@users.sourceforge.net>2008-12-28 19:30:41 +0000
commitd482264b6af8598ce50677ac6a8f781e219b7d6f (patch)
tree5bff034467e4ed8e1b1fe442c7de643f112da7f7 /preferences.php
parentfc3e1a8590046c858b2ddebdf6c43df8240e9a97 (diff)
downloadphpicalendar-d482264b6af8598ce50677ac6a8f781e219b7d6f.tar.gz
phpicalendar-d482264b6af8598ce50677ac6a8f781e219b7d6f.tar.bz2
phpicalendar-d482264b6af8598ce50677ac6a8f781e219b7d6f.zip
fix misc bugs; rewrite some places where warnings squelched with @; require php5.1 or greater
Diffstat (limited to 'preferences.php')
-rw-r--r--preferences.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/preferences.php b/preferences.php
index 9bcda9c..400f09e 100644
--- a/preferences.php
+++ b/preferences.php
@@ -6,7 +6,7 @@ require_once(BASE.'functions/template.php');
$display_date = $lang['l_preferences'];
if ($phpiCal_config->allow_preferences != 'yes') {
- exit(error('Preferences are not available for this installation.', $cal));
+ exit(error($lang['l_prefs_off'], $cal));
}
$current_view = "preferences";
@@ -30,6 +30,7 @@ if ($action == 'setcookie') {
$cookie_startday = $_POST['cookie_startday'];
$cookie_time = $_POST['cookie_time'];
$cookie_endtime = $_POST['cookie_endtime'];
+ $cookie_timezone = $_POST['cookie_timezone'];
$cookie_unset = @$_POST['unset'];
$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath", "cookie_timezone"=>"$cookie_timezone");
$the_cookie = serialize($the_cookie);
@@ -58,7 +59,7 @@ if (isset($_COOKIE[$cookie_name])) {
$cookie_startday = $phpicalendar['cookie_startday'];
$cookie_time = $phpicalendar['cookie_time'];
$cookie_endtime = $phpicalendar['cookie_endtime'];
- $cookie_endtime = $phpicalendar['cookie_timezone'];
+ $cookie_timezone = $phpicalendar['cookie_timezone'];
if ($cookie_unset) {
unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday);
}
@@ -226,7 +227,7 @@ $page->replace_tags(array(
'cpath' => $cpath,
'cal' => $cal,
'getdate' => $getdate,
- 'calendar_name' => $calendar_name,
+ 'calendar_name' => $cal_displayname,
'display_date' => $display_date,
'rss_powered' => $rss_powered,
'rss_available' => '',

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