gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.13, 1.14

cvs at kolab.org cvs at kolab.org
Fri Nov 14 16:30:17 CET 2008


Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv31145/patches/horde-webmail/1.2.0

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Fix the error handling in the PEAR DB_sqlite driver so that we have the Horde_History and can use SyncML.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- horde-webmail-1.2.0_kolab_openpkg.patch	14 Nov 2008 14:17:27 -0000	1.13
+++ horde-webmail-1.2.0_kolab_openpkg.patch	14 Nov 2008 15:30:15 -0000	1.14
@@ -1,6 +1,6 @@
 diff -r 0a5153c325f0 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,118 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
 +}
 diff -r 0a5153c325f0 config/conf.xml
 --- a/config/conf.xml	Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/conf.xml	Fri Nov 14 15:15:59 2008 +0100
++++ b/config/conf.xml	Fri Nov 14 16:21:44 2008 +0100
 @@ -1803,8 +1803,8 @@
        <configinteger name="sieveport" desc="Sieve port:">2000</configinteger>
        <configstring name="maildomain" desc="Default
@@ -160,7 +160,7 @@
     </configswitch>
 diff -r 0a5153c325f0 config/kolab.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/config/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,37 @@
 +<?php
 +/* Add additional admins here */
@@ -201,7 +201,7 @@
 +?>
 diff -r 0a5153c325f0 config/prefs.php
 --- a/config/prefs.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/config/prefs.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/config/prefs.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -357,7 +357,7 @@
  
  // UI theme
@@ -213,7 +213,7 @@
      'type' => 'select',
 diff -r 0a5153c325f0 imp/config/conf.php
 --- a/imp/config/conf.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/imp/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/imp/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,7 +1,8 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -246,7 +246,7 @@
  /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
 diff -r 0a5153c325f0 imp/config/servers.php
 --- a/imp/config/servers.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/imp/config/servers.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/imp/config/servers.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -226,10 +226,30 @@
  
  /* Example configurations: */
@@ -287,7 +287,7 @@
 +}
 diff -r 0a5153c325f0 ingo/config/backends.php
 --- a/ingo/config/backends.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/ingo/config/backends.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/ingo/config/backends.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -40,6 +40,8 @@
   *               give them permissions to do so. If you want to enable this
   *               feature, you need to set this parameter to true.
@@ -308,7 +308,7 @@
      require_once 'Horde/Kolab.php';
 diff -r 0a5153c325f0 ingo/config/conf.php
 --- a/ingo/config/conf.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/ingo/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/ingo/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -2,8 +2,7 @@
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
  // $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $
@@ -321,7 +321,7 @@
  $conf['rules']['userheader'] = true;
 diff -r 0a5153c325f0 kronolith/attendees.php
 --- a/kronolith/attendees.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/attendees.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/attendees.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -178,6 +178,16 @@
      $attendees = array();
      $_SESSION['kronolith']['attendees'] = $attendees;
@@ -356,7 +356,7 @@
  require $registry->get('templates', 'horde') . '/common-footer.inc';
 diff -r 0a5153c325f0 kronolith/calendars/edit.php
 --- a/kronolith/calendars/edit.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/calendars/edit.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/calendars/edit.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -53,6 +53,10 @@
  
  $vars->set('name', $calendar->get('name'));
@@ -370,7 +370,7 @@
  require KRONOLITH_TEMPLATES . '/menu.inc';
 diff -r 0a5153c325f0 kronolith/config/conf.php
 --- a/kronolith/config/conf.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,16 +1,19 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -399,7 +399,7 @@
 +}
 diff -r 0a5153c325f0 kronolith/config/conf.xml
 --- a/kronolith/config/conf.xml	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/config/conf.xml	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/config/conf.xml	Fri Nov 14 16:21:44 2008 +0100
 @@ -49,6 +49,12 @@
    </configswitch>
   </configsection>
@@ -415,7 +415,7 @@
    <configboolean name="keywords" desc="Should keywords be loaded from
 diff -r 0a5153c325f0 kronolith/config/kolab.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/config/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/config/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,10 @@
 +<?php
 +/* Primary mail domain of your Kolab server */
