X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fcalendar%2Fday.php;h=7fe61b3dd4bf45bec8886464b03918d9aa974fb2;hp=44d60447772660dbcedb09b9dba429a7c69d075f;hb=b01b21d00c21c47620a86a8412918b287676eca7;hpb=d61a01d48fa9d58a7fdd5a99e7943b7dcaa94178
diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index 44d60447..7fe61b3d 100644
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -7,7 +7,7 @@
*
* Displays the day page (day view).
*
- * 18 Jan 2002 Adapted to official SM rules philippe@squirrelmail.org.
+ * $Id$
*/
require_once('calendar_data.php');
@@ -19,20 +19,28 @@ require_once('../functions/date.php');
require_once('../config/config.php');
require_once('../functions/page_header.php');
require_once('../src/load_prefs.php');
+require_once('../functions/html.php');
//displays head of day calendar view
function day_header() {
global $color, $month, $day, $year, $prev_year, $prev_month, $prev_day,
$prev_date, $next_month, $next_day, $next_year, $next_date;
- echo "
" .
- " \n" .
- " < ".
- date_intl('D',$prev_date)." | \n" .
- " " .
- date_intl( 'l, F d Y', mktime(0, 0, 0, $month, $day, $year)) . " | \n" .
- " ".
- date_intl('D',$next_date)." > | \n";
+ echo html_tag( 'tr', '', '', $color[0] ) . "\n".
+ html_tag( 'td', '', 'left' ) .
+ html_tag( 'table', '', '', $color[0], 'width="100%" border="0" cellpadding="2" cellspacing="1"' ) ."\n" .
+ html_tag( 'tr',
+ html_tag( 'th',
+ "< ".
+ date_intl('D',$prev_date)."",
+ 'left' ) .
+ html_tag( 'th', date_intl( 'l, F d Y', mktime(0, 0, 0, $month, $day, $year)) ,
+ '', '', 'width="75%"' ) .
+ html_tag( 'th',
+ "".
+ date_intl('D',$next_date)." >" ,
+ 'right' )
+ );
}
//events for specific day are inserted into "daily" array
@@ -52,7 +60,7 @@ function initialize_events() {
if (isset($calendardata[$cdate])){
while ( $calfoo = each($calendardata[$cdate])){
- $daily_events["$calfoo[key]"] = $calendardata[$cdate][$calfoo[key]];
+ $daily_events["$calfoo[key]"] = $calendardata[$cdate][$calfoo['key']];
}
}
}
@@ -70,32 +78,39 @@ function display_events() {
$eo=0;
}
- $ehour = substr($calfoo[key],0,2);
- $eminute = substr($calfoo[key],2,2);
- if (!is_array($calfoo[value])){
- echo " $ehour:$eminute | \n" .
- " | \n" .
- " ".
- _("ADD") . " | \n";
+ $ehour = substr($calfoo['key'],0,2);
+ $eminute = substr($calfoo['key'],2,2);
+ if (!is_array($calfoo['value'])){
+ echo html_tag( 'tr',
+ html_tag( 'td', $ehour . ':' . $eminute, 'left' ) .
+ html_tag( 'td', ' ', 'left' ) .
+ html_tag( 'td',
+ "".
+ _("ADD") . "" ,
+ 'center' ) ,
+ '', $color[$eo]);
+
} else {
- $calbar=$calfoo[value];
- if ($calbar[length]!=0){
- $elength = '-'.date('H:i',mktime($ehour,$eminute+$calbar[length],0,1,1,0));
+ $calbar=$calfoo['value'];
+ if ($calbar['length']!=0){
+ $elength = '-'.date('H:i',mktime($ehour,$eminute+$calbar['length'],0,1,1,0));
} else {
$elength='';
}
- echo " $ehour:$eminute$elength | \n" .
- " [";
- echo ($calbar[priority]==1) ? "$calbar[title]" : "$calbar[title]";
- echo"] $calbar[message] | \n" .
- " \n" .
- "".
- _("EDIT") . " | \n" .
- "" .
- _("DEL") . '' .
- " | \n";
+ echo html_tag( 'tr', '', '', $color[$eo] ) .
+ html_tag( 'td', $ehour . ':' . $eminute . $elength, 'left' ) .
+ html_tag( 'td', '', 'left' ) . '[';
+ echo ($calbar['priority']==1) ? "$calbar[title]" : "$calbar[title]";
+ echo"] $calbar[message] " .
+ html_tag( 'td',
+ "\n" .
+ "".
+ _("EDIT") . " | \n" .
+ "" .
+ _("DEL") . '' .
+ "\n" ,
+ 'center' );
}
- $i++;
}
@@ -130,8 +145,6 @@ readcalendardata();
day_header();
initialize_events();
display_events();
-
-
?>
|