stuart: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.1.1.1, 1.2 week.php, 1.1.1.1, 1.2 workweek.php, 1.1.1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Fri Jul 16 00:08:07 CEST 2004
Author: stuart
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv12329/kronolith/lib/FBView
Modified Files:
day.php week.php workweek.php
Log Message:
Updated the free/busy viewer to use the new XML data format
Added support to show the event title on busy blocks, making them a bit more descriptive
Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- day.php 11 Jun 2004 10:52:08 -0000 1.1.1.1
+++ day.php 15 Jul 2004 22:08:05 -0000 1.2
@@ -19,7 +19,6 @@
function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
{
$template = &new Horde_Template();
- $template->set('label', $label);
$count = 0;
$blocks = '';
@@ -33,9 +32,15 @@
$template->set('width', min($width, 100 - $left) );
$template->set('top', $count++ * 15);
$template->set('evclick', '');
- if (array_key_exists($start, $extra) && array_key_exists('X-UID', $extra[$start])) {
- $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
- $template->set('evclick', $link);
+ $template->set('label', '');
+ if (isset($extra[$start])) {
+ if (!empty($extra[$start]['X-UID'])) {
+ $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
+ $template->set('evclick', $link);
+ }
+ if (!empty($extra[$start]['X-SUMMARY'])) {
+ $template->set('label', base64_decode($extra[$start]['X-SUMMARY']));
+ }
}
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
}
Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- week.php 11 Jun 2004 10:52:09 -0000 1.1.1.1
+++ week.php 15 Jul 2004 22:08:05 -0000 1.2
@@ -176,7 +176,6 @@
function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
{
$template = &new Horde_Template();
- $template->set('label', '');
$count = 0;
$blocks = '';
@@ -216,9 +215,15 @@
$template->set('top', $count++ * 15);
$template->set('label', $label);
$template->set('evclick', '');
- if (array_key_exists($start, $extra) && array_key_exists('X-UID', $extra[$start])) {
- $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
- $template->set('evclick', $link);
+ $template->set('label', '');
+ if (isset($extra[$start])) {
+ if (!empty($extra[$start]['X-UID'])) {
+ $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
+ $template->set('evclick', $link);
+ }
+ if (!empty($extra[$start]['X-SUMMARY'])) {
+ $template->set('label', base64_decode($extra[$start]['X-SUMMARY']));
+ }
}
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
}
Index: workweek.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- workweek.php 11 Jun 2004 10:52:09 -0000 1.1.1.1
+++ workweek.php 15 Jul 2004 22:08:05 -0000 1.2
@@ -175,7 +175,6 @@
function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
{
$template = &new Horde_Template();
- $template->set('label', '');
$count = 0;
$blocks = '';
@@ -213,9 +212,15 @@
$template->set('top', $count++ * 15);
$template->set('label', $label);
$template->set('evclick', '');
- if (array_key_exists($start, $extra) && array_key_exists('X-UID', $extra[$start])) {
- $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
- $template->set('evclick', $link);
+ $template->set('label', '');
+ if (isset($extra[$start])) {
+ if (!empty($extra[$start]['X-UID'])) {
+ $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
+ $template->set('evclick', $link);
+ }
+ if (!empty($extra[$start]['X-SUMMARY'])) {
+ $template->set('label', base64_decode($extra[$start]['X-SUMMARY']));
+ }
}
$blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
}
More information about the commits
mailing list