@@ -429,7 +429,7 @@
 +?>
 diff -r 0a5153c325f0 kronolith/config/prefs.php.dist
 --- a/kronolith/config/prefs.php.dist	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/config/prefs.php.dist	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/config/prefs.php.dist	Fri Nov 14 16:21:44 2008 +0100
 @@ -457,6 +457,14 @@
      'shared' => false,
      'type' => 'implicit'
@@ -447,7 +447,7 @@
      'locked' => false,
 diff -r 0a5153c325f0 kronolith/lib/Driver/kolab.php
 --- a/kronolith/lib/Driver/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Driver/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/Driver/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -62,6 +62,7 @@
              $this->_calendar = $calendar;
              $this->_wrapper->reset();
@@ -481,7 +481,7 @@
       */
 diff -r 0a5153c325f0 kronolith/lib/FBView.php
 --- a/kronolith/lib/FBView.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/FBView.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/FBView.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -87,7 +87,7 @@
              $rows = '';
              foreach ($this->_requiredMembers as $member) {
@@ -553,7 +553,7 @@
              } else {
 diff -r 0a5153c325f0 kronolith/lib/Forms/CreateCalendar.php
 --- a/kronolith/lib/Forms/CreateCalendar.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Forms/CreateCalendar.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/Forms/CreateCalendar.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -35,6 +35,9 @@
  
          $this->addVariable(_("Name"), 'name', 'text', true);
@@ -574,7 +574,7 @@
  
 diff -r 0a5153c325f0 kronolith/lib/Forms/EditCalendar.php
 --- a/kronolith/lib/Forms/EditCalendar.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Forms/EditCalendar.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/Forms/EditCalendar.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -42,6 +42,9 @@
          $this->addHidden('', 'c', 'text', true);
          $this->addVariable(_("Name"), 'name', 'text', true);
@@ -613,7 +613,7 @@
      }
 diff -r 0a5153c325f0 kronolith/lib/FreeBusy.php
 --- a/kronolith/lib/FreeBusy.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/FreeBusy.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/FreeBusy.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -187,6 +187,9 @@
  
              require_once 'HTTP/Request.php';
