I think these are actually working now, except for weather

This commit is contained in:
Miles Lott 2001-06-29 01:17:32 +00:00
parent 9e643099ec
commit cdd707d2ea
2 changed files with 4 additions and 12 deletions

View File

@ -19,9 +19,6 @@
} }
unset($d1); unset($d1);
$tmp_app_inc = PHPGW_APP_INC;
define('PHPGW_APP_INC',$phpgw->common->get_inc_dir('addressbook'));
if ($phpgw_info['user']['apps']['addressbook'] if ($phpgw_info['user']['apps']['addressbook']
&& $phpgw_info['user']['preferences']['addressbook']['mainscreen_showbirthdays']) && $phpgw_info['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
{ {
@ -59,6 +56,4 @@
} }
echo "\n<!-- Birthday info -->\n"; echo "\n<!-- Birthday info -->\n";
} }
define('PHPGW_APP_INC',$tmp_app_inc);
?> ?>

View File

@ -22,13 +22,12 @@
} }
unset($d1); unset($d1);
$tmp_app_inc = PHPGW_APP_INC; $tmp_app_inc = $phpgw->common->get_inc_dir('calendar');
define('PHPGW_APP_INC',$phpgw->common->get_inc_dir('calendar'));
if ($phpgw_info['user']['preferences']['calendar']['mainscreen_showevents']) if ($phpgw_info['user']['preferences']['calendar']['mainscreen_showevents'])
{ {
include(PHPGW_APP_INC . '/functions.inc.php'); include($tmp_app_inc . '/functions.inc.php');
echo "\n".'<tr valign="top"><td><table border="0" cols="3"><tr><td align="center" width="35%" valign="top"><!-- Calendar info -->'."\n"; echo "\n".'<tr valign="top"><td><table border="0" cols="3"><tr><td align="center" width="35%" valign="top"><!-- BEGIN Calendar info -->'."\n";
echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"],"day.php").'</td><td align="center">'; echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"],"day.php").'</td><td align="center">';
echo '<table border="0" width="100%" cellspacing="0" cellpadding="0"><tr><td align="center">' echo '<table border="0" width="100%" cellspacing="0" cellpadding="0"><tr><td align="center">'
. lang(date("F",$phpgw->calendar->today["raw"])).' '.$phpgw->calendar->today["day"].', '.$phpgw->calendar->today["year"].'</tr></td>' . lang(date("F",$phpgw->calendar->today["raw"])).' '.$phpgw->calendar->today["day"].', '.$phpgw->calendar->today["year"].'</tr></td>'
@ -38,9 +37,7 @@
$now['raw'] += $phpgw->calendar->datetime->tz_offset; $now['raw'] += $phpgw->calendar->datetime->tz_offset;
echo $phpgw->calendar->print_day_at_a_glance($now).'</td></tr></table>'."\n"; echo $phpgw->calendar->print_day_at_a_glance($now).'</td></tr></table>'."\n";
// $phpgw->calendar->printer_friendly = False; // $phpgw->calendar->printer_friendly = False;
echo "\n".'<!-- Calendar info --></table></td></tr>'."\n"; echo "\n".'<!-- END Calendar info --></table></td></tr>'."\n";
unset($phpgw->calendar); unset($phpgw->calendar);
} }
define('PHPGW_APP_INC',$tmp_app_inc);
?> ?>