aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorChad Little <clittle@users.sourceforge.net>2004-01-26 22:50:47 +0000
committerChad Little <clittle@users.sourceforge.net>2004-01-26 22:50:47 +0000
commitb1b0bb48e861325551b48be4001de5f9cf1ff852 (patch)
tree84ba6bd6ca6141fd3522e2a59e2384de18fc7e79 /includes
parent5c5eed1390a103fecc2c57c21bbf79365cb1ee98 (diff)
downloadphpicalendar-b1b0bb48e861325551b48be4001de5f9cf1ff852.tar.gz
phpicalendar-b1b0bb48e861325551b48be4001de5f9cf1ff852.tar.bz2
phpicalendar-b1b0bb48e861325551b48be4001de5f9cf1ff852.zip
More templating.
Diffstat (limited to 'includes')
-rw-r--r--includes/event.php4
-rw-r--r--includes/todo.php47
2 files changed, 20 insertions, 31 deletions
diff --git a/includes/event.php b/includes/event.php
index ec94749..3caad2f 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -2,7 +2,6 @@
define('BASE', '../');
include_once(BASE.'functions/init.inc.php');
require_once(BASE.'functions/template.php');
-error_reporting(E_ALL);
function decode_popup ($item) {
$item = stripslashes(rawurldecode($item));
@@ -76,8 +75,7 @@ $page->replace_tags(array(
'location' => $location,
'sheet_href' => $sheet_href,
'cal_title_full' => $cal_title_full,
- 'base' => BASE,
- 'template' => $template
+ 'template' => $template,
));
diff --git a/includes/todo.php b/includes/todo.php
index b4cefbd..d9933d7 100644
--- a/includes/todo.php
+++ b/includes/todo.php
@@ -3,6 +3,7 @@
define('BASE', '../');
include_once(BASE.'functions/init.inc.php');
include_once(BASE.'functions/date_functions.php');
+require_once(BASE.'functions/template.php');
$vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
@@ -19,7 +20,6 @@ $priority = (isset($vtodo_array['priority'])) ? $vtodo_array['priority'] : (''
$cal_title_full = $calendar_name.' '.$calendar_lang;
$description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description);
$vtodo_text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text);
-$sheet_href = BASE.'styles/'.$style_sheet.'/default.css';
if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
@@ -48,34 +48,25 @@ if ($priority != '') $display .= $priority_lang.' '.$priority.'<br>';
if ($start_date != '') $display .= $created_lang.' '.$start_date.'<br>';
if ($due_date != '') $display .= $due_lang.' '.$due_date.'<br>';
-echo <<<END
+$page = new Page(BASE.'templates/'.$template.'/todo.tpl');
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
- <html>
- <head>
- <meta http-equiv="content-type" content="text/html;charset=UTF-8">
- <title>{$calendar_name}</title>
- <link rel="stylesheet" type="text/css" href="{$sheet_href}">
- </head>
- <body>
- <center>
- <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
- <tr>
- <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$cal_title_full}</div></td>
- </tr>
- <tr>
- <td align="left" class="V12">
- <div style="margin-left: 10px; margin-bottom:10px;">
- <p>{$display}</p>
- </div>
- </td>
- </tr>
- </table>
- </center>
- </body>
- </html>
+$page->replace_tags(array(
+ 'cal' => $cal_title_full,
+ 'vtodo_text' => $vtodo_text,
+ 'description' => $description,
+ 'priority_lang' => $priority_lang,
+ 'priority' => $priority,
+ 'created_lang' => $created_lang,
+ 'start_date' => $start_date,
+ 'status_lang' => $status_lang,
+ 'status' => $status,
+ 'due_lang' => $due_lang,
+ 'due_date' => $due_date,
+ 'cal_title_full' => $cal_title_full,
+ 'template' => $template
+
+ ));
-END;
+$page->output();
?> \ No newline at end of file

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