@@ -626,7 +626,7 @@
              }
 diff -r 0a5153c325f0 kronolith/lib/Storage/kolab.php
 --- a/kronolith/lib/Storage/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/Storage/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/Storage/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -29,17 +29,24 @@
      {
          global $conf;
@@ -662,7 +662,7 @@
          $options['timeout'] = 5;
 diff -r 0a5153c325f0 kronolith/lib/api.php
 --- a/kronolith/lib/api.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/lib/api.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/lib/api.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -694,6 +694,7 @@
  function _kronolith_listBy($action, $timestamp, $calendar = null)
  {
@@ -682,7 +682,7 @@
      $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
 diff -r 0a5153c325f0 kronolith/perms.php
 --- a/kronolith/perms.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/perms.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/perms.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -14,6 +14,34 @@
  @define('KRONOLITH_BASE', dirname(__FILE__));
  require_once KRONOLITH_BASE . '/lib/base.php';
@@ -754,7 +754,7 @@
              $notification->push($result, 'horde.error');
 diff -r 0a5153c325f0 kronolith/savedattlist.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/savedattlist.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/savedattlist.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,77 @@
 +<?php
 +/**
@@ -835,7 +835,7 @@
 +require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
 diff -r 0a5153c325f0 kronolith/templates/attendees/attendees.inc
 --- a/kronolith/templates/attendees/attendees.inc	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/templates/attendees/attendees.inc	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/templates/attendees/attendees.inc	Fri Nov 14 16:21:44 2008 +0100
 @@ -92,6 +92,8 @@
  <div>
   <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
@@ -847,13 +847,13 @@
  
 diff -r 0a5153c325f0 kronolith/templates/fbview/busyblock.html
 --- a/kronolith/templates/fbview/busyblock.html	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/templates/fbview/busyblock.html	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/templates/fbview/busyblock.html	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,1 +1,1 @@
 -<td><div class="busy" style="left:<tag:left />;width:<tag:width />;"> </div></td>
 +<td><div class="busy" onclick="<tag:evclick />" style="cursor:pointer;left:<tag:left />;width:<tag:width />;" title="<tag:label />"> </div></td>
 diff -r 0a5153c325f0 kronolith/templates/javascript/open_savedattlist_win.js
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/javascript/open_savedattlist_win.js	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/templates/javascript/open_savedattlist_win.js	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,36 @@
 +<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
 +<!--
@@ -893,7 +893,7 @@
 +<?php endif; ?>
 diff -r 0a5153c325f0 kronolith/templates/perms/perms.inc
 --- a/kronolith/templates/perms/perms.inc	Fri Nov 14 08:35:22 2008 +0100
-+++ b/kronolith/templates/perms/perms.inc	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/templates/perms/perms.inc	Fri Nov 14 16:21:44 2008 +0100
 @@ -330,6 +330,61 @@
    <td> </td>
  </tr>
@@ -958,7 +958,7 @@
  </tr>
 diff -r 0a5153c325f0 kronolith/templates/savedattlist/savedattlist.inc
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/kronolith/templates/savedattlist/savedattlist.inc	Fri Nov 14 15:15:59 2008 +0100
++++ b/kronolith/templates/savedattlist/savedattlist.inc	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,68 @@
 +<!-- javascript action handling -->
 +<script language="JavaScript" type="text/javascript">
@@ -1030,7 +1030,7 @@
 +</form>
 diff -r 0a5153c325f0 lib/Horde/Auth/kolab.php
 --- a/lib/Horde/Auth/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Auth/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Auth/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,6 +1,4 @@
  <?php
 -
@@ -1315,7 +1315,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab.php
 --- a/lib/Horde/Kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -711,7 +711,7 @@
       * Returns an array of application-specific constants, that are used in
       * a generic manner throughout the library.
@@ -1408,7 +1408,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab/Deprecated.php
 --- a/lib/Horde/Kolab/Deprecated.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Deprecated.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Deprecated.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -180,7 +180,7 @@
              /** We need the DOM library for xml handling (PHP4/5). */
              require_once 'Horde/DOM.php';
@@ -1440,7 +1440,7 @@
          if (is_a($result, 'PEAR_Error')) {
 diff -r 0a5153c325f0 lib/Horde/Kolab/Format/XML.php
 --- a/lib/Horde/Kolab/Format/XML.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -117,11 +117,18 @@
      var $_version = 1;
  
@@ -1550,7 +1550,7 @@
          $primary_category = '';
 diff -r 0a5153c325f0 lib/Horde/Kolab/Format/XML/hprefs.php
 --- a/lib/Horde/Kolab/Format/XML/hprefs.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Format/XML/hprefs.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Format/XML/hprefs.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -46,6 +46,10 @@
          /** Specific preferences fields, in kolab format specification order
           */
@@ -1613,7 +1613,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/IMAP.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,139 @@
 +<?php
 +/**
@@ -1756,7 +1756,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP/cclient.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/cclient.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/cclient.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,778 @@
 +<?php
 +/**
@@ -2538,7 +2538,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP/pear.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/pear.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/pear.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,520 @@
 +<?php
 +/**
@@ -3062,7 +3062,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/IMAP/test.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/IMAP/test.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/IMAP/test.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,728 @@
 +<?php
 +/**
@@ -3794,7 +3794,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server.php
 --- a/lib/Horde/Kolab/Server.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server.php,v 1.2.2.3 2008/09/22 12:22:33 wrobel Exp $
@@ -4474,7 +4474,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object.php
 --- a/lib/Horde/Kolab/Server/Object.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -5,7 +5,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php,v 1.2.2.3 2008/09/22 16:20:59 wrobel Exp $
@@ -5027,7 +5027,7 @@
  };
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/address.php
 --- a/lib/Horde/Kolab/Server/Object/address.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/address.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/address.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/address.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5111,7 +5111,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/administrator.php
 --- a/lib/Horde/Kolab/Server/Object/administrator.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/administrator.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/administrator.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,8 +4,16 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/administrator.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5170,7 +5170,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/adminrole.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Server/Object/adminrole.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/adminrole.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,157 @@
 +<?php
 +/**
@@ -5331,7 +5331,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/distlist.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Server/Object/distlist.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/distlist.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,52 @@
 +<?php
 +/**
@@ -5387,7 +5387,7 @@
 +};
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/domainmaintainer.php
 --- a/lib/Horde/Kolab/Server/Object/domainmaintainer.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/domainmaintainer.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,8 +4,16 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/domainmaintainer.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5522,7 +5522,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/group.php
 --- a/lib/Horde/Kolab/Server/Object/group.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/group.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/group.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/group.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5759,7 +5759,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/maintainer.php
 --- a/lib/Horde/Kolab/Server/Object/maintainer.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/maintainer.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/maintainer.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,8 +4,16 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/maintainer.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5819,7 +5819,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/server.php
 --- a/lib/Horde/Kolab/Server/Object/server.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/server.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/server.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/server.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5858,7 +5858,7 @@
 \ No newline at end of file
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/sharedfolder.php
 --- a/lib/Horde/Kolab/Server/Object/sharedfolder.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/sharedfolder.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/sharedfolder.php,v 1.2.2.2 2008/08/01 07:56:20 wrobel Exp $
@@ -5963,7 +5963,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/Object/user.php
 --- a/lib/Horde/Kolab/Server/Object/user.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/Object/user.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/Object/user.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/Object/user.php,v 1.2.2.3 2008/09/12 16:52:07 wrobel Exp $
@@ -6274,7 +6274,7 @@
  };
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/ldap.php
 --- a/lib/Horde/Kolab/Server/ldap.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/ldap.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/ldap.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php,v 1.2.2.2 2008/08/01 07:56:19 wrobel Exp $
@@ -6992,7 +6992,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab/Server/test.php
 --- a/lib/Horde/Kolab/Server/test.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Server/test.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Server/test.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,7 +4,13 @@
   *
   * $Horde: framework/Kolab_Server/lib/Horde/Kolab/Server/test.php,v 1.2.2.2 2008/08/01 07:56:19 wrobel Exp $
@@ -7533,7 +7533,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Kolab/Session.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/Horde/Kolab/Session.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Session.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,328 @@
 +<?php
 +/**
@@ -7865,7 +7865,7 @@
 +}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/Cache.php
 --- a/lib/Horde/Kolab/Storage/Cache.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Cache.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Cache.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -187,6 +187,31 @@
      }
  
@@ -7900,7 +7900,7 @@
      function reset()
 diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/Data.php
 --- a/lib/Horde/Kolab/Storage/Data.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Data.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Data.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -46,14 +46,6 @@
       * @var string
       */
@@ -8057,7 +8057,7 @@
       * @return array  The object ids.
 diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/Folder.php
 --- a/lib/Horde/Kolab/Storage/Folder.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/Folder.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Storage/Folder.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,6 +4,9 @@
   *
   * $Horde: framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php,v 1.7.2.3 2008/09/25 14:44:03 wrobel Exp $
@@ -10631,7 +10631,7 @@
 -}
 diff -r 0a5153c325f0 lib/Horde/Kolab/Storage/List.php
 --- a/lib/Horde/Kolab/Storage/List.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Kolab/Storage/List.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Kolab/Storage/List.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -4,9 +4,6 @@
   *
   * $Horde: framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php,v 1.3.2.2 2008/09/25 09:20:07 wrobel Exp $
@@ -11072,7 +11072,7 @@
 -}
 diff -r 0a5153c325f0 lib/Horde/Prefs/kolab.php
 --- a/lib/Horde/Prefs/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Prefs/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Prefs/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,5 +1,6 @@
  <?php
  
@@ -11092,7 +11092,7 @@
  }
 diff -r 0a5153c325f0 lib/Horde/Prefs/kolab_imap.php
 --- a/lib/Horde/Prefs/kolab_imap.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Prefs/kolab_imap.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Prefs/kolab_imap.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -163,7 +163,7 @@
          }
  
