gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.26, 1.27

cvs at kolab.org cvs at kolab.org
Mon Feb 9 15:25:57 CET 2009


Author: gunnar

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

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Update in the horde-release master branch (hiding files via .gitignore) and removed DIMP button from the sidebar.

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.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- horde-webmail-1.2.0_kolab_openpkg.patch	9 Feb 2009 11:14:02 -0000	1.26
+++ horde-webmail-1.2.0_kolab_openpkg.patch	9 Feb 2009 14:25:55 -0000	1.27
@@ -262,7 +262,7 @@
 +    }
 +}
 -- 
-tg: (5bcbb67..) t/framework/HK/GW/Kolab_Server/Session (depends on: master)
+tg: (6938161..) t/framework/HK/GW/Kolab_Server/Session (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Auth/UseSession
 
@@ -455,7 +455,7 @@
  
          return parent::setAuth($userId, $credentials, $realm, $changeRequested);
 -- 
-tg: (a25ecee..) t/framework/HK/GW/Auth/UseSession (depends on: t/framework/HK/GW/Kolab_Server/Session)
+tg: (ef1f7b1..) t/framework/HK/GW/Auth/UseSession (depends on: t/framework/HK/GW/Kolab_Server/Session)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/getFreebusyServer
 
@@ -544,7 +544,7 @@
              $home = $this->get(KOLAB_ATTR_HOMESERVER);
              return $home;
 -- 
-tg: (5bcbb67..) t/framework/HK/GW/Kolab_Server/getFreebusyServer (depends on: master)
+tg: (6938161..) t/framework/HK/GW/Kolab_Server/getFreebusyServer (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/getFreebusyServer
 
@@ -594,7 +594,7 @@
          $options['method'] = 'GET';
          $options['timeout'] = 5;
 -- 
-tg: (eb8858b..) t/kronolith/HK/GW/getFreebusyServer (depends on: t/framework/HK/GW/Kolab_Server/getFreebusyServer)
+tg: (e52fa15..) t/kronolith/HK/GW/getFreebusyServer (depends on: t/framework/HK/GW/Kolab_Server/getFreebusyServer)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch
 
@@ -620,7 +620,7 @@
              }
  
 -- 
-tg: (5bcbb67..) t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch (depends on: master)
+tg: (6938161..) t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/Trigger
 
@@ -947,7 +947,7 @@
              $this->_getAnnotationData();
          }
 -- 
-tg: (269811f..) t/framework/HK/GW/Kolab_Storage/Trigger (depends on: t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch)
+tg: (a47b2ab..) t/framework/HK/GW/Kolab_Storage/Trigger (depends on: t/framework/HK/GW/Kolab_Storage/Foreign_owner.patch)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/framework/Kolab/MoveSessionHandler
 
@@ -1347,7 +1347,7 @@
 -    }
 -}
 -- 
-tg: (b89bccc..) t/framework/HK/GW/framework/Kolab/MoveSessionHandler (depends on: t/framework/HK/GW/Auth/UseSession t/kronolith/HK/GW/getFreebusyServer t/framework/HK/GW/Kolab_Storage/Trigger)
+tg: (049b435..) t/framework/HK/GW/framework/Kolab/MoveSessionHandler (depends on: t/framework/HK/GW/Auth/UseSession t/kronolith/HK/GW/getFreebusyServer t/framework/HK/GW/Kolab_Storage/Trigger)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/framework/Kolab/DeprecatedGetServer
 
@@ -1395,7 +1395,7 @@
      }
  }
 -- 
-tg: (f335a7b..) t/framework/HK/GW/framework/Kolab/DeprecatedGetServer (depends on: t/framework/HK/GW/framework/Kolab/MoveSessionHandler)
+tg: (ca94278..) t/framework/HK/GW/framework/Kolab/DeprecatedGetServer (depends on: t/framework/HK/GW/framework/Kolab/MoveSessionHandler)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes
 
@@ -1477,7 +1477,7 @@
          }
  
 -- 
-tg: (0387a07..) t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes (depends on: t/framework/HK/GW/framework/Kolab/DeprecatedGetServer)
+tg: (4868827..) t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes (depends on: t/framework/HK/GW/framework/Kolab/DeprecatedGetServer)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/ListObjects
 
@@ -2060,7 +2060,7 @@
       *
       * @return int  The current LDAP error number.
 -- 
