aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hu <jimhu@users.sourceforge.net>2009-01-07 20:20:03 +0000
committerJim Hu <jimhu@users.sourceforge.net>2009-01-07 20:20:03 +0000
commit73d433f17d349cb2a3c8084d4ac5cecf650afb04 (patch)
tree0650f3e780f4a21de2c085827e51db3659ff8f47
parent2434deaf0d0dc46a0deebd523f5bb2c3204bbc9a (diff)
downloadphpicalendar-73d433f17d349cb2a3c8084d4ac5cecf650afb04.zip
phpicalendar-73d433f17d349cb2a3c8084d4ac5cecf650afb04.tar.gz
phpicalendar-73d433f17d349cb2a3c8084d4ac5cecf650afb04.tar.bz2
timeformat serialization needed urlencode/decode?
-rw-r--r--default_config.php1
-rw-r--r--functions/date_functions.php2
-rw-r--r--functions/init/configs.php14
-rw-r--r--month.php2
-rw-r--r--preferences.php2
5 files changed, 11 insertions, 10 deletions
diff --git a/default_config.php b/default_config.php
index b345163..e46d13a 100644
--- a/default_config.php
+++ b/default_config.php
@@ -14,7 +14,6 @@ class Configs{
$this->default_view = 'day'; // Default view for calendars = 'day', 'week', 'month', 'year'
$this->minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
$this->default_cal = $this->ALL_CALENDARS_COMBINED; // Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
- #$this->default_cal = 'Other_racing'; // Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
$this->language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
$this->week_start_day = 'Sunday'; // Day of the week your week starts on
$this->week_length = '7'; // Number of days to display in the week view
diff --git a/functions/date_functions.php b/functions/date_functions.php
index 931e613..74e428e 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -98,6 +98,7 @@ function localizeDate($format, $timestamp) {
$month = date("n", $timestamp)-1;
$day = date("j", $timestamp);
$dayofweek = date("w", $timestamp);
+ $weeknumber = date("W", $timestamp);
$replacements = array(
'%Y' => $year,
'%e' => $day,
@@ -105,6 +106,7 @@ function localizeDate($format, $timestamp) {
'%b' => $monthsofyearshort_lang[$month],
'%A' => $daysofweek_lang[$dayofweek],
'%a' => $daysofweekshort_lang[$dayofweek],
+ '%W' => $weeknumber,
'%d' => sprintf("%02d", $day)
);
$date = str_replace(array_keys($replacements), array_values($replacements), $format);
diff --git a/functions/init/configs.php b/functions/init/configs.php
index d441168..c73688f 100644
--- a/functions/init/configs.php
+++ b/functions/init/configs.php
@@ -40,7 +40,7 @@ if (isset($_COOKIE[$cookie_name]) && !isset($_POST['unset']) && $current_view !=
}
if (isset($phpicalendar['cookie_startday'])) $phpiCal_config->setProperty('week_start_day', $phpicalendar['cookie_startday']);
if (isset($phpicalendar['cookie_time'])) $phpiCal_config->setProperty('day_start', $phpicalendar['cookie_time']);
- if (isset($phpicalendar['cookie_endtime'])) $phpiCal_config->setProperty('day_end', $phpicalendar['cookie_endtime']);
+ if (isset($phpicalendar['cookie_endtime'])) $phpiCal_config->setProperty('day_end', $phpicalendar['cookie_endtime']);
if (isset($phpicalendar['cookie_timezone'])) $phpiCal_config->setProperty('timezone', $phpicalendar['cookie_timezone']);
}
@@ -55,7 +55,7 @@ if (is_file($lang_file)) {
}
if (isset($phpicalendar['cookie_timeformat']) && $phpicalendar['cookie_timeformat'] !=''){
- $timeFormat = $phpicalendar['cookie_timeformat'];
+ $timeFormat = urldecode($phpicalendar['cookie_timeformat']);
switch($timeFormat){
case 'h:i':
case 'h:i A':
@@ -89,11 +89,11 @@ while ($fillTime < $phpiCal_config->day_end) {
}
if (!isset($current_view)) $current_view = $phpiCal_config->default_view;
-
+/*
$tz_array=array();
-#echo "<pre>xx";
+echo "<pre>xx";
#print_r($configs);
-#print_r($phpicalendar);
-#print_r($phpiCal_config);
-#echo "</pre>";
+print_r($phpiCal_config);
+echo "</pre>";
#die;
+*/ \ No newline at end of file
diff --git a/month.php b/month.php
index 9aec865..cb4509c 100644
--- a/month.php
+++ b/month.php
@@ -85,7 +85,7 @@ $page->replace_tags(array(
'is_logged_in' => $is_logged_in,
'username' => $username,
'logout_querys' => $logout_querys,
- 'list_jumps' => $list_jumps,
+# 'list_jumps' => $list_jumps,
'list_icals' => $list_icals,
'list_icals_pick' => $list_icals_pick,
'list_years' => $list_years,
diff --git a/preferences.php b/preferences.php
index ad7e015..8d590ce 100644
--- a/preferences.php
+++ b/preferences.php
@@ -159,7 +159,7 @@ $timeformat_arr = array(
$example_time = strtotime("19700101 08:00:00");
foreach ($timeformat_arr as $i => $s) {
$s = date($timeformat_arr[$i], $example_time)."/".date($timeformat_arr[$i], ($example_time + 12*60*60));
- $timeformat_select .= '<option value="'.$timeformat_arr[$i].'"';
+ $timeformat_select .= '<option value="'.urlencode($timeformat_arr[$i]).'"';
if ($timeformat_arr[$i] == $cookie_timeformat) {
$timeformat_select .= ' selected="selected"';
}

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