@@ -11113,7 +11113,7 @@
              $result = $this->_connection->_storage->save($object, $old_uid);
 diff -r 0a5153c325f0 lib/Horde/Share/kolab.php
 --- a/lib/Horde/Share/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/Share/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/Share/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -525,6 +525,13 @@
              $default = array('source' => 'kolab',
                               'default' => $this->get('default'),
@@ -11141,7 +11141,7 @@
              $this->_data[$attribute] = $value;
 diff -r 0a5153c325f0 lib/Horde/iCalendar.php
 --- a/lib/Horde/iCalendar.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/Horde/iCalendar.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/Horde/iCalendar.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -151,6 +151,41 @@
                  'value'     => $value,
                  'values'    => $values
@@ -11186,7 +11186,7 @@
  
 diff -r 0a5153c325f0 lib/SyncML/Backend.php
 --- a/lib/SyncML/Backend.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Backend.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/SyncML/Backend.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -567,6 +567,24 @@
      }
  
@@ -11214,7 +11214,7 @@
       * For some types of authentications (notably auth:basic) the username
 diff -r 0a5153c325f0 lib/SyncML/Backend/Horde.php
 --- a/lib/SyncML/Backend/Horde.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Backend/Horde.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/SyncML/Backend/Horde.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -204,6 +204,11 @@
                                    __FILE__, __LINE__, PEAR_LOG_DEBUG);
                  continue;
