aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hu <jimhu@users.sourceforge.net>2008-12-20 00:33:14 +0000
committerJim Hu <jimhu@users.sourceforge.net>2008-12-20 00:33:14 +0000
commit9cc4b1667897ac0e9db28044d96e7b96a7ac38e5 (patch)
tree9ba349e112a4a242a04b895ea69ab7b349018402
parentedd9a9fd1a3451f7868400fcf9d2ebe0cf563c51 (diff)
downloadphpicalendar-9cc4b1667897ac0e9db28044d96e7b96a7ac38e5.zip
phpicalendar-9cc4b1667897ac0e9db28044d96e7b96a7ac38e5.tar.gz
phpicalendar-9cc4b1667897ac0e9db28044d96e7b96a7ac38e5.tar.bz2
misc minor fixes
-rw-r--r--day.php4
-rw-r--r--functions/init/date_range.php2
-rw-r--r--functions/list_functions.php4
-rw-r--r--functions/parse/parse_tzs.php8
-rw-r--r--print.php20
-rw-r--r--templates/default/header.tpl2
-rw-r--r--templates/green/header.tpl6
-rw-r--r--templates/grey/header.tpl6
-rw-r--r--templates/red/header.tpl6
-rw-r--r--templates/tan/header.tpl6
-rw-r--r--week.php2
11 files changed, 41 insertions, 25 deletions
diff --git a/day.php b/day.php
index 7ed31ea..932b6c1 100644
--- a/day.php
+++ b/day.php
@@ -19,7 +19,7 @@ if ($phpiCal_config->minical_view == 'current') $minical_view = 'day';
$weekstart = 1;
$unix_time = strtotime($getdate);
-$today_today = date('Ymd', time() + $second_offset);
+$today_today = date('Ymd', time() + $phpiCal_config->second_offset);
$next_day = date('Ymd', strtotime("+1 day", $unix_time));
$prev_day = date('Ymd', strtotime("-1 day", $unix_time));
@@ -86,7 +86,7 @@ $page->replace_tags(array(
'list_weeks' => $list_weeks,
'list_jumps' => $list_jumps,
'legend' => $list_calcolors,
- 'style_select' => $style_select,
+ 'style_select' => @$style_select,
'l_goprint' => $lang['l_goprint'],
'l_preferences' => $lang['l_preferences'],
'l_calendar' => $lang['l_calendar'],
diff --git a/functions/init/date_range.php b/functions/init/date_range.php
index 78b0db5..d7e4235 100644
--- a/functions/init/date_range.php
+++ b/functions/init/date_range.php
@@ -3,7 +3,7 @@ if (!isset($getdate)) {
if (isset($_GET['getdate']) && ($_GET['getdate'] !== '')) {
$getdate = $_GET['getdate'];
} else {
- $getdate = date('Ymd', time() + $second_offset);
+ $getdate = date('Ymd', time() + $phpIcal_config->second_offset);
}
}
diff --git a/functions/list_functions.php b/functions/list_functions.php
index 0ec2474..2775059 100644
--- a/functions/list_functions.php
+++ b/functions/list_functions.php
@@ -1,9 +1,9 @@
<?php
function list_jumps() {
- global $second_offset, $lang, $cal;
+ global $phpiCal_config, $lang, $cal;
$calName = join(',', array_map("getCalendarName", split(',', $cal)));
- $today = date('Ymd', time() + $second_offset);
+ $today = date('Ymd', time() + $phpiCal_config->second_offset);
$return = '<option value="#">'.$lang['l_jump'].'</option>';
$return .= '<option value="day.php?cal='.$calName.'&amp;getdate='.$today.'">'.$lang['l_goday'].'</option>';
$return .= '<option value="week.php?cal='.$calName.'&amp;getdate='.$today.'">'.$lang['l_goweek'].'</option>';
diff --git a/functions/parse/parse_tzs.php b/functions/parse/parse_tzs.php
index daafe33..c431d29 100644
--- a/functions/parse/parse_tzs.php
+++ b/functions/parse/parse_tzs.php
@@ -46,10 +46,10 @@ while (!feof($ifile)) {
$tz_array[$tz_id] = array(
0 => $offset_s,
1 => $offset_d,
- 'dt_start' => $begin_daylight,
- 'st_start' => $begin_std,
- 'st_name' => $st_name,
- 'dt_name' => $dt_name
+ 'dt_start' => @$begin_daylight,
+ 'st_start' => @$begin_std,
+ 'st_name' => @$st_name,
+ 'dt_name' => @$dt_name
); #echo "<pre>$tz_id"; print_r($tz_array[$tz_id]);echo"</pre>";
break;
diff --git a/print.php b/print.php
index 3880cd2..804bfe5 100644
--- a/print.php
+++ b/print.php
@@ -47,22 +47,22 @@ header("Content-Type: text/html; charset=$charset");
$page = new Page(BASE.'templates/'.$template.'/print.tpl');
$page->replace_files(array(
- 'header' => BASE.'templates/'.$template.'/header.tpl',
- 'footer' => BASE.'templates/'.$template.'/footer.tpl',
- 'sidebar' => BASE.'templates/'.$template.'/sidebar.tpl'
+ 'header' => BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
+ 'footer' => BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
+ 'sidebar' => BASE.'templates/'.$phpiCal_config->template.'/sidebar.tpl'
));
$page->replace_tags(array(
- 'version' => $phpicalendar_version,
+ 'version' => $phpiCal_config->phpicalendar_version,
'event_js' => '',
- 'charset' => $charset,
- 'default_path' => '',
- 'template' => $template,
+ 'charset' => $phpiCal_config->charset,
+ 'default_path' => $phpiCal_config->default_path,
+ 'template' => $phpiCal_config->template,
'cal' => $cal,
'getdate' => $getdate,
'calendar_name' => $cal_displayname,
'current_view' => $current_view,
- 'printview' => $printview,
+ 'printview' => $printview,
'display_date' => $display_date,
'sidebar_date' => $sidebar_date,
'rss_powered' => $rss_powered,
@@ -79,7 +79,7 @@ $page->replace_tags(array(
'list_weeks' => $list_weeks,
'list_jumps' => $list_jumps,
'legend' => $list_calcolors,
- 'style_select' => $style_select,
+ 'style_select' => @$style_select,
'l_time' => $lang['l_time'],
'l_summary' => $lang['l_summary'],
'l_description' => $lang['l_description'],
@@ -88,7 +88,7 @@ $page->replace_tags(array(
'l_week' => $lang['l_week'],
'l_month' => $lang['l_month'],
'l_year' => $lang['l_year'],
- 'l_location' => $lang['l_location'],
+ 'l_location' => $lang['l_location'],
'l_subscribe' => $lang['l_subscribe'],
'l_download' => $lang['l_download'],
'l_no_results' => $lang['l_no_results'],
diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index 884b5fc..d8e07dc 100644
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
- <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
+ <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
<!-- switch rss_available on -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
<!-- switch rss_available off -->
diff --git a/templates/green/header.tpl b/templates/green/header.tpl
index 07837a9..d8e07dc 100644
--- a/templates/green/header.tpl
+++ b/templates/green/header.tpl
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
- <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
+ <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
<!-- switch rss_available on -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
<!-- switch rss_available off -->
@@ -18,3 +18,7 @@
<input type="hidden" name="cpath" id="cpath" value="" />
<input type="hidden" name="event_data" id="event_data" value="" />
</form>
+<form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+ <input type="hidden" name="todo_data" id="todo_data" value="" />
+ <input type="hidden" name="todo_text" id="todo_text" value="" />
+</form>
diff --git a/templates/grey/header.tpl b/templates/grey/header.tpl
index 07837a9..d8e07dc 100644
--- a/templates/grey/header.tpl
+++ b/templates/grey/header.tpl
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
- <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
+ <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
<!-- switch rss_available on -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
<!-- switch rss_available off -->
@@ -18,3 +18,7 @@
<input type="hidden" name="cpath" id="cpath" value="" />
<input type="hidden" name="event_data" id="event_data" value="" />
</form>
+<form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+ <input type="hidden" name="todo_data" id="todo_data" value="" />
+ <input type="hidden" name="todo_text" id="todo_text" value="" />
+</form>
diff --git a/templates/red/header.tpl b/templates/red/header.tpl
index 07837a9..d8e07dc 100644
--- a/templates/red/header.tpl
+++ b/templates/red/header.tpl
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
- <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
+ <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
<!-- switch rss_available on -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
<!-- switch rss_available off -->
@@ -18,3 +18,7 @@
<input type="hidden" name="cpath" id="cpath" value="" />
<input type="hidden" name="event_data" id="event_data" value="" />
</form>
+<form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+ <input type="hidden" name="todo_data" id="todo_data" value="" />
+ <input type="hidden" name="todo_text" id="todo_text" value="" />
+</form>
diff --git a/templates/tan/header.tpl b/templates/tan/header.tpl
index 07837a9..d8e07dc 100644
--- a/templates/tan/header.tpl
+++ b/templates/tan/header.tpl
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
- <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
+ <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
<!-- switch rss_available on -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
<!-- switch rss_available off -->
@@ -18,3 +18,7 @@
<input type="hidden" name="cpath" id="cpath" value="" />
<input type="hidden" name="event_data" id="event_data" value="" />
</form>
+<form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+ <input type="hidden" name="todo_data" id="todo_data" value="" />
+ <input type="hidden" name="todo_text" id="todo_text" value="" />
+</form>
diff --git a/week.php b/week.php
index 1807eb7..4f9ddbd 100644
--- a/week.php
+++ b/week.php
@@ -10,7 +10,7 @@ if ($phpiCal_config->minical_view == "current") $minical_view = "week";
$starttime = "0500";
$weekstart = 1;
$unix_time = strtotime($getdate);
-$today_today = date('Ymd', time() + $second_offset);
+$today_today = date('Ymd', time() + $phpiCal_config->second_offset);
$next_week = date("Ymd", strtotime("+1 week", $unix_time));
$prev_week = date("Ymd", strtotime("-1 week", $unix_time));
$next_day = date('Ymd', strtotime("+1 day", $unix_time));

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