-tg: (f150a3d..) t/framework/HK/GW/Kolab_Server/ListObjects (depends on: t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes)
+tg: (53715c4..) t/framework/HK/GW/Kolab_Server/ListObjects (depends on: t/framework/HK/GW/Kolab_Storage/Restructuring_Fixes)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Auth/ListUsers
 
@@ -2122,7 +2122,7 @@
 +    }
  }
 -- 
-tg: (d3b3a10..) t/framework/HK/GW/Auth/ListUsers (depends on: t/framework/HK/GW/Kolab_Server/ListObjects)
+tg: (d75006c..) t/framework/HK/GW/Auth/ListUsers (depends on: t/framework/HK/GW/Kolab_Server/ListObjects)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/RewriteExtend
 
@@ -5949,7 +5949,7 @@
 +
  }
 -- 
-tg: (e8b6ec7..) t/framework/HK/GW/Kolab_Server/RewriteExtend (depends on: t/framework/HK/GW/Auth/ListUsers)
+tg: (d10384d..) t/framework/HK/GW/Kolab_Server/RewriteExtend (depends on: t/framework/HK/GW/Auth/ListUsers)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/CatchPossibleError
 
@@ -5983,7 +5983,7 @@
  
          if ($this->tainted) {
 -- 
-tg: (a264c44..) t/framework/HK/GW/Kolab_Storage/CatchPossibleError (depends on: t/framework/HK/GW/Kolab_Server/RewriteExtend)
+tg: (324e066..) t/framework/HK/GW/Kolab_Storage/CatchPossibleError (depends on: t/framework/HK/GW/Kolab_Server/RewriteExtend)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Auth/UseKolabServer
 
@@ -6212,7 +6212,7 @@
                  && $user != $session->user_id)) {
              $session = new Horde_Kolab_Session($user, $credentials);
 -- 
-tg: (4de8436..) t/framework/HK/GW/Auth/UseKolabServer (depends on: t/framework/HK/GW/Kolab_Storage/CatchPossibleError)
+tg: (a00ff66..) t/framework/HK/GW/Auth/UseKolabServer (depends on: t/framework/HK/GW/Kolab_Storage/CatchPossibleError)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/SafetyCheck
 
@@ -6238,7 +6238,7 @@
          if (empty($instances[$signature])) {
              $instances[$signature] = &Horde_Kolab_Server::factory($driver,
 -- 
-tg: (4808648..) t/framework/HK/GW/Kolab_Server/SafetyCheck (depends on: t/framework/HK/GW/Auth/UseKolabServer)
+tg: (022752c..) t/framework/HK/GW/Kolab_Server/SafetyCheck (depends on: t/framework/HK/GW/Auth/UseKolabServer)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab/MoveIMAP
 
@@ -10493,7 +10493,7 @@
                  return $result;
              }
 -- 
-tg: (8c62e15..) t/framework/HK/GW/Kolab/MoveIMAP (depends on: t/framework/HK/GW/Kolab_Server/SafetyCheck)
+tg: (9a3fc7a..) t/framework/HK/GW/Kolab/MoveIMAP (depends on: t/framework/HK/GW/Kolab_Server/SafetyCheck)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Auth/SafetyCheck
 
@@ -10519,7 +10519,7 @@
              return $session->auth;
          }
 -- 
-tg: (2ca0818..) t/framework/HK/GW/Auth/SafetyCheck (depends on: t/framework/HK/GW/Kolab/MoveIMAP)
+tg: (a71d158..) t/framework/HK/GW/Auth/SafetyCheck (depends on: t/framework/HK/GW/Kolab/MoveIMAP)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/RequireIMAP
 
@@ -10591,7 +10591,7 @@
                                                   $params['port'], true, false);
              if (is_a($imap, 'PEAR_Error')) {
 -- 
-tg: (9fc3ac7..) t/framework/HK/GW/Kolab_Server/RequireIMAP (depends on: t/framework/HK/GW/Auth/SafetyCheck)
+tg: (d4fffeb..) t/framework/HK/GW/Kolab_Server/RequireIMAP (depends on: t/framework/HK/GW/Auth/SafetyCheck)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Auth/InvalidCheck
 
@@ -10617,7 +10617,7 @@
                  $entry = array();
                  $entry[ 'timestamp' ] = time();
 -- 
-tg: (f09c951..) t/framework/HK/GW/Auth/InvalidCheck (depends on: t/framework/HK/GW/Kolab_Server/RequireIMAP)
+tg: (493930b..) t/framework/HK/GW/Auth/InvalidCheck (depends on: t/framework/HK/GW/Kolab_Server/RequireIMAP)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab/AttachmentSupport
 
@@ -11240,7 +11240,7 @@
                                __FILE__, __LINE__, PEAR_LOG_ERR);
              $data = array();
 -- 