@@ -11325,7 +11325,7 @@
  
 diff -r 0a5153c325f0 lib/SyncML/Constants.php
 --- a/lib/SyncML/Constants.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Constants.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/SyncML/Constants.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -66,7 +66,7 @@
  define('RESPONSE_PARTIAL_CONTENT', 206);
  define('RESPONSE_CONFLICT_RESOLVED_WITH_MERGE', 207);
@@ -11337,7 +11337,7 @@
  define('RESPONSE_AUTHENTICATION_ACCEPTED', 212);
 diff -r 0a5153c325f0 lib/SyncML/Device.php
 --- a/lib/SyncML/Device.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Device.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/SyncML/Device.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -159,12 +159,81 @@
              SYNCML_LOGFILE_DATA,
              "\nInput received from client ($contentType):\n$content\n");
@@ -11422,7 +11422,7 @@
       * Converts the content from the backend to a format suitable for the
 diff -r 0a5153c325f0 lib/SyncML/Sync.php
 --- a/lib/SyncML/Sync.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/SyncML/Sync.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/SyncML/Sync.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -283,7 +283,13 @@
              }
          } elseif ($item->elementType == 'Delete') {
@@ -11481,7 +11481,7 @@
  
 diff -r 0a5153c325f0 lib/VFS/kolab.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/lib/VFS/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/VFS/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,631 @@
 +<?php
 +
@@ -12116,7 +12116,7 @@
 +}
 diff -r 0a5153c325f0 lib/core.php
 --- a/lib/core.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/lib/core.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/lib/core.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -31,6 +31,12 @@
   * include_path, you must add an ini_set() call here to add their location to
   * the include_path. */
@@ -12132,13 +12132,13 @@
  include_once 'PEAR.php';
 diff -r 0a5153c325f0 log/.htaccess
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/log/.htaccess	Fri Nov 14 15:15:59 2008 +0100
++++ b/log/.htaccess	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,1 @@
 +Deny from All
 \ No newline at end of file
 diff -r 0a5153c325f0 mnemo/config/conf.php
 --- a/mnemo/config/conf.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/mnemo/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/mnemo/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,9 +1,8 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12153,7 +12153,7 @@
  $conf['menu']['apps'] = array();
 diff -r 0a5153c325f0 nag/config/conf.php
 --- a/nag/config/conf.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/nag/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/nag/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1,9 +1,7 @@
  <?php
  /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -12167,7 +12167,7 @@
  $conf['menu']['apps'] = array();
 diff -r 0a5153c325f0 nag/lib/Driver.php
 --- a/nag/lib/Driver.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/nag/lib/Driver.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/nag/lib/Driver.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -319,33 +319,40 @@
  
          $new_task = $this->get($task->id);
@@ -12232,21 +12232,33 @@
              }
          }
  
