gunnar: server/patches/horde/3.2-rc3/fbview-kronolith HK-GW-Config_fbview-kronolith-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch, NONE, 1.1 HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch, NONE, 1.1 HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch, NONE, 1.1 HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch, NONE, 1.1

cvs at kolab.org cvs at kolab.org
Thu Mar 13 16:37:27 CET 2008


Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith
In directory doto:/tmp/cvs-serv17251/fbview-kronolith

Added Files:
	HK-GW-Config_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch 
	HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch 
	HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_fbview-kronolith-3.2-rc3.patch ---
diff -r 36e1ed9ebc99 fbview-kronolith/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/config/conf.php	Wed Feb 20 17:30:39 2008 +0100
@@ -0,0 +1,20 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+$conf['calendar']['driver'] = 'kolab';
+$conf['storage']['default_domain'] = '';
+$conf['storage']['freebusy']['protocol'] = 'https';
+$conf['storage']['freebusy']['port'] = 443;
+$conf['storage']['driver'] = 'kolab';
+$conf['metadata']['keywords'] = false;
+$conf['reminder']['server_name'] = '';
+$conf['reminder']['from_addr'] = '';
+$conf['autoshare']['shareperms'] = 'none';
+$conf['holidays']['enable'] = true;
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 36e1ed9ebc99 fbview-kronolith/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/config/kolab.php	Wed Feb 20 17:30:39 2008 +0100
@@ -0,0 +1,5 @@
+<?php
+$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
+$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
+$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
+?>
diff -r 36e1ed9ebc99 fbview-kronolith/config/prefs.php.dist
--- a/fbview-kronolith/config/prefs.php.dist	Wed Feb 20 17:28:32 2008 +0100
+++ b/fbview-kronolith/config/prefs.php.dist	Wed Feb 20 17:30:39 2008 +0100
@@ -83,7 +83,7 @@ if ($GLOBALS['registry']->hasMethod('con
 
 // default view
 $_prefs['defaultview'] = array(
-    'value' => 'month',
+    'value' => 'attendees',
     'locked' => false,
     'shared' => false,
     'type' => 'enum',

--- NEW FILE: HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch ---
diff -r 36826ddfc3bd fbview-kronolith/attendees.php
--- a/fbview-kronolith/attendees.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/attendees.php	Thu Feb 21 12:24:52 2008 +0100
@@ -243,6 +243,7 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 
 if ($browser->hasFeature('javascript')) {
     Horde::addScriptFile('open_savedattlist_win.js');
diff -r 36826ddfc3bd fbview-kronolith/calendars/create.php
--- a/fbview-kronolith/calendars/create.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/create.php	Thu Feb 21 12:24:52 2008 +0100
@@ -39,6 +39,6 @@ if ($form->validate($vars)) {
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'create.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/delete.php
--- a/fbview-kronolith/calendars/delete.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/delete.php	Thu Feb 21 12:24:52 2008 +0100
@@ -56,6 +56,6 @@ if ($form->validate(new Variables($_POST
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'delete.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/edit.php
--- a/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:24:52 2008 +0100
@@ -59,6 +59,6 @@ if (isset($params['fbrelevance'])) {
 }
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/index.php
--- a/fbview-kronolith/calendars/index.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/index.php	Thu Feb 21 12:24:52 2008 +0100
@@ -69,6 +69,6 @@ Horde::addScriptFile('tables.js', 'krono
 Horde::addScriptFile('tables.js', 'kronolith', true);
 $title = _("Manage Calendars");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 require KRONOLITH_TEMPLATES . '/calendar_list.php';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_edit.php
--- a/fbview-kronolith/calendars/remote_edit.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_edit.php	Thu Feb 21 12:24:52 2008 +0100
@@ -59,6 +59,6 @@ if ($form->validate($vars)) {
 $vars->set('password', $calendar['password']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_subscribe.php
--- a/fbview-kronolith/calendars/remote_subscribe.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_subscribe.php	Thu Feb 21 12:24:52 2008 +0100
@@ -39,6 +39,6 @@ if ($form->validate($vars)) {
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_subscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_unsubscribe.php
--- a/fbview-kronolith/calendars/remote_unsubscribe.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_unsubscribe.php	Thu Feb 21 12:24:52 2008 +0100
@@ -56,6 +56,6 @@ if ($form->validate(new Variables($_POST
 $vars->set('url', $calendar['url']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_unsubscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/lib/Kronolith.php
--- a/fbview-kronolith/lib/Kronolith.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/lib/Kronolith.php	Thu Feb 21 12:24:52 2008 +0100
@@ -1971,6 +1971,33 @@ class Kronolith {
     }
 
     /**
+     * Builds Kronolith's list of menu items.
+     */
+    function getFbviewMenu($returnType = 'object')
+    {
+        global $conf, $registry, $browser, $prefs;
+
+        /* Check here for guest calendars so that we don't get multiple
+         * messages after redirects, etc. */
+        if (!Auth::getAuth() && !count($GLOBALS['all_calendars'])) {
+            $GLOBALS['notification']->push(_("No calendars are available to guests."));
+        }
+
+        require_once 'Horde/Menu.php';
+        $menu = new Menu(HORDE_MENU_MASK_HELP | HORDE_MENU_MASK_LOGIN);
+
+        $menu->add(Horde::applicationUrl('attendees.php'), _("Attendees"), 'attendees.png', null, null, null, '__noselection');
+
+        $menu->add(Horde::applicationUrl('calendars/'), _("Calendars"), 'calendars.png', null, null, null, '__noselection');
+
+        if ($returnType == 'object') {
+            return $menu;
+        } else {
+            return $menu->render();
+        }
+    }
+
+    /**
      * Used with usort() to sort events based on their start times.
      * This function ignores the date component so recuring events can
      * be sorted correctly on a per day basis.
diff -r 36826ddfc3bd fbview-kronolith/templates/fbview-menu.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/fbview-menu.inc	Thu Feb 21 12:24:52 2008 +0100
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
+</div>
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

--- NEW FILE: HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch ---
Allows to set the free/busy relevance on a calendar.

diff -r e6be25b82291 fbview-kronolith/calendars/edit.php
--- a/fbview-kronolith/calendars/edit.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:22:33 2008 +0100
@@ -53,6 +53,10 @@ if ($form->validate($vars)) {
 
 $vars->set('name', $calendar->get('name'));
 $vars->set('description', $calendar->get('desc'));
+$params = @unserialize($calendar->get('params'));
+if (isset($params['fbrelevance'])) {
+    $vars->set('fbrelevance', $params['fbrelevance']);
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r e6be25b82291 fbview-kronolith/lib/Forms/CreateCalendar.php
--- a/fbview-kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 12:22:33 2008 +0100
@@ -35,6 +35,9 @@ class Kronolith_CreateCalendarForm exten
 
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Create")));
     }
@@ -48,6 +51,7 @@ class Kronolith_CreateCalendarForm exten
         }
         $calendar->set('name', $this->_vars->get('name'));
         $calendar->set('desc', $this->_vars->get('description'));
+        $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
         return $GLOBALS['kronolith_shares']->addShare($calendar);
     }
 
diff -r e6be25b82291 fbview-kronolith/lib/Forms/EditCalendar.php
--- a/fbview-kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 12:22:34 2008 +0100
@@ -42,6 +42,9 @@ class Kronolith_EditCalendarForm extends
         $this->addHidden('', 'c', 'text', true);
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Save")));
     }
@@ -51,6 +54,7 @@ class Kronolith_EditCalendarForm extends
         $original_name = $this->_calendar->get('name');
         $this->_calendar->set('name', $this->_vars->get('name'));
         $this->_calendar->set('desc', $this->_vars->get('description'));
+        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
 
         if ($original_name != $this->_vars->get('name')) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));

--- NEW FILE: HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch ---
diff -r 14457cf2ea2c fbview-kronolith/perms.php
--- a/fbview-kronolith/perms.php	Thu Nov 29 15:20:49 2007 +0100
+++ b/fbview-kronolith/perms.php	Thu Nov 29 15:25:36 2007 +0100
@@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/Group.php';
 
+function &getFbperms($share) 
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        if (isset($params['xfbaccess'])) {
+            $xfbusers = $params['xfbaccess'];
+            foreach ($xfbusers as $user) {
+                $fbperms[$user] = PERMS_READ;
+            }
+        }
+    }
+    return $fbperms;
+}
+
+function setFbperms($share, $xfbusers)
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        $params['xfbaccess'] = $xfbusers;
+        $params = serialize($params);
+        $share->set('params', $params);
+    }
+}
+
 $shares = &Horde_Share::singleton('kronolith');
 $groups = &Group::singleton();
 $auth = &Auth::singleton($conf['auth']['driver']);
@@ -36,6 +64,8 @@ case 'edit':
         $notification->push($share, 'horde.error');
     } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) {
         exit('permission denied');
+    } else {
+        $fbperms = getFbperms($share);
     }
     break;
 
@@ -251,6 +281,24 @@ case 'editform':
             }
         }
 
+        // Process free/busy permissions.
+        $fb_names = Util::getFormData('fb_names');
+        $fb_read = Util::getFormData('fb_read');
+
+        $fbperms = getFbperms($share);
+        foreach ($fb_names as $key => $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            if (!empty($fb_read[$key])) {
+                $fbperms[$user] = PERMS_READ;
+            } else {
+                unset($fbperms[$user]);
+            }
+        }
+        setFbperms($share, array_keys($fbperms));
+
         $share->setPermission($perm, false);
         $share->save();
         $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 14457cf2ea2c fbview-kronolith/templates/perms/perms.inc
--- a/fbview-kronolith/templates/perms/perms.inc	Thu Nov 29 15:20:49 2007 +0100
+++ b/fbview-kronolith/templates/perms/perms.inc	Thu Nov 29 15:25:36 2007 +0100
@@ -355,6 +355,61 @@
   <td> </td>
 </tr>
 
+<!-- Extended free/busy Permissions -->
+<tr valign="middle">
+  <td class="header leftAlign">
+    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Extended free/busy access") ?>
+  </td>
+  <td class="header" align="center"> </td>
+  <td class="header" align="center"><?php echo _("Read") ?></td>
+  <td class="header" align="center"> </td>
+  <td class="header" align="center"> </td>
+  <td class="header" align="center"> </td>
+  <td class="header"> </td>
+</tr>
+<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?>
+<tr>
+  <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
+  <td align="center"> </td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> />
+    <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center"> </td>
+  <td align="center"> </td>
+  <td align="center"> </td>
+  <td> </td>
+</tr>
+<?php } } ?>
+<!-- New extended free/busy row -->
+<tr>
+<?php if ($auth->hasCapability('list')): ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="fb_names_new" name="fb_names[||new]">
+      <option value=""><?php echo _("Select a user to add:") ?></option>
+    <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+    <?php } } ?>
+    </select>
+  </td>
+<?php else: ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="fb_names_new" name="fb_names[||new]" />
+  </td>
+<?php endif; ?>
+  <td align="center"> </td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_new" name="fb_read[||new]" />
+    <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center"> </td>
+  <td align="center"> </td>
+  <td align="center"> </td>
+  <td> </td>
+</tr>
+
 <tr>
  <td colspan="7"> </td>
 </tr>

--- NEW FILE: HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch ---
This includes extra parameters into the free/busy view. The params are hardcoded so this patch won't make it upstream.

diff -r 9fa9c2822bdd fbview-kronolith/lib/FBView.php
--- a/fbview-kronolith/lib/FBView.php	Mon Feb 18 09:53:58 2008 +0100
+++ b/fbview-kronolith/lib/FBView.php	Mon Feb 18 10:03:17 2008 +0100
@@ -86,7 +86,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_requiredMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -107,7 +107,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_optionalMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -122,6 +122,9 @@ class Kronolith_FreeBusy_View {
             $template->set('legend', '');
             $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html');
         }
+
+	//**********
+	//This has been disabled in kolab-fbview. Make this optional?
 
         // Possible meeting times.
         $optimal->setAttribute('ORGANIZER', _("All Attendees"));
@@ -144,6 +147,9 @@ class Kronolith_FreeBusy_View {
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
+
+	//This has been disabled in kolab-fbview. Make this optional?
+	//**********
 
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
@@ -217,7 +223,7 @@ class Kronolith_FreeBusy_View {
         return $instances[$view];
     }
 
-    function _getBlocks($member, $periods, $blockfile, $label)
+    function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = new Horde_Template();
         $template->set('label', $label);
@@ -250,6 +256,21 @@ class Kronolith_FreeBusy_View {
 
                 $template->set('left', $left . '%');
                 $template->set('width', $width . '%');
+                $template->set('evclick', '');
+
+                if (isset($extra[$periodStart])) {
+                    if (!empty($extra[$periodStart]['X-UID'])) {
+                        $link = "javascript:performAction('viewaction', '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
+                        $template->set('evclick', $link);
+                    }
+                    if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+                        $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
+                    }
+                }
 
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
             } else {

--- NEW FILE: HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch ---
Provides a patch to store the list of attendees in the user preferences. This is a broken patch that has been rejected upstream (http://bugs.horde.org/ticket/?id=4788). This should be solved using Horde::Groups.

diff -r e0e3817cd448 fbview-kronolith/attendees.php
--- a/fbview-kronolith/attendees.php	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/attendees.php	Mon Feb 18 09:53:57 2008 +0100
@@ -155,6 +155,16 @@ case 'clear':
     $attendees = array();
     $_SESSION['kronolith']['attendees'] = $attendees;
     break;
+
+case 'save':
+    if (empty($attendees)) {
+        break;
+    }
+    $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+    $savedattlist[] = array_keys($attendees);
+    $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    $notification->push(_('Successfully saved attendee list'), 'horde.success');
+    break;
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -233,6 +243,14 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+if ($browser->hasFeature('javascript')) {
+    Horde::addScriptFile('open_savedattlist_win.js');
+    $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+    $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
 $notification->notify(array('status'));
 require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 fbview-kronolith/config/prefs.php.dist
--- a/fbview-kronolith/config/prefs.php.dist	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/config/prefs.php.dist	Mon Feb 18 09:53:57 2008 +0100
@@ -457,3 +457,11 @@ if ($GLOBALS['registry']->hasMethod('con
     'shared' => false,
     'type' => 'implicit'
 );
+
+$_prefs['saved_attendee_list'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit',
+    'desc' => _("A saved list of attendees")
+);
diff -r e0e3817cd448 fbview-kronolith/savedattlist.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/savedattlist.php	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
+ * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $
+ *
+ * Copyright 2004 Code Fusion  <http://www.codefusion.co.za/>
+ *                Stuart Binge <s.binge at codefusion.co.za>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/FBView.php';
+
+$title = _('Load Attendee List');
+
+Horde::addScriptFile('tooltip.js', 'horde');
+require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+// Get our list of saved attendees
+$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+
+// Preformat our image urls
+$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
+$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
+
+// Get our Action ID & Value. This specifies what action the user initiated.
+$actionID = Util::getFormData('actionID', false);
+$actionValue = Util::getFormData('actionValue', false);
+if (!$actionID) {
+    $actionID = (Util::getFormData('addNew', false) ? 'add' : false);
+    $actionValue = Util::getFormData('newAttendees', '');
+}
+
+// Perform the specified action, if there is one.
+switch ($actionID) {
+case 'remove':
+    // Remove the specified attendee
+    if (array_key_exists($actionValue, $savedattlist)) {
+        unset($savedattlist[$actionValue]);
+	$prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    }
+    
+    break;
+
+case 'dismiss':
+    // Make sure we're actually allowed to dismiss
+    if (!$allow_dismiss) break;
+
+    // Close the attendee window
+    global $browser;
+
+    if ($browser->hasFeature('javascript')) {
+        Util::closeWindowJS();
+    } else {
+        $url = Util::getFormData('url');
+
+        if (!empty($url)) {
+            $location = Horde::applicationUrl($url, true);
+        } else {
+            $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
+            $url = Util::addParameter($url, 'year', Util::getFormData('year'));
+            $location = Horde::applicationUrl($url, true);
+        }
+
+        // Make sure URL is unique.
+        $location = Util::addParameter($location, 'unique', md5(microtime()));
+
+        header('Location: ' . $location);
+    }
+    break;
+}
+
+$form_handler = Horde::applicationUrl('savedattlist.php');
+require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 fbview-kronolith/templates/attendees/attendees.inc
--- a/fbview-kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -92,6 +92,8 @@ function switchDateView(view, timestamp)
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
+ <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" />
+ <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?>
  <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?>
 </div>
 
diff -r e0e3817cd448 fbview-kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/javascript/open_savedattlist_win.js	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
+<?php endif; ?>
+function open_savedattlist_win(args)
+{
+    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/savedattlist.php', 'kronolith')) ?>";
+    if (url.indexOf('?') == -1) glue = '?';
+    else glue = '<?php echo ini_get('arg_separator.output') ?>';
+    var now = new Date();
+    var name = "savedattlist_window_" + now.getTime();
+    if (args != "") {
+        url = url + glue + args + '<?php echo ini_get('arg_separator.output') ?>' + "uniq=" + now.getTime();
+    } else {
+        url = url + glue + "uniq=" + now.getTime();
+    }
+    var Width = screen.width;
+    if (Width > 775) {
+        Width = 700;
+    } else {
+        Width -= 75;
+    }
+    var Height = screen.height;
+    if (Height > 725) {
+        Height = 650;
+    } else {
+        Height -= 75;
+    }
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + Width + ",height=" + Height + ",left=0,top=0";
+    name = window.open(url, name, param);
+    if (!eval("name.opener")) {
+        name.opener = self;
+    }
+}
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
+</script>
+<?php endif; ?>
diff -r e0e3817cd448 fbview-kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/savedattlist/savedattlist.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
+<!--
+function performAction(id, value)
+{
+    document.savedattlistForm.actionID.value = id;
+    document.savedattlistForm.actionValue.value = value;
+    document.savedattlistForm.submit();
+    return false;
+}
+
+function updateMessage(list)
+{
+    if (parent.opener.closed) {
+        alert('<?php echo addslashes(_("The Edit Attendees screen is no longer present. Exiting.")) ?>');
+        this.close();
+        return;
+    }
+
+    if (!parent.opener.document.attendeesForm) {
+        alert('<?php echo addslashes(_("You can only use this form from the Edit Attendees screen.")) ?>');
+        this.close();
+        return;
+    }
+
+    parent.opener.document.attendeesForm.newAttendees.value = list;
+    this.close();
+}
+// -->
+</script>
+
+<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm">
+<?php Util::pformInput(); ?>
+<input type="hidden" name="actionID" value="" />
+<input type="hidden" name="actionValue" value="" />
+
+<div align="center">
+
+<table border="0" width="500" cellspacing="0" cellpadding="2">
+
+<!-- header -->
+<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr>
+
+<!-- attendee list header -->
+<tr class="item">
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td>
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td>
+ <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td>
+</tr>
+
+<!-- attendees -->
+<?php $i = 0 ?>
+<?php if (empty($savedattlist)): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr>
+<?php else: foreach ($savedattlist as $index => $list): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>">
+ <?php
+  echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>";
+ ?>
+ <?php
+  echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>";
+ ?>
+  <td><?php echo implode(', ', $list); ?></td>
+ </tr>
+<?php endforeach; endif; ?>
+</table>
+</div>
+</form>





More information about the commits mailing list