-tg: (b266ebd..) t/framework/HK/GW/Kolab/AttachmentSupport (depends on: t/framework/HK/GW/Auth/InvalidCheck)
+tg: (cda64a2..) t/framework/HK/GW/Kolab/AttachmentSupport (depends on: t/framework/HK/GW/Auth/InvalidCheck)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Vfs/KolabDriver
 
@@ -11890,7 +11890,7 @@
 +    }
 +}
 -- 
-tg: (3d7f002..) t/framework/HK/GW/Vfs/KolabDriver (depends on: t/framework/HK/GW/Kolab/AttachmentSupport)
+tg: (864fbe8..) t/framework/HK/GW/Vfs/KolabDriver (depends on: t/framework/HK/GW/Kolab/AttachmentSupport)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/turba/HK/GW/PhotoSupport
 
@@ -12032,7 +12032,7 @@
          $dir = TURBA_VFS_PATH . '/' . $this->getValue('__uid');
          $file = $info['name'];
 -- 
-tg: (237e3a0..) t/turba/HK/GW/PhotoSupport (depends on: t/framework/HK/GW/Vfs/KolabDriver)
+tg: (ea9082a..) t/turba/HK/GW/PhotoSupport (depends on: t/framework/HK/GW/Vfs/KolabDriver)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback
 
@@ -12058,7 +12058,7 @@
          }
      }
 -- 
-tg: (1a436dd..) t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback (depends on: t/turba/HK/GW/PhotoSupport)
+tg: (8ab103d..) t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback (depends on: t/turba/HK/GW/PhotoSupport)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks
 
@@ -12115,7 +12115,7 @@
      }
  
 -- 
-tg: (2e85f5c..) t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks (depends on: t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback)
+tg: (2185342..) t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks (depends on: t/framework/HK/GW/Kolab_Server/ImprovedFreebusyServerFallback)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering
 
@@ -12402,7 +12402,7 @@
          $this->_annotation_data = $this->getData('annotation');
      }
 -- 
-tg: (bfee56e..) t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering (depends on: t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks)
+tg: (2cf9df2..) t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering (depends on: t/framework/HK/GW/Kolab_Server/ImprovedServerFallbacks)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/turba/HK/GW/AutomaticFreeBusyUrl
 