+diff -r 0a5153c325f0 pear/DB/sqlite.php
+--- a/pear/DB/sqlite.php	Fri Nov 14 08:35:22 2008 +0100
++++ b/pear/DB/sqlite.php	Fri Nov 14 16:21:44 2008 +0100
+@@ -742,7 +742,7 @@
+         
+         // PHP 5.2+ prepends the function name to $php_errormsg, so we need
+         // this hack to work around it, per bug #9599.
+-        $errormsg = preg_replace('/^sqlite[a-z_]+\(\): /', '', $errormsg);
++        $errormsg = preg_replace('/^sqlite[a-z_]+\(\) \[[^\]]*\]: /', '', $errormsg);
+         
+         if (!isset($error_regexps)) {
+             $error_regexps = array(
 diff -r 0a5153c325f0 storage/.htaccess
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/storage/.htaccess	Fri Nov 14 15:15:59 2008 +0100
++++ b/storage/.htaccess	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,1 @@
 +Deny from All
 \ No newline at end of file
 diff -r 0a5153c325f0 tmp/.htaccess
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/tmp/.htaccess	Fri Nov 14 15:15:59 2008 +0100
++++ b/tmp/.htaccess	Fri Nov 14 16:21:44 2008 +0100
 @@ -0,0 +1,1 @@
 +Deny from All
 \ No newline at end of file
 diff -r 0a5153c325f0 turba/config/attributes.php
 --- a/turba/config/attributes.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/attributes.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/config/attributes.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -356,6 +356,12 @@
  );
  
@@ -12262,7 +12274,7 @@
      'type' => 'text',
 diff -r 0a5153c325f0 turba/config/attributes.php.dist
 --- a/turba/config/attributes.php.dist	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/attributes.php.dist	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/config/attributes.php.dist	Fri Nov 14 16:21:44 2008 +0100
 @@ -402,6 +402,12 @@
  // );
  
@@ -12278,7 +12290,7 @@
      'type' => 'text',
 diff -r 0a5153c325f0 turba/config/conf.php
 --- a/turba/config/conf.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/config/conf.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -3,8 +3,8 @@
  // $Horde: turba/config/conf.xml,v 1.6.2.6 2008/06/25 15:52:54 jan Exp $
  $conf['menu']['import_export'] = true;
@@ -12292,7 +12304,7 @@
  /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
 diff -r 0a5153c325f0 turba/config/sources.php
 --- a/turba/config/sources.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/sources.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/config/sources.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -154,6 +154,8 @@
   * Here are some example configurations:
   */
@@ -12557,7 +12569,7 @@
   * read-only. The address book content is provided by the
 diff -r 0a5153c325f0 turba/config/sources.php.dist
 --- a/turba/config/sources.php.dist	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/config/sources.php.dist	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/config/sources.php.dist	Fri Nov 14 16:21:44 2008 +0100
 @@ -825,7 +825,9 @@
                  'cellPhone'         => 'mobile',
                  'fax'               => 'fax',
@@ -12589,7 +12601,7 @@
                                     'homePostalCode', 'homeCountry', 'workStreet',
 diff -r 0a5153c325f0 turba/lib/Driver.php
 --- a/turba/lib/Driver.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/lib/Driver.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -1466,9 +1466,6 @@
          $hash = array();
          $attr = $vcard->getAllAttributes();
@@ -12602,7 +12614,7 @@
              case 'FN':
 diff -r 0a5153c325f0 turba/lib/Driver/kolab.php
 --- a/turba/lib/Driver/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/kolab.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/lib/Driver/kolab.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -56,6 +56,7 @@
          }
  
@@ -12698,7 +12710,7 @@
          $result = $this->_store->save($attributes, $object_id);
 diff -r 0a5153c325f0 turba/lib/Driver/share.php
 --- a/turba/lib/Driver/share.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/share.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/lib/Driver/share.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {
@@ -12710,7 +12722,7 @@
      }
 diff -r 0a5153c325f0 turba/lib/Object.php
 --- a/turba/lib/Object.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Object.php	Fri Nov 14 15:15:59 2008 +0100
++++ b/turba/lib/Object.php	Fri Nov 14 16:21:44 2008 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)





More information about the commits mailing list