@@ -12466,7 +12466,7 @@
              'search' => array(
                  'name',
 -- 
-tg: (98f183d..) t/turba/HK/GW/AutomaticFreeBusyUrl (depends on: t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering)
+tg: (3e628f4..) t/turba/HK/GW/AutomaticFreeBusyUrl (depends on: t/framework/HK/GW/Kolab_Storgae/FixedUpdateTriggering)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/FixGetGroups
 
@@ -12492,7 +12492,7 @@
  
      /**
 -- 
-tg: (c2f404e..) t/framework/HK/GW/Kolab_Server/FixGetGroups (depends on: t/turba/HK/GW/AutomaticFreeBusyUrl)
+tg: (59cb337..) t/framework/HK/GW/Kolab_Server/FixGetGroups (depends on: t/turba/HK/GW/AutomaticFreeBusyUrl)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/CalendarRenaming
 
@@ -12565,7 +12565,7 @@
                  $this->name     = $this->new_name;
                  $this->new_name = null;
 -- 
-tg: (3c4d2c4..) t/kronolith/HK/GW/CalendarRenaming (depends on: t/framework/HK/GW/Kolab_Server/FixGetGroups)
+tg: (1b6a9e5..) t/kronolith/HK/GW/CalendarRenaming (depends on: t/framework/HK/GW/Kolab_Server/FixGetGroups)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename
 
@@ -12617,7 +12617,7 @@
                  $this->name     = $this->new_name;
                  $this->new_name = null;
 -- 
-tg: (4e45499..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename (depends on: t/kronolith/HK/GW/CalendarRenaming)
+tg: (ba404b5..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename (depends on: t/kronolith/HK/GW/CalendarRenaming)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation
 
@@ -12766,7 +12766,7 @@
  
          if (!isset($this->_annotation_data)) {
 -- 
-tg: (156cfca..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename)
+tg: (4a6bd9f..) t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderRename)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes
 
@@ -12813,7 +12813,7 @@
  
      /**
 -- 
-tg: (028c582..) t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation)
+tg: (3e0f3f4..) t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes (depends on: t/framework/HK/GW/Kolab_Storage/FixTriggerOnFolderCreation)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification
 
@@ -12848,7 +12848,7 @@
          case KOLAB_OBJECT_ADMINISTRATOR:
          case KOLAB_OBJECT_MAINTAINER:
 -- 
-tg: (17622c9..) t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification (depends on: t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes)
+tg: (72d0535..) t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification (depends on: t/framework/HK/GW/Kolab_Server/AdditionalGetFeeBusyServerFixes)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Fbview/XfbConcept
 
@@ -12984,7 +12984,7 @@
                  $params = $default;
              }
 -- 
-tg: (914f60a..) t/framework/HK/GW/Kolab_Fbview/XfbConcept (depends on: t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification)
+tg: (faa8655..) t/framework/HK/GW/Kolab_Fbview/XfbConcept (depends on: t/framework/HK/GW/Kolab_Server/FixAddressObjectIdentification)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab/XfbFixes
 
@@ -13064,7 +13064,7 @@
          default:
              $this->_data[$attribute] = $value;
 -- 
-tg: (c79c667..) t/framework/HK/GW/Kolab/XfbFixes (depends on: t/framework/HK/GW/Kolab_Fbview/XfbConcept)
+tg: (84604ae..) t/framework/HK/GW/Kolab/XfbFixes (depends on: t/framework/HK/GW/Kolab_Fbview/XfbConcept)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/DB/SqliteErrorChecking
 
@@ -13090,7 +13090,7 @@
          if (!isset($error_regexps)) {
              $error_regexps = array(
 -- 
-tg: (a3c75a8..) t/framework/HK/GW/DB/SqliteErrorChecking (depends on: t/framework/HK/GW/Kolab/XfbFixes)
+tg: (018dab9..) t/framework/HK/GW/DB/SqliteErrorChecking (depends on: t/framework/HK/GW/Kolab/XfbFixes)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Storage/ShareIdFix
 
@@ -13119,7 +13119,7 @@
          return rawurlencode($this->name);
      }
 -- 
-tg: (302cf96..) t/framework/HK/GW/Kolab_Storage/ShareIdFix (depends on: t/framework/HK/GW/DB/SqliteErrorChecking)
+tg: (1f4cc03..) t/framework/HK/GW/Kolab_Storage/ShareIdFix (depends on: t/framework/HK/GW/DB/SqliteErrorChecking)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/iCalendar/QuotedParameters
 
@@ -13182,7 +13182,7 @@
                  }
              }
 -- 
-tg: (556bc82..) t/framework/HK/GW/iCalendar/QuotedParameters (depends on: t/framework/HK/GW/Kolab_Storage/ShareIdFix)
+tg: (af8ebe5..) t/framework/HK/GW/iCalendar/QuotedParameters (depends on: t/framework/HK/GW/Kolab_Storage/ShareIdFix)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/Kolab_Server/HK/GW/DenyLogin
 
@@ -13349,7 +13349,7 @@
                      if (!empty($result) && !is_a($result, 'PEAR_Error')) {
                          $this->user_mail = $result;
 -- 
-tg: (379ee4a..) t/Kolab_Server/HK/GW/DenyLogin (depends on: t/framework/HK/GW/iCalendar/QuotedParameters)
+tg: (f425aea..) t/Kolab_Server/HK/GW/DenyLogin (depends on: t/framework/HK/GW/iCalendar/QuotedParameters)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/Kolab_Server/HK/GW/UserMailAndFullname
 
@@ -13478,7 +13478,7 @@
          }
  
 -- 
-tg: (7281ae6..) t/Kolab_Server/HK/GW/UserMailAndFullname (depends on: t/Kolab_Server/HK/GW/DenyLogin)
+tg: (a5a1f3e..) t/Kolab_Server/HK/GW/UserMailAndFullname (depends on: t/Kolab_Server/HK/GW/DenyLogin)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/imp/HK/GW/AuthForInvitations
 
@@ -13547,7 +13547,7 @@
                          $this->_msgs[$key][] = array('error', sprintf(_("Error sending reply: %s."), $status->getMessage()));
                      } else {
 -- 
-tg: (926ddad..) t/imp/HK/GW/AuthForInvitations (depends on: t/Kolab_Server/HK/GW/UserMailAndFullname)
+tg: (066c7a2..) t/imp/HK/GW/AuthForInvitations (depends on: t/Kolab_Server/HK/GW/UserMailAndFullname)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/SyncML/HK/GW/CombinedFixes
 
@@ -13915,7 +13915,7 @@
                  $backend->logMessage($suid->message, __FILE__, __LINE__, PEAR_LOG_DEBUG);
  
 -- 
-tg: (5bcbb67..) t/SyncML/HK/GW/CombinedFixes (depends on: master)
+tg: (6938161..) t/SyncML/HK/GW/CombinedFixes (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/Prefs/HK/GW/FixLDAPAuthForIngo
 
@@ -13953,7 +13953,7 @@
  
  }
 -- 
-tg: (6acdc34..) t/Prefs/HK/GW/FixLDAPAuthForIngo (depends on: t/SyncML/HK/GW/CombinedFixes)
+tg: (ba51448..) t/Prefs/HK/GW/FixLDAPAuthForIngo (depends on: t/SyncML/HK/GW/CombinedFixes)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/Text/Filter/SC/CH/Xss
 
@@ -13979,7 +13979,7 @@
              $patterns['|<style[^>]*>(?:\s*<\!--)*|i'] = '<!--';
              $patterns['|(?:-->\s*)*</style>|i'] = '-->';
 -- 
-tg: (5bcbb67..) t/Text/Filter/SC/CH/Xss (depends on: master)
+tg: (6938161..) t/Text/Filter/SC/CH/Xss (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/framework/Kolab_Format/WS
 
@@ -14005,7 +14005,7 @@
  
          $primary_category = '';
 -- 
-tg: (5bcbb67..) t/framework/HK/GW/framework/Kolab_Format/WS (depends on: master)
+tg: (6938161..) t/framework/HK/GW/framework/Kolab_Format/WS (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling
 
@@ -14041,7 +14041,7 @@
              $horde_categories = $cManager->get();
          } else {
 -- 
-tg: (fff6d82..) t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling (depends on: t/framework/HK/GW/framework/Kolab_Format/WS)
+tg: (7214163..) t/framework/HK/GW/Kolab_Format/ImprovedPreferencesHandling (depends on: t/framework/HK/GW/framework/Kolab_Format/WS)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/Prefs_KolabImapApplicationTag
 
@@ -14142,7 +14142,7 @@
  
              $result = $this->_connection->_storage->save($object, $old_uid);
 -- 
-tg: (5bcbb67..) t/framework/HK/GW/Prefs_KolabImapApplicationTag (depends on: master)
+tg: (6938161..) t/framework/HK/GW/Prefs_KolabImapApplicationTag (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/framework/HK/GW/horde/conf_xmlUpdates
 
@@ -14194,7 +14194,7 @@
      </case>
     </configswitch>
 -- 
-tg: (5bcbb67..) t/framework/HK/GW/horde/conf_xmlUpdates (depends on: master)
+tg: (6938161..) t/framework/HK/GW/horde/conf_xmlUpdates (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/AuthenticatedFreeBusy
 
@@ -14241,7 +14241,7 @@
                  return PEAR::raiseError(sprintf(_("The free/busy url for %s cannot be retrieved."), $email));
              }
 -- 
-tg: (5bcbb67..) t/kronolith/HK/GW/AuthenticatedFreeBusy (depends on: master)
+tg: (6938161..) t/kronolith/HK/GW/AuthenticatedFreeBusy (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/SB/SaveEventAttendees
 
@@ -14525,7 +14525,7 @@
 +</div>
 +</form>
 -- 
-tg: (5bcbb67..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master)
+tg: (6938161..) t/kronolith/HK/SB/SaveEventAttendees (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/SB/ExtraParameters
 
@@ -14619,7 +14619,7 @@
 -<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>
 -- 
-tg: (083b765..) t/kronolith/HK/SB/ExtraParameters (depends on: t/kronolith/HK/SB/SaveEventAttendees)
+tg: (02682d5..) t/kronolith/HK/SB/ExtraParameters (depends on: t/kronolith/HK/SB/SaveEventAttendees)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/FbviewRelevance
 
@@ -14693,7 +14693,7 @@
          if ($original_name != $this->_vars->get('name')) {
              $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));
 -- 
-tg: (2685978..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters)
+tg: (73bfe0e..) t/kronolith/HK/GW/FbviewRelevance (depends on: t/kronolith/HK/SB/ExtraParameters)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/XfbAccess
 
@@ -14846,7 +14846,7 @@
   <td colspan="7"> </td>
  </tr>
 -- 
-tg: (54021ca..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance)
+tg: (5c7a016..) t/kronolith/HK/GW/XfbAccess (depends on: t/kronolith/HK/GW/FbviewRelevance)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/nag/H/MR/Bug_7400
 
@@ -14928,7 +14928,7 @@
          }
  
 -- 
-tg: (5bcbb67..) t/nag/H/MR/Bug_7400 (depends on: master)
+tg: (6938161..) t/nag/H/MR/Bug_7400 (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/GLOBAL/HK/GW/Config
 
@@ -14937,12 +14937,11 @@
 Signed-off-by: Gunnar Wrobel <p at rdus.de>
 
 ---
- horde-webmail/.gitignore                 |    2 +
+ horde-webmail/.gitignore                 |    1 -
  horde-webmail/config/conf.php            |  116 ++++++++++++++
  horde-webmail/config/hooks.php           |   52 +++----
  horde-webmail/config/kolab.php           |   40 +++++
  horde-webmail/config/prefs.php           |    4 +-
- horde-webmail/config/registry.php        |    2 +-
  horde-webmail/dimp/config/servers.php    |  255 ++++++++++++++++++++++++++++++
  horde-webmail/imp/config/conf.php        |   14 +-
  horde-webmail/imp/config/hooks.php       |    7 +
@@ -14959,8 +14958,17 @@
  horde-webmail/tmp/.htaccess              |    1 +
  horde-webmail/turba/config/conf.php      |    4 +-
  horde-webmail/turba/config/sources.php   |  248 +++++++++++++++++++++++++++++
- 22 files changed, 802 insertions(+), 62 deletions(-)
+ 21 files changed, 799 insertions(+), 62 deletions(-)
 
+diff --git a/horde-webmail/.gitignore b/horde-webmail/.gitignore
+index bff2d13..f986bb5 100644
+--- a/horde-webmail/.gitignore
++++ b/horde-webmail/.gitignore
+@@ -3,4 +3,3 @@ log/*
+ storage/*
+ config/kolab.local.php
+ kronolith/config/kolab.local.php
+-
 diff --git a/horde-webmail/config/conf.php b/horde-webmail/config/conf.php
 new file mode 100644
 index 0000000..f5c85a6
@@ -15221,19 +15229,6 @@
      'locked' => false,
      'shared' => true,
      'type' => 'select',
-diff --git a/horde-webmail/config/registry.php b/horde-webmail/config/registry.php
-index cbd6221..f80ecb9 100644
---- a/horde-webmail/config/registry.php
-+++ b/horde-webmail/config/registry.php
-@@ -64,7 +64,7 @@ $this->applications['dimp'] = array(
-     'fileroot' => dirname(__FILE__) . '/../dimp',
-     'webroot' => $this->applications['horde']['webroot'] . '/dimp',
-     'name' => _("Dynamic Mail"),
--    'status' => 'notoolbar',
-+    'status' => 'active',
-     'target' => '_parent',
- );
- 
 diff --git a/horde-webmail/dimp/config/servers.php b/horde-webmail/dimp/config/servers.php
 new file mode 100644
 index 0000000..30962f3
@@ -16062,7 +16057,7 @@
   * An address book based on message recipients. This will always be private and
   * read-only. The address book content is provided by the
 -- 
-tg: (5bcbb67..) t/GLOBAL/HK/GW/Config (depends on: master)
+tg: (6938161..) t/GLOBAL/HK/GW/Config (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/GLOBAL/HK/GW/ConfigOpenPKG
 
@@ -16089,7 +16084,7 @@
  $conf['alarms']['params']['ttl'] = 300;
  $conf['alarms']['driver'] = 'sql';
 -- 
-tg: (f56e948..) t/GLOBAL/HK/GW/ConfigOpenPKG (depends on: t/GLOBAL/HK/GW/Config)
+tg: (9bfa565..) t/GLOBAL/HK/GW/ConfigOpenPKG (depends on: t/GLOBAL/HK/GW/Config)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/kronolith/HK/GW/SyncMLrefresh
 
@@ -16159,7 +16154,7 @@
      $histories = $history->getByTimestamp('>', $timestamp, array(array('op' => '=', 'field' => 'action', 'value' => $action)), 'kronolith:' . $calendar);
      if (is_a($histories, 'PEAR_Error')) {
 -- 
-tg: (5bcbb67..) t/kronolith/HK/GW/SyncMLrefresh (depends on: master)
+tg: (6938161..) t/kronolith/HK/GW/SyncMLrefresh (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/turba/HK/GW/FixAddressbookDeletion
 
@@ -16185,7 +16180,7 @@
          return $this->_driver->_deleteAll($sourceName);
      }
 -- 
-tg: (5bcbb67..) t/turba/HK/GW/FixAddressbookDeletion (depends on: master)
+tg: (6938161..) t/turba/HK/GW/FixAddressbookDeletion (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/turba/HK/GW/FixSyncMLAttributeDeletion
 
@@ -16212,7 +16207,7 @@
              switch ($item['name']) {
              case 'FN':
 -- 
-tg: (5bcbb67..) t/turba/HK/GW/FixSyncMLAttributeDeletion (depends on: master)
+tg: (6938161..) t/turba/HK/GW/FixSyncMLAttributeDeletion (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/turba/HK/GW/SyncMLrefresh
 
@@ -16237,7 +16232,7 @@
  
      /**
 -- 
-tg: (a490d6b..) t/turba/HK/GW/SyncMLrefresh (depends on: t/turba/HK/GW/FixSyncMLAttributeDeletion)
+tg: (015e842..) t/turba/HK/GW/SyncMLrefresh (depends on: t/turba/HK/GW/FixSyncMLAttributeDeletion)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/imp/HideGroupwareFolders
 
@@ -16375,7 +16370,7 @@
  
      /**
 -- 
-tg: (5bcbb67..) t/imp/HideGroupwareFolders (depends on: master)
+tg: (6938161..) t/imp/HideGroupwareFolders (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/imp/SC/CH/SecIssues20090128
 
@@ -16473,7 +16468,7 @@
  
  function _textWindowOutput($filename, $msg, $html = false)
 -- 
-tg: (5bcbb67..) t/imp/SC/CH/SecIssues20090128 (depends on: master)
+tg: (6938161..) t/imp/SC/CH/SecIssues20090128 (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/horde/SC/CH/SecIssues20090128
 
@@ -16512,7 +16507,7 @@
      . Horde::link('#', '', '', '', '$(\'cloudsearch\').hide();', '', '', array('style' => 'font-size:75%;'))
      . '(' . _("Hide Results") . ')</a></span></div><ul class="linedRow">';
 -- 
-tg: (5bcbb67..) t/horde/SC/CH/SecIssues20090128 (depends on: master)
+tg: (6938161..) t/horde/SC/CH/SecIssues20090128 (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/dimp/H/MS/FixBrokenFolderImages
 
@@ -18733,7 +18728,7 @@
      float: left;
      width: 20px;
 -- 
-tg: (5bcbb67..) t/dimp/H/MS/FixBrokenFolderImages (depends on: master)
+tg: (6938161..) t/dimp/H/MS/FixBrokenFolderImages (depends on: master)
 From: Gunnar Wrobel <p at rdus.de>
 Subject: [PATCH] t/dimp/HK/GW/ItipHandling
 
@@ -18874,4 +18869,4 @@
  
          if ($this->_msgs) {
 -- 
-tg: (12a42ba..) t/dimp/HK/GW/ItipHandling (depends on: master t/dimp/H/MS/FixBrokenFolderImages)
+tg: (667dce6..) t/dimp/HK/GW/ItipHandling (depends on: master t/dimp/H/MS/FixBrokenFolderImages)





More information about the commits mailing list