[Pkg-citadel-commit] r328 - in webcit/tags: . 7.43-dfsg-3/debian 7.43-dfsg-3/debian/patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Fri Apr 3 07:59:16 UTC 2009
Author: meskes
Date: 2009-04-03 07:59:16 +0000 (Fri, 03 Apr 2009)
New Revision: 328
Added:
webcit/tags/7.43-dfsg-3/
webcit/tags/7.43-dfsg-3/debian/changelog
webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff
Removed:
webcit/tags/7.43-dfsg-3/debian/changelog
webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff
Log:
Released 7.43-dfsg-3
Copied: webcit/tags/7.43-dfsg-3 (from rev 326, webcit/trunk)
Deleted: webcit/tags/7.43-dfsg-3/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog 2009-04-02 09:18:33 UTC (rev 326)
+++ webcit/tags/7.43-dfsg-3/debian/changelog 2009-04-03 07:59:16 UTC (rev 328)
@@ -1,297 +0,0 @@
-webcit (7.43-dfsg-2) unstable; urgency=low
-
- [ Bernd Zeimetz ]
- * Calculate dependency on citadel-common based on the current webcit
- upstream version, closes: #520881
- * Added Homepage, Vcs-Svn and Vcs-Browser information to debian/control.
- * Added debian/uscan-dfsg-clean.sh and updated debian/watch to remove
- non-free material while running uscan.
-
- [ Michael Meskes ]
- * Updated to internal releases 7.44.
- * Bumped debhelper compat level to 7.
- * Added debug package.
-
- -- Michael Meskes <meskes at debian.org> Thu, 02 Apr 2009 10:18:35 +0200
-
-webcit (7.43-dfsg-1) unstable; urgency=high
-
- * New upstream version.
- * Reworked copyright file, closes: #518500
- * Updated Galician debconf translation, closes: #519470
- * Updated Portuguese debconf translation, closes: #519461, #520035
- * Updated Russian debconf translation, closes: #519477
- * Updated German debconf translation, closes: #519475
- * Bumpared Standards-Version to 3.8.1, no changes needed.
-
- -- Michael Meskes <meskes at debian.org> Wed, 18 Mar 2009 12:00:40 +0100
-
-webcit (7.42-dfsg-1) unstable; urgency=high
-
- * New upstream version, closes: #517579
- * Updated versioned dependencies.
- * We have to keep urgency high because 7.38b-dfsg-2 didn't migrate to
- testing.
- * Changed watch file to account for an additional letter in the version
- number if present.
- * Create static.local directory under /var/lib/citadel-webcit for local
- installation of themes etc.
- * Reworked debconf setup.
- * Improved debconf template by incorporating ideas from Christian Perrier
- <bubulle at debian.org>.
- * Updated Vietnamese debconf translation, closes: #518273
- * Updated Swedish debconf translation, closes: #518328
- * Updated Finish debconf translation, closes: #518663
- * Updated French debconf translation, closes: #518918
- * Updated Czech debconf translation, closes: #518991
- * Updated Italian debconf translation, closes: #519176
- * Updated Russian debconf translation, closes: #519303
-
- -- Michael Meskes <meskes at debian.org> Tue, 03 Mar 2009 12:44:02 +0100
-
-webcit (7.38b-dfsg-2) unstable; urgency=high
-
- * r7104..7107 remove unneeded parameters to embeddable calendar.
- * Urgency set to "high" because this fixes a security hole.
-
- -- Michael Meskes <meskes at debian.org> Thu, 12 Feb 2009 13:09:24 +0100
-
-webcit (7.38b-dfsg-1) unstable; urgency=low
-
- * New upstream version.
- * Removed all prepatches.
-
- -- Michael Meskes <meskes at debian.org> Tue, 09 Dec 2008 14:38:18 +0100
-
-webcit (7.37-dfsg-6) unstable; urgency=medium
-
- * Added missing build dependency on libssl-dev causing citadel-webcit to not
- start correctly.
-
- -- Michael Meskes <meskes at debian.org> Wed, 12 Nov 2008 12:47:19 +0100
-
-webcit (7.37-dfsg-5) unstable; urgency=low
-
- * Added manpage for webcit.
- * Removed absolute paths in postinst script to make lintian happy.
- * Do not install local scriptaculous javascript library, but depend on
- package providing this library.
- * Build depend on autotools-dev to provide up-to-date config.{sub|guess}
- files.
-
- -- Michael Meskes <meskes at debian.org> Thu, 11 Sep 2008 11:51:27 +0200
-
-webcit (7.37-dfsg-4) unstable; urgency=low
-
- [Wilfried Goesgens]
- * Cleanup apache config hooks on purge; closes: #498556
-
- [ Michael Meskes ]
- * Fixed filename in postinst, it's webcit.conf not citadel-webcit.
-
- -- Michael Meskes <meskes at debian.org> Thu, 11 Sep 2008 11:27:39 +0200
-
-webcit (7.37-dfsg-3) unstable; urgency=low
-
- [ Wilfried Goesgens ]
- * [r6563] add prepatch from devel branch to improve vcard interoperability
- with other UI clients; this fixed citadel bug 429
-
- -- Michael Meskes <meskes at debian.org> Wed, 03 Sep 2008 11:01:14 +0200
-
-webcit (7.37-dfsg-2) unstable; urgency=low
-
- [ Wilfried Goesgens ]
- * [r6407] add prepatch from devel branch that lets webcit rate userpasswords
- instad of layer 9
- * [r6414] add prepatch from devel branch tweaking serv_prinf
- * [r6425] add prepatch from devel branch fixing URL Parsing
- * [r6443] add prepatch from devel branch fixing IM Window bug, closes: #493449
- * [r6476] add prepatch from devel branch closing memleak
-
- [ Michael Meskes ]
- * Moved update of config.{sub,guess} to configure target.
-
- -- Michael Meskes <meskes at debian.org> Fri, 15 Aug 2008 14:25:03 +0200
-
-webcit (7.37-dfsg-1) unstable; urgency=low
-
- [ Wilfried Goesgens ]
- * New upstream version.
- * Fix init script to add the bind-ip to the commandline.
-
- [ Michael Meskes ]
- * Added Swedish translation, closes: #487595
- * Updated Portuguese translation, closes: #488580
- * Removed Open-Id logo from upstream tarball because it doesn't seem to
- carry a license.
- * Bumped versioned build dependency.
-
- -- Michael Meskes <meskes at debian.org> Tue, 24 Jun 2008 13:43:32 +0200
-
-webcit (7.36-2) unstable; urgency=low
-
- * Bumped versioned build dependency, closes: #485844
-
- -- Michael Meskes <meskes at debian.org> Thu, 12 Jun 2008 09:50:53 +0200
-
-webcit (7.36-1) unstable; urgency=low
-
- * New upstream version.
- * Removed URL handler patch, no longer needed.
- * Bumped standards to 3.8.0.
-
- -- Michael Meskes <meskes at debian.org> Fri, 06 Jun 2008 11:54:01 +0200
-
-webcit (7.35-3) unstable; urgency=low
-
- [ Michael Meskes ]
- * Updated Galician translation, closes: #480991
- * Updated Basque translation, closes: #483234
-
- [ Wilfried Goesgens ]
- * Added upstream bugfix in URL handler
-
- -- Michael Meskes <meskes at debian.org> Tue, 13 May 2008 15:03:01 +0200
-
-webcit (7.35-2) unstable; urgency=low
-
- * Added Italian translation, closes: #477716
- * Added Russian translation, closes: #479151
- * Added Czech translation, closes: #480199
- * Updated French translation, closes: #480388
-
- -- Michael Meskes <meskes at debian.org> Fri, 25 Apr 2008 10:05:02 +0200
-
-webcit (7.35-1) unstable; urgency=low
-
- [ Wilfried Goesgens ]
- * new upstream version
- * removed prepatches
-
- [ Michael Meskes ]
- * Added French translation, closes: #477126
- * Added Vietnamese translation, closes: #477336
- * Made package build depend on libcitadel-dev >= 1.09.
- * Added watch file.
-
- -- Michael Meskes <meskes at debian.org> Thu, 24 Apr 2008 09:50:59 +0200
-
-webcit (7.34-dfsg-2) unstable; urgency=low
-
- [ Wilfried Goesgens ]
- * Remove static/prototype.js from the package and depend on libjs-prototype,
- closes: #475272
- * Link over prototype.js from libjs-prototype to webcit directory.
-
- [ Michael Meskes ]
- * Fixed some problems in the debconf templates, closes: #475420, #475421
- * Added Portuguese translation, closes: #475447
- * Added German translation, closes: #475419
- * Added Basque translation, closes: #475606
- * Added Galician translation, closes: #475597
- * Added Finish translation, closes: #475666
- * Removed one debconf question and added a README saying the same.
-
- -- Michael Meskes <meskes at debian.org> Fri, 11 Apr 2008 20:56:28 +0200
-
-webcit (7.34-dfsg-1) unstable; urgency=low
-
- * New upstream version
- * Added upstream's patch to rename webserver to webcit.
- * Changed Debian files accordingly.
-
- -- Michael Meskes <meskes at debian.org> Fri, 04 Apr 2008 08:58:49 +0200
-
-webcit (7.33-1) unstable; urgency=low
-
- [ Wilfried Goesgens ]
- * recommend shared mime info
- * suggest gnome-icon-theme and symlink its 24x24 icons into
- /usr/share/citadel-webcit/static/icons so webcit can display them for
- files with mime extensions
-
- [ Michael Meskes ]
- * Changed maintainer to Debian Citadel Team.
- * Changed priority to extra.
- * New upstream version.
- * Do not ignore errors in clean target.
- * Bumped Standards-Version.
- * Call debconf-updatepo in clean target.
- * Automatically update autoconf helper files.
-
- -- Michael Meskes <meskes at debian.org> Sat, 22 Mar 2008 17:17:25 +0100
-
-webcit (7.31-27) unstable; urgency=high
-
- * initial mime detection support
- * don't nail the users to GIF
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Tue, 12 Feb 2008 0:00:00 +0001
-
-webcit (7.30-26) unstable; urgency=high
-
- * Fix room admin dialog
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Wed, 6 Feb 2008 20:00:00 +0001
-
-webcit (7.30-25) unstable; urgency=high
-
- * New citadel version.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 1 Feb 2008 10:00:00 +0001
-
-webcit (7.24-24) unstable; urgency=high
-
- * fixed missing locales and image calculation
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Wed, 21 Nov 2007 0:01:21 +0002
-
-webcit (7.24-23) unstable; urgency=high
-
- * crash in notes fixed.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 16 Nov 2007 0:01:21 +0002
-
-webcit (7.23-22) unstable; urgency=high
-
- * fix some IE rendering bugs
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Thu, 8 Nov 2007 23:01:21 +0002
-
-webcit (7.22-21) unstable; urgency=high
-
- * fixed ssl related directory access crash
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Tue, 30 Oct 2007 18:10:00 +0002
-
-webcit (7.22-20) unstable; urgency=high
-
- * Lots of stylesheet fixes. Performance improvements.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Thu, 25 Oct 2007 18:10:00 +0002
-
-webcit (7.13-19) unstable; urgency=high
-
- * update to actual Webcit release. Fix several conditions of CPU abuse.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 3 Aug 2007 18:10:00 +0002
-
-webcit (7.12-18) unstable; urgency=high
-
- * update to actual Citadel SVN. many new features. see Packages changelog.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Sun, 8 Jul 2007 8:10:00 +0000
-
-webcit (7.11-17) unstable; urgency=high
-
- * update to actual Citadel SVN. many new features. see Packages changelog.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 6 Jul 2007 22:10:00 +0000
-
-webcit (7.07-0ubuntu1) unstable; urgency=low
-
- * initial ubuntu release.
-
- -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 06 Apr 2007 19:07:00 +0000
-
Copied: webcit/tags/7.43-dfsg-3/debian/changelog (from rev 327, webcit/trunk/debian/changelog)
===================================================================
--- webcit/tags/7.43-dfsg-3/debian/changelog (rev 0)
+++ webcit/tags/7.43-dfsg-3/debian/changelog 2009-04-03 07:59:16 UTC (rev 328)
@@ -0,0 +1,303 @@
+webcit (7.43-dfsg-3) unstable; urgency=low
+
+ * Do not patch configure.ac because it break package builds.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 03 Apr 2009 09:56:05 +0200
+
+webcit (7.43-dfsg-2) unstable; urgency=low
+
+ [ Bernd Zeimetz ]
+ * Calculate dependency on citadel-common based on the current webcit
+ upstream version, closes: #520881
+ * Added Homepage, Vcs-Svn and Vcs-Browser information to debian/control.
+ * Added debian/uscan-dfsg-clean.sh and updated debian/watch to remove
+ non-free material while running uscan.
+
+ [ Michael Meskes ]
+ * Updated to internal releases 7.44.
+ * Bumped debhelper compat level to 7.
+ * Added debug package.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 02 Apr 2009 10:18:35 +0200
+
+webcit (7.43-dfsg-1) unstable; urgency=high
+
+ * New upstream version.
+ * Reworked copyright file, closes: #518500
+ * Updated Galician debconf translation, closes: #519470
+ * Updated Portuguese debconf translation, closes: #519461, #520035
+ * Updated Russian debconf translation, closes: #519477
+ * Updated German debconf translation, closes: #519475
+ * Bumpared Standards-Version to 3.8.1, no changes needed.
+
+ -- Michael Meskes <meskes at debian.org> Wed, 18 Mar 2009 12:00:40 +0100
+
+webcit (7.42-dfsg-1) unstable; urgency=high
+
+ * New upstream version, closes: #517579
+ * Updated versioned dependencies.
+ * We have to keep urgency high because 7.38b-dfsg-2 didn't migrate to
+ testing.
+ * Changed watch file to account for an additional letter in the version
+ number if present.
+ * Create static.local directory under /var/lib/citadel-webcit for local
+ installation of themes etc.
+ * Reworked debconf setup.
+ * Improved debconf template by incorporating ideas from Christian Perrier
+ <bubulle at debian.org>.
+ * Updated Vietnamese debconf translation, closes: #518273
+ * Updated Swedish debconf translation, closes: #518328
+ * Updated Finish debconf translation, closes: #518663
+ * Updated French debconf translation, closes: #518918
+ * Updated Czech debconf translation, closes: #518991
+ * Updated Italian debconf translation, closes: #519176
+ * Updated Russian debconf translation, closes: #519303
+
+ -- Michael Meskes <meskes at debian.org> Tue, 03 Mar 2009 12:44:02 +0100
+
+webcit (7.38b-dfsg-2) unstable; urgency=high
+
+ * r7104..7107 remove unneeded parameters to embeddable calendar.
+ * Urgency set to "high" because this fixes a security hole.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 12 Feb 2009 13:09:24 +0100
+
+webcit (7.38b-dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+ * Removed all prepatches.
+
+ -- Michael Meskes <meskes at debian.org> Tue, 09 Dec 2008 14:38:18 +0100
+
+webcit (7.37-dfsg-6) unstable; urgency=medium
+
+ * Added missing build dependency on libssl-dev causing citadel-webcit to not
+ start correctly.
+
+ -- Michael Meskes <meskes at debian.org> Wed, 12 Nov 2008 12:47:19 +0100
+
+webcit (7.37-dfsg-5) unstable; urgency=low
+
+ * Added manpage for webcit.
+ * Removed absolute paths in postinst script to make lintian happy.
+ * Do not install local scriptaculous javascript library, but depend on
+ package providing this library.
+ * Build depend on autotools-dev to provide up-to-date config.{sub|guess}
+ files.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 11 Sep 2008 11:51:27 +0200
+
+webcit (7.37-dfsg-4) unstable; urgency=low
+
+ [Wilfried Goesgens]
+ * Cleanup apache config hooks on purge; closes: #498556
+
+ [ Michael Meskes ]
+ * Fixed filename in postinst, it's webcit.conf not citadel-webcit.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 11 Sep 2008 11:27:39 +0200
+
+webcit (7.37-dfsg-3) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * [r6563] add prepatch from devel branch to improve vcard interoperability
+ with other UI clients; this fixed citadel bug 429
+
+ -- Michael Meskes <meskes at debian.org> Wed, 03 Sep 2008 11:01:14 +0200
+
+webcit (7.37-dfsg-2) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * [r6407] add prepatch from devel branch that lets webcit rate userpasswords
+ instad of layer 9
+ * [r6414] add prepatch from devel branch tweaking serv_prinf
+ * [r6425] add prepatch from devel branch fixing URL Parsing
+ * [r6443] add prepatch from devel branch fixing IM Window bug, closes: #493449
+ * [r6476] add prepatch from devel branch closing memleak
+
+ [ Michael Meskes ]
+ * Moved update of config.{sub,guess} to configure target.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 15 Aug 2008 14:25:03 +0200
+
+webcit (7.37-dfsg-1) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * New upstream version.
+ * Fix init script to add the bind-ip to the commandline.
+
+ [ Michael Meskes ]
+ * Added Swedish translation, closes: #487595
+ * Updated Portuguese translation, closes: #488580
+ * Removed Open-Id logo from upstream tarball because it doesn't seem to
+ carry a license.
+ * Bumped versioned build dependency.
+
+ -- Michael Meskes <meskes at debian.org> Tue, 24 Jun 2008 13:43:32 +0200
+
+webcit (7.36-2) unstable; urgency=low
+
+ * Bumped versioned build dependency, closes: #485844
+
+ -- Michael Meskes <meskes at debian.org> Thu, 12 Jun 2008 09:50:53 +0200
+
+webcit (7.36-1) unstable; urgency=low
+
+ * New upstream version.
+ * Removed URL handler patch, no longer needed.
+ * Bumped standards to 3.8.0.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 06 Jun 2008 11:54:01 +0200
+
+webcit (7.35-3) unstable; urgency=low
+
+ [ Michael Meskes ]
+ * Updated Galician translation, closes: #480991
+ * Updated Basque translation, closes: #483234
+
+ [ Wilfried Goesgens ]
+ * Added upstream bugfix in URL handler
+
+ -- Michael Meskes <meskes at debian.org> Tue, 13 May 2008 15:03:01 +0200
+
+webcit (7.35-2) unstable; urgency=low
+
+ * Added Italian translation, closes: #477716
+ * Added Russian translation, closes: #479151
+ * Added Czech translation, closes: #480199
+ * Updated French translation, closes: #480388
+
+ -- Michael Meskes <meskes at debian.org> Fri, 25 Apr 2008 10:05:02 +0200
+
+webcit (7.35-1) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * new upstream version
+ * removed prepatches
+
+ [ Michael Meskes ]
+ * Added French translation, closes: #477126
+ * Added Vietnamese translation, closes: #477336
+ * Made package build depend on libcitadel-dev >= 1.09.
+ * Added watch file.
+
+ -- Michael Meskes <meskes at debian.org> Thu, 24 Apr 2008 09:50:59 +0200
+
+webcit (7.34-dfsg-2) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * Remove static/prototype.js from the package and depend on libjs-prototype,
+ closes: #475272
+ * Link over prototype.js from libjs-prototype to webcit directory.
+
+ [ Michael Meskes ]
+ * Fixed some problems in the debconf templates, closes: #475420, #475421
+ * Added Portuguese translation, closes: #475447
+ * Added German translation, closes: #475419
+ * Added Basque translation, closes: #475606
+ * Added Galician translation, closes: #475597
+ * Added Finish translation, closes: #475666
+ * Removed one debconf question and added a README saying the same.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 11 Apr 2008 20:56:28 +0200
+
+webcit (7.34-dfsg-1) unstable; urgency=low
+
+ * New upstream version
+ * Added upstream's patch to rename webserver to webcit.
+ * Changed Debian files accordingly.
+
+ -- Michael Meskes <meskes at debian.org> Fri, 04 Apr 2008 08:58:49 +0200
+
+webcit (7.33-1) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * recommend shared mime info
+ * suggest gnome-icon-theme and symlink its 24x24 icons into
+ /usr/share/citadel-webcit/static/icons so webcit can display them for
+ files with mime extensions
+
+ [ Michael Meskes ]
+ * Changed maintainer to Debian Citadel Team.
+ * Changed priority to extra.
+ * New upstream version.
+ * Do not ignore errors in clean target.
+ * Bumped Standards-Version.
+ * Call debconf-updatepo in clean target.
+ * Automatically update autoconf helper files.
+
+ -- Michael Meskes <meskes at debian.org> Sat, 22 Mar 2008 17:17:25 +0100
+
+webcit (7.31-27) unstable; urgency=high
+
+ * initial mime detection support
+ * don't nail the users to GIF
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Tue, 12 Feb 2008 0:00:00 +0001
+
+webcit (7.30-26) unstable; urgency=high
+
+ * Fix room admin dialog
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Wed, 6 Feb 2008 20:00:00 +0001
+
+webcit (7.30-25) unstable; urgency=high
+
+ * New citadel version.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 1 Feb 2008 10:00:00 +0001
+
+webcit (7.24-24) unstable; urgency=high
+
+ * fixed missing locales and image calculation
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Wed, 21 Nov 2007 0:01:21 +0002
+
+webcit (7.24-23) unstable; urgency=high
+
+ * crash in notes fixed.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 16 Nov 2007 0:01:21 +0002
+
+webcit (7.23-22) unstable; urgency=high
+
+ * fix some IE rendering bugs
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Thu, 8 Nov 2007 23:01:21 +0002
+
+webcit (7.22-21) unstable; urgency=high
+
+ * fixed ssl related directory access crash
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Tue, 30 Oct 2007 18:10:00 +0002
+
+webcit (7.22-20) unstable; urgency=high
+
+ * Lots of stylesheet fixes. Performance improvements.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Thu, 25 Oct 2007 18:10:00 +0002
+
+webcit (7.13-19) unstable; urgency=high
+
+ * update to actual Webcit release. Fix several conditions of CPU abuse.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 3 Aug 2007 18:10:00 +0002
+
+webcit (7.12-18) unstable; urgency=high
+
+ * update to actual Citadel SVN. many new features. see Packages changelog.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Sun, 8 Jul 2007 8:10:00 +0000
+
+webcit (7.11-17) unstable; urgency=high
+
+ * update to actual Citadel SVN. many new features. see Packages changelog.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 6 Jul 2007 22:10:00 +0000
+
+webcit (7.07-0ubuntu1) unstable; urgency=low
+
+ * initial ubuntu release.
+
+ -- Wilfried Goesgens <w.goesgens at outgesourced.org> Fri, 06 Apr 2007 19:07:00 +0000
+
Deleted: webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff
===================================================================
--- webcit/trunk/debian/patches/743-744.diff 2009-04-02 09:18:33 UTC (rev 326)
+++ webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff 2009-04-03 07:59:16 UTC (rev 328)
@@ -1,806 +0,0 @@
-diff -ruN webcit-7.43-dfsg.orig/availability.c webcit-7.43-dfsg/availability.c
---- webcit-7.43-dfsg.orig/availability.c 2009-02-20 19:31:00.000000000 +0100
-+++ webcit-7.43-dfsg/availability.c 2009-04-01 12:10:42.000000000 +0200
-@@ -54,29 +54,42 @@
- if (icaltime_is_null_time(t1start)) return(0);
- if (icaltime_is_null_time(t2start)) return(0);
-
-- /* First, check for all-day events */
-- if (t1start.is_date) {
-- if (!icaltime_compare_date_only(t1start, t2start)) {
-- return(1);
-- }
-- if (!icaltime_is_null_time(t2end)) {
-- if (!icaltime_compare_date_only(t1start, t2end)) {
-- return(1);
-- }
-+ /* if either event lacks end time, assume end = start */
-+ if (icaltime_is_null_time(t1end))
-+ memcpy(&t1end, &t1start, sizeof(struct icaltimetype));
-+ else {
-+ if (t1end.is_date && icaltime_compare(t1start, t1end)) {
-+ /*
-+ * the end date is non-inclusive so adjust it by one
-+ * day because our test is inclusive, note that a day is
-+ * not too much because we are talking about all day
-+ * events
-+ * if start = end we assume that nevertheless the whole
-+ * day is meant
-+ */
-+ icaltime_adjust(&t1end, -1, 0, 0, 0);
- }
- }
-
-- if (t2start.is_date) {
-- if (!icaltime_compare_date_only(t2start, t1start)) {
-- return(1);
-- }
-- if (!icaltime_is_null_time(t1end)) {
-- if (!icaltime_compare_date_only(t2start, t1end)) {
-- return(1);
-- }
-+ if (icaltime_is_null_time(t2end))
-+ memcpy(&t2end, &t2start, sizeof(struct icaltimetype));
-+ else {
-+ if (t2end.is_date && icaltime_compare(t2start, t2end)) {
-+ icaltime_adjust(&t2end, -1, 0, 0, 0);
- }
- }
-
-+ /* First, check for all-day events */
-+ if (t1start.is_date || t2start.is_date) {
-+ /* If event 1 ends before event 2 starts, we're in the clear. */
-+ if (icaltime_compare_date_only(t1end, t2start) < 0) return(0);
-+
-+ /* If event 2 ends before event 1 starts, we're also ok. */
-+ if (icaltime_compare_date_only(t2end, t1start) < 0) return(0);
-+
-+ return(1);
-+ }
-+
- /* lprintf (9, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
- t1start.hour, t1start.minute, t1end.hour, t1end.minute,
- t2start.hour, t2start.minute, t2end.hour, t2end.minute);
-@@ -84,10 +97,6 @@
-
- /* Now check for overlaps using date *and* time. */
-
-- /* First, bail out if either event 1 or event 2 is missing end time. */
-- if (icaltime_is_null_time(t1end)) return(0);
-- if (icaltime_is_null_time(t2end)) return(0);
--
- /* If event 1 ends before event 2 starts, we're in the clear. */
- if (icaltime_compare(t1end, t2start) <= 0) return(0);
- /* lprintf(9, "first passed\n"); */
-diff -ruN webcit-7.43-dfsg.orig/calendar_view.c webcit-7.43-dfsg/calendar_view.c
---- webcit-7.43-dfsg.orig/calendar_view.c 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/calendar_view.c 2009-04-01 12:10:42.000000000 +0200
-@@ -163,6 +163,7 @@
- struct icaltimetype end_t;
- struct icaltimetype today_start_t;
- struct icaltimetype today_end_t;
-+ struct icaltimetype today_t;
- struct tm starting_tm;
- struct tm ending_tm;
- int all_day_event = 0;
-@@ -200,6 +201,14 @@
- today_end_t.is_utc = 1;
-
- /*
-+ * Create another one without caring about the timezone for all day events.
-+ */
-+ today_t = icaltime_null_date();
-+ today_t.year = year;
-+ today_t.month = month;
-+ today_t.day = day;
-+
-+ /*
- * Now loop through our list of events to see which ones occur today.
- */
- Pos = GetNewHashPos(WCC->disp_cal_items, 0);
-@@ -224,7 +233,7 @@
-
- if (all_day_event)
- {
-- show_event = ((t.year == year) && (t.month == month) && (t.day == day));
-+ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
- }
- else
- {
-@@ -236,6 +245,10 @@
- */
- if (show_event) {
- p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
-+ if (p == NULL) {
-+ p = icalproperty_new_summary(_("Untitled Event"));
-+ icalcomponent_add_property(Cal->cal, p);
-+ }
- if (p != NULL) {
-
- if (all_day_event) {
-@@ -275,33 +288,62 @@
-
- q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
- if (q != NULL) {
-+ int no_end = 0;
-+
- t = icalproperty_get_dtstart(q);
--
-+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
-+ if (q != NULL) {
-+ end_t = icalproperty_get_dtend(q);
-+ }
-+ else {
-+ /*
-+ * events with starting date/time equal
-+ * ending date/time might get only
-+ * DTSTART but no DTEND
-+ */
-+ no_end = 1;
-+ }
-+
- if (t.is_date) {
-+ /* all day event */
- struct tm d_tm;
-- char d_str[32];
-+
-+ if (!no_end) {
-+ /* end given, have to adjust it */
-+ icaltime_adjust(&end_t, -1, 0, 0, 0);
-+ }
- memset(&d_tm, 0, sizeof d_tm);
- d_tm.tm_year = t.year - 1900;
- d_tm.tm_mon = t.month - 1;
- d_tm.tm_mday = t.day;
-- wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
-- wprintf("<i>%s</i> %s<br>",
-- _("Date:"), d_str);
-+ wc_strftime(buf, sizeof buf, "%x", &d_tm);
-+
-+ if (no_end || !icaltime_compare(t, end_t)) {
-+ wprintf("<i>%s</i> %s<br>",
-+ _("Date:"), buf);
-+ }
-+ else {
-+ wprintf("<i>%s</i> %s<br>",
-+ _("Starting date:"), buf);
-+ d_tm.tm_year = end_t.year - 1900;
-+ d_tm.tm_mon = end_t.month - 1;
-+ d_tm.tm_mday = end_t.day;
-+ wc_strftime(buf, sizeof buf, "%x", &d_tm);
-+ wprintf("<i>%s</i> %s<br>",
-+ _("Ending date:"), buf);
-+ }
- }
- else {
- tt = icaltime_as_timet(t);
- webcit_fmt_date(buf, tt, DATEFMT_BRIEF);
-- wprintf("<i>%s</i> %s<br>",
-- _("Starting date/time:"), buf);
--
-- /*
-- * Embed the 'show end date/time' loop inside here so it
-- * only executes if this is NOT an all day event.
-- */
-- q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
-- if (q != NULL) {
-- t = icalproperty_get_dtend(q);
-- tt = icaltime_as_timet(t);
-+ if (no_end || !icaltime_compare(t, end_t)) {
-+ wprintf("<i>%s</i> %s<br>",
-+ _("Date/time:"), buf);
-+ }
-+ else {
-+ wprintf("<i>%s</i> %s<br>",
-+ _("Starting date/time:"), buf);
-+ tt = icaltime_as_timet(end_t);
- webcit_fmt_date(buf, tt, DATEFMT_BRIEF);
- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
- }
-@@ -400,6 +442,10 @@
- p = icalcomponent_get_first_property(
- Cal->cal,
- ICAL_SUMMARY_PROPERTY);
-+ if (p == NULL) {
-+ p = icalproperty_new_summary(_("Untitled Event"));
-+ icalcomponent_add_property(Cal->cal, p);
-+ }
- e = icalcomponent_get_first_property(
- Cal->cal,
- ICAL_DTEND_PROPERTY);
-@@ -770,6 +816,7 @@
- struct icaltimetype end_t;
- struct icaltimetype today_start_t;
- struct icaltimetype today_end_t;
-+ struct icaltimetype today_t;
- struct tm starting_tm;
- struct tm ending_tm;
- int top = 0;
-@@ -780,8 +827,6 @@
- int endmin = 0;
-
- char buf[256];
-- struct tm d_tm;
-- char d_str[32];
-
- if (GetCount(WCC->disp_cal_items) == 0) {
- /* nothing to display */
-@@ -809,6 +854,14 @@
- today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
- today_end_t.is_utc = 1;
-
-+ /*
-+ * Create another one without caring about the timezone for all day events.
-+ */
-+ today_t = icaltime_null_date();
-+ today_t.year = year;
-+ today_t.month = month;
-+ today_t.day = day;
-+
- /* Now loop through our list of events to see which ones occur today.
- */
- Pos = GetNewHashPos(WCC->disp_cal_items, 0);
-@@ -827,29 +880,46 @@
- else {
- memset(&t, 0, sizeof t);
- }
-+
-+ if (t.is_date) all_day_event = 1;
-+
- q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
- if (q != NULL) {
- end_t = icalproperty_get_dtend(q);
-- event_tte = icaltime_as_timet(end_t);
-- localtime_r(&event_tte, &event_tm);
- }
- else {
-- memset(&end_t, 0, sizeof end_t);
-+ /* no end given means end = start */
-+ memcpy(&end_t, &t, sizeof(struct icaltimetype));
- }
-- if (t.is_date) all_day_event = 1;
-
- if (all_day_event)
- {
-- show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events));
-+ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
-+ if (icaltime_compare(t, end_t)) {
-+ /*
-+ * the end date is non-inclusive so adjust it by one
-+ * day because our test is inclusive, note that a day is
-+ * not to much because we are talking about all day
-+ * events
-+ */
-+ icaltime_adjust(&end_t, -1, 0, 0, 0);
-+ }
- }
- else
- {
- show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
- }
-
-+ event_tte = icaltime_as_timet(end_t);
-+ localtime_r(&event_tte, &event_tm);
-+
- /* If we determined that this event occurs today, then display it.
- */
- p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY);
-+ if (p == NULL) {
-+ p = icalproperty_new_summary(_("Untitled Event"));
-+ icalcomponent_add_property(Cal->cal, p);
-+ }
-
- if ((show_event) && (p != NULL)) {
-
-@@ -874,13 +944,17 @@
- wprintf("<i>%s</i> ", _("Location:"));
- escputs((char *)icalproperty_get_comment(q));
- wprintf("<br />");
-- }
-- memset(&d_tm, 0, sizeof d_tm);
-- d_tm.tm_year = t.year - 1900;
-- d_tm.tm_mon = t.month - 1;
-- d_tm.tm_mday = t.day;
-- wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
-- wprintf("<i>%s</i> %s<br>",_("Date:"), d_str);
-+ }
-+ if (!icaltime_compare(t, end_t)) { /* one day only */
-+ webcit_fmt_date(buf, event_tt, DATEFMT_LOCALEDATE);
-+ wprintf("<i>%s</i> %s<br>", _("Date:"), buf);
-+ }
-+ else {
-+ webcit_fmt_date(buf, event_tt, DATEFMT_LOCALEDATE);
-+ wprintf("<i>%s</i> %s<br>", _("Starting date:"), buf);
-+ webcit_fmt_date(buf, event_tte, DATEFMT_LOCALEDATE);
-+ wprintf("<i>%s</i> %s<br>", _("Ending date:"), buf);
-+ }
- q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
- if (q) {
- wprintf("<i>%s</i> ", _("Notes:"));
-@@ -992,10 +1066,16 @@
- escputs((char *)icalproperty_get_comment(q));
- wprintf("<br />");
- }
-- webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
-- wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
-- webcit_fmt_date(buf, event_tte, DATEFMT_BRIEF);
-- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
-+ if (!icaltime_compare(t, end_t)) { /* one day only */
-+ webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
-+ wprintf("<i>%s</i> %s<br>", _("Date/time:"), buf);
-+ }
-+ else {
-+ webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
-+ wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
-+ webcit_fmt_date(buf, event_tte, DATEFMT_BRIEF);
-+ wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
-+ }
- q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
- if (q) {
- wprintf("<i>%s</i> ", _("Notes:"));
-@@ -1294,6 +1374,10 @@
- ) {
-
- p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
-+ if (p == NULL) {
-+ p = icalproperty_new_summary(_("Untitled Task"));
-+ icalcomponent_add_property(Cal->cal, p);
-+ }
- if (p != NULL) {
-
-
-diff -ruN webcit-7.43-dfsg.orig/configure.ac webcit-7.43-dfsg/configure.ac
---- webcit-7.43-dfsg.orig/configure.ac 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/configure.ac 2009-04-01 12:11:50.000000000 +0200
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
--dnl $Id: configure.ac 7220 2009-03-17 03:22:44Z ajc $
--AC_INIT([WebCit], [7.43], [http://www.citadel.org/])
-+dnl $Id: configure.ac 7281 2009-03-30 21:48:20Z ajc $
-+AC_INIT([WebCit], [7.44], [http://www.citadel.org/])
-
-
- AC_SUBST(PROG_SUBDIRS)
-diff -ruN webcit-7.43-dfsg.orig/event.c webcit-7.43-dfsg/event.c
---- webcit-7.43-dfsg.orig/event.c 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/event.c 2009-04-01 12:10:42.000000000 +0200
-@@ -242,25 +242,34 @@
- }
- }
- else {
-- /*
-- * If this is an all-day-event, set the end time to be identical to
-- * the start time (the hour/minute/second will be set to midnight).
-- * Otherwise extract or create it.
-- */
-- if (t_start.is_date) {
-- t_end = t_start;
-+ if (created_new_vevent == 1) {
-+ /* set default duration */
-+ if (t_start.is_date) {
-+ /*
-+ * If this is an all-day-event, set the end time to be identical to
-+ * the start time (the hour/minute/second will be set to midnight).
-+ */
-+ t_end = t_start;
-+ }
-+ else {
-+ /*
-+ * If this is not an all-day event and there is no
-+ * end time specified, make the default one hour
-+ * from the start time.
-+ */
-+ t_end = t_start;
-+ t_end.hour += 1;
-+ t_end.second = 0;
-+ t_end = icaltime_normalize(t_end);
-+ /* t_end = icaltime_from_timet(now, 0); */
-+ }
- }
- else {
- /*
-- * If this is not an all-day event and there is no
-- * end time specified, make the default one hour
-- * from the start time.
-+ * If an existing event has no end date/time this is
-+ * supposed to mean end = start.
- */
- t_end = t_start;
-- t_end.hour += 1;
-- t_end.second = 0;
-- t_end = icaltime_normalize(t_end);
-- /* t_end = icaltime_from_timet(now, 0); */
- }
- }
- display_icaltimetype_as_webform(&t_end, "dtend", 0);
-diff -ruN webcit-7.43-dfsg.orig/fmt_date.c webcit-7.43-dfsg/fmt_date.c
---- webcit-7.43-dfsg.orig/fmt_date.c 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/fmt_date.c 2009-04-01 12:10:42.000000000 +0200
-@@ -67,6 +67,7 @@
- * show the month and day, and the time
- * older than 6 months, show only the date
- * DATEFMT_RAWDATE: show full date, regardless of age
-+ * DATEFMT_LOCALEDATE: show full date as prefered for the locale
- */
-
- switch (Format) {
-@@ -98,6 +99,9 @@
- case DATEFMT_RAWDATE:
- wc_strftime(buf, 32, "%a %b %d %Y", &tm);
- break;
-+ case DATEFMT_LOCALEDATE:
-+ wc_strftime(buf, 32, "%x", &tm);
-+ break;
- }
- }
-
-diff -ruN webcit-7.43-dfsg.orig/messages.c webcit-7.43-dfsg/messages.c
---- webcit-7.43-dfsg.orig/messages.c 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/messages.c 2009-04-01 12:10:42.000000000 +0200
-@@ -399,6 +399,7 @@
- long len;
- int n;
- int skipit;
-+ const char *Ptr;
-
- if (WCC->summ != NULL) {
- DeleteHash(&WCC->summ);
-@@ -408,23 +409,24 @@
-
- Buf = NewStrBuf();
- serv_puts(servcmd);
-- StrBuf_ServGetln(Buf);
-+ StrBuf_ServGetlnBuffered(Buf);
- if (GetServerStatus(Buf, NULL) != 1) {
- FreeStrBuf(&Buf);
- return (nummsgs);
- }
- Buf2 = NewStrBuf();
-- while (len = StrBuf_ServGetln(Buf),
-+ while (len = StrBuf_ServGetlnBuffered(Buf),
- ((len != 3) ||
- strcmp(ChrPtr(Buf), "000")!= 0))
- {
- if (nummsgs < maxload) {
- skipit = 0;
-+ Ptr = NULL;
- Msg = (message_summary*)malloc(sizeof(message_summary));
- memset(Msg, 0, sizeof(message_summary));
-
-- Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
-- Msg->date = StrBufExtract_long(Buf, 1, '|');
-+ Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
-+ Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
- /*
- * as citserver probably gives us messages in forward date sorting
- * nummsgs should be the same order as the message date.
-@@ -436,14 +438,14 @@
- }
- if (!skipit) {
- Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
-- StrBufExtract_token(Buf2, Buf, 2, '|');
-+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
- if (StrLength(Buf2) != 0) {
- /** Handle senders with RFC2047 encoding */
- StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
- }
-
- /** Nodename */
-- StrBufExtract_token(Buf2, Buf, 3, '|');
-+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
- if ((StrLength(Buf2) !=0 ) &&
- ( ((WCC->room_flags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
-@@ -456,9 +458,9 @@
- /** Not used:
- StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
- */
--
-+ StrBufSkip_NTokenS(Buf, &Ptr, '|', 1);
- Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
-- StrBufExtract_token(Buf2, Buf, 5, '|');
-+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
- if (StrLength(Buf2) == 0)
- StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
- else {
-@@ -1158,9 +1160,10 @@
- {
- const StrBuf *ref = sbstr("references");
- references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
-- lprintf(9, "Converting: %s\n", ChrPtr(references));
-+ if (*ChrPtr(references) == '|') { /* remove leading '|' if present */
-+ StrBufCutLeft(references, 1);
-+ }
- StrBufReplaceChars(references, '|', '!');
-- lprintf(9, "Converted: %s\n", ChrPtr(references));
- }
- if (havebstr("subject")) {
- const StrBuf *Subj;
-diff -ruN webcit-7.43-dfsg.orig/msg_renderers.c webcit-7.43-dfsg/msg_renderers.c
---- webcit-7.43-dfsg.orig/msg_renderers.c 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/msg_renderers.c 2009-04-01 12:10:42.000000000 +0200
-@@ -1132,7 +1132,7 @@
- RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM, CTX_MAILSUM);
- RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, CTX_MAILSUM);
- RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
-- RegisterNamespace("MAIL:SUMM:REFIDS", 0, 0, tmplput_MAIL_SUMM_REFIDS, CTX_MAILSUM);
-+ RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS, CTX_MAILSUM);
- RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO, CTX_MAILSUM);
- RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY, CTX_MAILSUM);
- RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY, CTX_NONE);
-diff -ruN webcit-7.43-dfsg.orig/paging.c webcit-7.43-dfsg/paging.c
---- webcit-7.43-dfsg.orig/paging.c 2009-02-20 19:31:00.000000000 +0100
-+++ webcit-7.43-dfsg/paging.c 2009-04-01 12:10:42.000000000 +0200
-@@ -1,15 +1,11 @@
- /*
- * $Id: paging.c 6912 2009-01-08 23:11:56Z dothebart $
- */
--/**
-- * \defgroup PageFunc Functions which implement the chat and paging facilities.
-- * \ingroup ClientPower
-- */
--/*@{*/
-+
- #include "webcit.h"
-
--/**
-- * \brief display the form for paging (x-messaging) another user
-+/*
-+ * display the form for paging (x-messaging) another user
- */
- void display_page(void)
- {
-@@ -501,6 +497,25 @@
- wDumpContent(0);
- }
-
-+
-+void ajax_send_instant_message(void) {
-+ char recp[256];
-+ char buf[256];
-+
-+ safestrncpy(recp, bstr("recp"), sizeof recp);
-+
-+ serv_printf("SEXP %s|-", recp);
-+ serv_getln(buf, sizeof buf);
-+
-+ if (buf[0] == '4') {
-+ text_to_server(bstr("msg"));
-+ serv_puts("000");
-+ }
-+
-+ escputs(buf); /* doesn't really matter what we return - the client ignores it */
-+}
-+
-+
- void
- InitModule_PAGING
- (void)
-@@ -510,6 +525,5 @@
- WebcitAddUrlHandler(HKEY("chat"), do_chat, 0);
- WebcitAddUrlHandler(HKEY("chat_recv"), chat_recv, 0);
- WebcitAddUrlHandler(HKEY("chat_send"), chat_send, 0);
-+ WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), ajax_send_instant_message, AJAX);
- }
--
--/*@}*/
-diff -ruN webcit-7.43-dfsg.orig/po/es.po webcit-7.43-dfsg/po/es.po
---- webcit-7.43-dfsg.orig/po/es.po 2009-03-17 04:27:26.000000000 +0100
-+++ webcit-7.43-dfsg/po/es.po 2009-04-01 12:10:42.000000000 +0200
-@@ -4,7 +4,8 @@
- #
- # Spanish translation
- # Copyright (C) 2005 - 2009 By Gabriel C. Huertas
--# This file is distributed under GPL v2 <TODO>
-+# This file is distributed under the GNU General Public License;
-+# either Version 2 or (at your option) any later version.
- #
- #, fuzzy
- msgid ""
-diff -ruN webcit-7.43-dfsg.orig/README.txt webcit-7.43-dfsg/README.txt
---- webcit-7.43-dfsg.orig/README.txt 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/README.txt 2009-04-01 12:10:42.000000000 +0200
-@@ -1,5 +1,5 @@
- WEBCIT for the Citadel System
-- version 7.43
-+ version 7.44
-
- Copyright (C) 1996-2009 by the authors. Portions written by:
-
-diff -ruN webcit-7.43-dfsg.orig/roomops.c webcit-7.43-dfsg/roomops.c
---- webcit-7.43-dfsg.orig/roomops.c 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/roomops.c 2009-04-01 12:10:42.000000000 +0200
-@@ -4020,30 +4020,23 @@
-
- switch(WCC->wc_view) {
- case VIEW_BBS:
-- return TP->Tokens->Params[2]->Start[7]=='B';
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
- case VIEW_MAILBOX:
-- return TP->Tokens->Params[2]->Start[7]=='M';
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
- case VIEW_ADDRESSBOOK:
-- return TP->Tokens->Params[2]->Start[7]=='A';
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
- case VIEW_TASKS:
-- return TP->Tokens->Params[2]->Start[7]=='T';
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
- case VIEW_NOTES:
-- return TP->Tokens->Params[2]->Start[7]=='N';
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
- case VIEW_WIKI:
-- return TP->Tokens->Params[2]->Start[7]=='W';
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
- case VIEW_JOURNAL:
-- return TP->Tokens->Params[2]->Start[7]=='J';
--
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
- case VIEW_CALENDAR:
-- if (TP->Tokens->Params[2]->len < 13)
-- return 0;
-- return TP->Tokens->Params[2]->Start[10]=='E';
--
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
- case VIEW_CALBRIEF:
-- if (TP->Tokens->Params[3]->len < 13)
-- return 0;
-- return TP->Tokens->Params[2]->Start[10]=='B';
--
-+ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
- default:
- return 0;
- }
-diff -ruN webcit-7.43-dfsg.orig/static/instant_messenger.html webcit-7.43-dfsg/static/instant_messenger.html
---- webcit-7.43-dfsg.orig/static/instant_messenger.html 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/static/instant_messenger.html 2009-04-01 12:10:42.000000000 +0200
-@@ -55,8 +55,9 @@
-
- // Send the text to the server
- parms = 'r=' + Math.random()
-- + '&g_cmd=SEXP ' + recipient + '|-\n' + escape(thetext);
-- new Ajax.Request('../ajax_servcmd',
-+ + '&recp=' + recipient
-+ + '&msg=' + encodeURIComponent(thetext);
-+ new Ajax.Request('../ajax_send_instant_message',
- {
- method: 'post',
- parameters: parms
-diff -ruN webcit-7.43-dfsg.orig/static/summaryview.js webcit-7.43-dfsg/static/summaryview.js
---- webcit-7.43-dfsg.orig/static/summaryview.js 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/static/summaryview.js 2009-04-01 12:10:42.000000000 +0200
-@@ -272,6 +272,7 @@
- method: 'post',
- parameters: 'g_cmd=SEEN ' + msgId + '|1',
- onComplete: CtdlMarkRowAsRead(parent)});
-+ // If the shift key modifier is used, mark a range...
- } else if (event.button != 2 && event.shiftKey) {
- markRow(parent);
- var rowId = parent.ctdlRowId;
-@@ -288,8 +289,14 @@
- WCLog("Marking row "+x);
- markRow(rowArray[x]);
- }
-+ // If the ctrl key modifier is used, toggle one message
- } else if (event.button != 2 && (event.ctrlKey || event.altKey)) {
-- markRow(parent);
-+ if (parent.ctdlMarked == true) {
-+ unmarkRow(parent);
-+ }
-+ else {
-+ markRow(parent);
-+ }
- }
- }
- function CtdlMarkRowAsRead(rowElement) {
-@@ -338,7 +345,7 @@
- currentSorterToggle.className = "";
- }
- }
--function markRow( row) {
-+function markRow(row) {
- var msgId = row.ctdlMsgId;
- row.className = row.className += " marked_row";
- row.ctdlMarked = true;
-diff -ruN webcit-7.43-dfsg.orig/static/t/richedit.html webcit-7.43-dfsg/static/t/richedit.html
---- webcit-7.43-dfsg.orig/static/t/richedit.html 2009-02-20 19:30:59.000000000 +0100
-+++ webcit-7.43-dfsg/static/t/richedit.html 2009-04-01 12:10:42.000000000 +0200
-@@ -6,7 +6,7 @@
- browsers : "msie,gecko,safari,opera",
- theme : "advanced",
- plugins : "iespell",
-- theme_advanced_buttons1 : "bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code",
-+ theme_advanced_buttons1 : "bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, blockquote, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code",
- theme_advanced_buttons2 : "",
- theme_advanced_buttons3 : "",
- content_css : "static/webcit-tinymce.css"
-diff -ruN webcit-7.43-dfsg.orig/static/t/view_message.html webcit-7.43-dfsg/static/t/view_message.html
---- webcit-7.43-dfsg.orig/static/t/view_message.html 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/static/t/view_message.html 2009-04-01 12:10:42.000000000 +0200
-@@ -12,35 +12,26 @@
- <?!("COND:MAIL:ANON", 4)>****<??("X", 4)>
- <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
- <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
--<?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p><??("X", 7)>
-+<?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT("X")></p><??("X", 7)>
- <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
--
--<?!("COND:MAIL:SUMM:RFCA", 8)>
-- <??("COND:ROOM:TYPE_IS", 9, "VIEW_BBS")>
-- <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-- <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
-- <a href="display_enter?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
-- <??("X", 9)>
--
-- <?!("COND:ROOM:TYPE_IS", 10, "VIEW_BBS")>
-- <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-- <a href="display_enter?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
-- <?!("X", 10)>
-+<?!("COND:ROOM:TYPE_IS", 8, "VIEW_BBS")>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
- <?!("X", 8)>
--<??("COND:MAIL:SUMM:RFCA", 11)>
-- <??("COND:ROOM:TYPE_IS", 12, "VIEW_BBS")>
-- <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-- <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>%2C<?MAIL:SUMM:ALLRCPT("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
-- <a href="display_enter?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
-- <??("X", 12)>
--
-- <?!("COND:ROOM:TYPE_IS", 13, "VIEW_BBS")>
-- <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-- <a href="display_enter?replyquote=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
-- <?!("X", 13)>
--<??("X", 11)>
-- <a href="confirm_move_msg?msgid=<?MAIL:SUMM:N>"><span>[</span><?_("Move")><span>]</span></a>
-+<??("COND:ROOM:TYPE_IS", 9, "VIEW_BBS")>
-+ <?!("COND:MAIL:SUMM:RFCA", 10)>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
-+ <?!("X", 10)>
-+ <??("COND:MAIL:SUMM:RFCA", 11)>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
-+ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?fwdquote=<?MAIL:SUMM:N>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
-+ <??("X", 11)>
-+<??("X", 9)>
- <?!("COND:ROOM:EDITACCESS", 14)>
-+ <a href="confirm_move_msg?msgid=<?MAIL:SUMM:N>"><span>[</span><?_("Move")><span>]</span></a>
- <a href="delete_msg?msgid=<?MAIL:SUMM:N>" onclick="return confirm('<?_("Delete this message?")>');"><span>[</span><?_("Delete")><span>]</span> </a>
- <??("X", 14)>
- <a href="#" onclick="window.open('msgheaders/<?MAIL:SUMM:N>', 'headers<?MAIL:SUMM:N>', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); "><span>[</span><?_("Headers")><span>]</span></a>
-diff -ruN webcit-7.43-dfsg.orig/webcit.c webcit-7.43-dfsg/webcit.c
---- webcit-7.43-dfsg.orig/webcit.c 2009-02-20 19:31:00.000000000 +0100
-+++ webcit-7.43-dfsg/webcit.c 2009-04-01 12:10:42.000000000 +0200
-@@ -845,6 +845,8 @@
- MINIMUM_CIT_VERSION / 100,
- MINIMUM_CIT_VERSION % 100
- );
-+ hprintf("HTTP/1.1 200 OK\r\n");
-+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
- end_burst();
- end_webcit_session();
- goto SKIP_ALL_THIS_CRAP;
-diff -ruN webcit-7.43-dfsg.orig/webcit.h webcit-7.43-dfsg/webcit.h
---- webcit-7.43-dfsg.orig/webcit.h 2009-03-17 04:27:27.000000000 +0100
-+++ webcit-7.43-dfsg/webcit.h 2009-04-01 12:10:42.000000000 +0200
-@@ -113,9 +113,9 @@
- #define PORT_NUM 2000 /* port number to listen on */
- #define DEVELOPER_ID 0
- #define CLIENT_ID 4
--#define CLIENT_VERSION 743 /* This version of WebCit */
--#define MINIMUM_CIT_VERSION 743 /* min required Citadel ver */
- #define LIBCITADEL_MIN 743 /* min required libcitadel ver */
-+#define CLIENT_VERSION 744 /* This version of WebCit */
-+#define MINIMUM_CIT_VERSION 744 /* min required Citadel ver */
- #define DEFAULT_HOST "localhost" /* Default Citadel server */
- #define DEFAULT_PORT "504"
- #define TARGET "webcit01" /* Target for inline URL's */
-@@ -725,6 +725,7 @@
- #define DATEFMT_FULL 0
- #define DATEFMT_BRIEF 1
- #define DATEFMT_RAWDATE 2
-+#define DATEFMT_LOCALEDATE 3
- void webcit_fmt_date(char *buf, time_t thetime, int Format);
- int fetch_http(char *url, char *target_buf, int maxbytes);
- void free_attachments(wcsession *sess);
Copied: webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff (from rev 327, webcit/trunk/debian/patches/743-744.diff)
===================================================================
--- webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff (rev 0)
+++ webcit/tags/7.43-dfsg-3/debian/patches/743-744.diff 2009-04-03 07:59:16 UTC (rev 328)
@@ -0,0 +1,794 @@
+diff -ruN webcit-7.43-dfsg.orig/availability.c webcit-7.43-dfsg/availability.c
+--- webcit-7.43-dfsg.orig/availability.c 2009-02-20 19:31:00.000000000 +0100
++++ webcit-7.43-dfsg/availability.c 2009-04-01 12:10:42.000000000 +0200
+@@ -54,29 +54,42 @@
+ if (icaltime_is_null_time(t1start)) return(0);
+ if (icaltime_is_null_time(t2start)) return(0);
+
+- /* First, check for all-day events */
+- if (t1start.is_date) {
+- if (!icaltime_compare_date_only(t1start, t2start)) {
+- return(1);
+- }
+- if (!icaltime_is_null_time(t2end)) {
+- if (!icaltime_compare_date_only(t1start, t2end)) {
+- return(1);
+- }
++ /* if either event lacks end time, assume end = start */
++ if (icaltime_is_null_time(t1end))
++ memcpy(&t1end, &t1start, sizeof(struct icaltimetype));
++ else {
++ if (t1end.is_date && icaltime_compare(t1start, t1end)) {
++ /*
++ * the end date is non-inclusive so adjust it by one
++ * day because our test is inclusive, note that a day is
++ * not too much because we are talking about all day
++ * events
++ * if start = end we assume that nevertheless the whole
++ * day is meant
++ */
++ icaltime_adjust(&t1end, -1, 0, 0, 0);
+ }
+ }
+
+- if (t2start.is_date) {
+- if (!icaltime_compare_date_only(t2start, t1start)) {
+- return(1);
+- }
+- if (!icaltime_is_null_time(t1end)) {
+- if (!icaltime_compare_date_only(t2start, t1end)) {
+- return(1);
+- }
++ if (icaltime_is_null_time(t2end))
++ memcpy(&t2end, &t2start, sizeof(struct icaltimetype));
++ else {
++ if (t2end.is_date && icaltime_compare(t2start, t2end)) {
++ icaltime_adjust(&t2end, -1, 0, 0, 0);
+ }
+ }
+
++ /* First, check for all-day events */
++ if (t1start.is_date || t2start.is_date) {
++ /* If event 1 ends before event 2 starts, we're in the clear. */
++ if (icaltime_compare_date_only(t1end, t2start) < 0) return(0);
++
++ /* If event 2 ends before event 1 starts, we're also ok. */
++ if (icaltime_compare_date_only(t2end, t1start) < 0) return(0);
++
++ return(1);
++ }
++
+ /* lprintf (9, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
+ t1start.hour, t1start.minute, t1end.hour, t1end.minute,
+ t2start.hour, t2start.minute, t2end.hour, t2end.minute);
+@@ -84,10 +97,6 @@
+
+ /* Now check for overlaps using date *and* time. */
+
+- /* First, bail out if either event 1 or event 2 is missing end time. */
+- if (icaltime_is_null_time(t1end)) return(0);
+- if (icaltime_is_null_time(t2end)) return(0);
+-
+ /* If event 1 ends before event 2 starts, we're in the clear. */
+ if (icaltime_compare(t1end, t2start) <= 0) return(0);
+ /* lprintf(9, "first passed\n"); */
+diff -ruN webcit-7.43-dfsg.orig/calendar_view.c webcit-7.43-dfsg/calendar_view.c
+--- webcit-7.43-dfsg.orig/calendar_view.c 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/calendar_view.c 2009-04-01 12:10:42.000000000 +0200
+@@ -163,6 +163,7 @@
+ struct icaltimetype end_t;
+ struct icaltimetype today_start_t;
+ struct icaltimetype today_end_t;
++ struct icaltimetype today_t;
+ struct tm starting_tm;
+ struct tm ending_tm;
+ int all_day_event = 0;
+@@ -200,6 +201,14 @@
+ today_end_t.is_utc = 1;
+
+ /*
++ * Create another one without caring about the timezone for all day events.
++ */
++ today_t = icaltime_null_date();
++ today_t.year = year;
++ today_t.month = month;
++ today_t.day = day;
++
++ /*
+ * Now loop through our list of events to see which ones occur today.
+ */
+ Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+@@ -224,7 +233,7 @@
+
+ if (all_day_event)
+ {
+- show_event = ((t.year == year) && (t.month == month) && (t.day == day));
++ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
+ }
+ else
+ {
+@@ -236,6 +245,10 @@
+ */
+ if (show_event) {
+ p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
++ if (p == NULL) {
++ p = icalproperty_new_summary(_("Untitled Event"));
++ icalcomponent_add_property(Cal->cal, p);
++ }
+ if (p != NULL) {
+
+ if (all_day_event) {
+@@ -275,33 +288,62 @@
+
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
+ if (q != NULL) {
++ int no_end = 0;
++
+ t = icalproperty_get_dtstart(q);
+-
++ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
++ if (q != NULL) {
++ end_t = icalproperty_get_dtend(q);
++ }
++ else {
++ /*
++ * events with starting date/time equal
++ * ending date/time might get only
++ * DTSTART but no DTEND
++ */
++ no_end = 1;
++ }
++
+ if (t.is_date) {
++ /* all day event */
+ struct tm d_tm;
+- char d_str[32];
++
++ if (!no_end) {
++ /* end given, have to adjust it */
++ icaltime_adjust(&end_t, -1, 0, 0, 0);
++ }
+ memset(&d_tm, 0, sizeof d_tm);
+ d_tm.tm_year = t.year - 1900;
+ d_tm.tm_mon = t.month - 1;
+ d_tm.tm_mday = t.day;
+- wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
+- wprintf("<i>%s</i> %s<br>",
+- _("Date:"), d_str);
++ wc_strftime(buf, sizeof buf, "%x", &d_tm);
++
++ if (no_end || !icaltime_compare(t, end_t)) {
++ wprintf("<i>%s</i> %s<br>",
++ _("Date:"), buf);
++ }
++ else {
++ wprintf("<i>%s</i> %s<br>",
++ _("Starting date:"), buf);
++ d_tm.tm_year = end_t.year - 1900;
++ d_tm.tm_mon = end_t.month - 1;
++ d_tm.tm_mday = end_t.day;
++ wc_strftime(buf, sizeof buf, "%x", &d_tm);
++ wprintf("<i>%s</i> %s<br>",
++ _("Ending date:"), buf);
++ }
+ }
+ else {
+ tt = icaltime_as_timet(t);
+ webcit_fmt_date(buf, tt, DATEFMT_BRIEF);
+- wprintf("<i>%s</i> %s<br>",
+- _("Starting date/time:"), buf);
+-
+- /*
+- * Embed the 'show end date/time' loop inside here so it
+- * only executes if this is NOT an all day event.
+- */
+- q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+- if (q != NULL) {
+- t = icalproperty_get_dtend(q);
+- tt = icaltime_as_timet(t);
++ if (no_end || !icaltime_compare(t, end_t)) {
++ wprintf("<i>%s</i> %s<br>",
++ _("Date/time:"), buf);
++ }
++ else {
++ wprintf("<i>%s</i> %s<br>",
++ _("Starting date/time:"), buf);
++ tt = icaltime_as_timet(end_t);
+ webcit_fmt_date(buf, tt, DATEFMT_BRIEF);
+ wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
+ }
+@@ -400,6 +442,10 @@
+ p = icalcomponent_get_first_property(
+ Cal->cal,
+ ICAL_SUMMARY_PROPERTY);
++ if (p == NULL) {
++ p = icalproperty_new_summary(_("Untitled Event"));
++ icalcomponent_add_property(Cal->cal, p);
++ }
+ e = icalcomponent_get_first_property(
+ Cal->cal,
+ ICAL_DTEND_PROPERTY);
+@@ -770,6 +816,7 @@
+ struct icaltimetype end_t;
+ struct icaltimetype today_start_t;
+ struct icaltimetype today_end_t;
++ struct icaltimetype today_t;
+ struct tm starting_tm;
+ struct tm ending_tm;
+ int top = 0;
+@@ -780,8 +827,6 @@
+ int endmin = 0;
+
+ char buf[256];
+- struct tm d_tm;
+- char d_str[32];
+
+ if (GetCount(WCC->disp_cal_items) == 0) {
+ /* nothing to display */
+@@ -809,6 +854,14 @@
+ today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
+ today_end_t.is_utc = 1;
+
++ /*
++ * Create another one without caring about the timezone for all day events.
++ */
++ today_t = icaltime_null_date();
++ today_t.year = year;
++ today_t.month = month;
++ today_t.day = day;
++
+ /* Now loop through our list of events to see which ones occur today.
+ */
+ Pos = GetNewHashPos(WCC->disp_cal_items, 0);
+@@ -827,29 +880,46 @@
+ else {
+ memset(&t, 0, sizeof t);
+ }
++
++ if (t.is_date) all_day_event = 1;
++
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+ if (q != NULL) {
+ end_t = icalproperty_get_dtend(q);
+- event_tte = icaltime_as_timet(end_t);
+- localtime_r(&event_tte, &event_tm);
+ }
+ else {
+- memset(&end_t, 0, sizeof end_t);
++ /* no end given means end = start */
++ memcpy(&end_t, &t, sizeof(struct icaltimetype));
+ }
+- if (t.is_date) all_day_event = 1;
+
+ if (all_day_event)
+ {
+- show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events));
++ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
++ if (icaltime_compare(t, end_t)) {
++ /*
++ * the end date is non-inclusive so adjust it by one
++ * day because our test is inclusive, note that a day is
++ * not to much because we are talking about all day
++ * events
++ */
++ icaltime_adjust(&end_t, -1, 0, 0, 0);
++ }
+ }
+ else
+ {
+ show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
+ }
+
++ event_tte = icaltime_as_timet(end_t);
++ localtime_r(&event_tte, &event_tm);
++
+ /* If we determined that this event occurs today, then display it.
+ */
+ p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY);
++ if (p == NULL) {
++ p = icalproperty_new_summary(_("Untitled Event"));
++ icalcomponent_add_property(Cal->cal, p);
++ }
+
+ if ((show_event) && (p != NULL)) {
+
+@@ -874,13 +944,17 @@
+ wprintf("<i>%s</i> ", _("Location:"));
+ escputs((char *)icalproperty_get_comment(q));
+ wprintf("<br />");
+- }
+- memset(&d_tm, 0, sizeof d_tm);
+- d_tm.tm_year = t.year - 1900;
+- d_tm.tm_mon = t.month - 1;
+- d_tm.tm_mday = t.day;
+- wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
+- wprintf("<i>%s</i> %s<br>",_("Date:"), d_str);
++ }
++ if (!icaltime_compare(t, end_t)) { /* one day only */
++ webcit_fmt_date(buf, event_tt, DATEFMT_LOCALEDATE);
++ wprintf("<i>%s</i> %s<br>", _("Date:"), buf);
++ }
++ else {
++ webcit_fmt_date(buf, event_tt, DATEFMT_LOCALEDATE);
++ wprintf("<i>%s</i> %s<br>", _("Starting date:"), buf);
++ webcit_fmt_date(buf, event_tte, DATEFMT_LOCALEDATE);
++ wprintf("<i>%s</i> %s<br>", _("Ending date:"), buf);
++ }
+ q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
+ if (q) {
+ wprintf("<i>%s</i> ", _("Notes:"));
+@@ -992,10 +1066,16 @@
+ escputs((char *)icalproperty_get_comment(q));
+ wprintf("<br />");
+ }
+- webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
+- wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
+- webcit_fmt_date(buf, event_tte, DATEFMT_BRIEF);
+- wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
++ if (!icaltime_compare(t, end_t)) { /* one day only */
++ webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
++ wprintf("<i>%s</i> %s<br>", _("Date/time:"), buf);
++ }
++ else {
++ webcit_fmt_date(buf, event_tt, DATEFMT_BRIEF);
++ wprintf("<i>%s</i> %s<br>", _("Starting date/time:"), buf);
++ webcit_fmt_date(buf, event_tte, DATEFMT_BRIEF);
++ wprintf("<i>%s</i> %s<br>", _("Ending date/time:"), buf);
++ }
+ q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY);
+ if (q) {
+ wprintf("<i>%s</i> ", _("Notes:"));
+@@ -1294,6 +1374,10 @@
+ ) {
+
+ p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
++ if (p == NULL) {
++ p = icalproperty_new_summary(_("Untitled Task"));
++ icalcomponent_add_property(Cal->cal, p);
++ }
+ if (p != NULL) {
+
+
+diff -ruN webcit-7.43-dfsg.orig/event.c webcit-7.43-dfsg/event.c
+--- webcit-7.43-dfsg.orig/event.c 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/event.c 2009-04-01 12:10:42.000000000 +0200
+@@ -242,25 +242,34 @@
+ }
+ }
+ else {
+- /*
+- * If this is an all-day-event, set the end time to be identical to
+- * the start time (the hour/minute/second will be set to midnight).
+- * Otherwise extract or create it.
+- */
+- if (t_start.is_date) {
+- t_end = t_start;
++ if (created_new_vevent == 1) {
++ /* set default duration */
++ if (t_start.is_date) {
++ /*
++ * If this is an all-day-event, set the end time to be identical to
++ * the start time (the hour/minute/second will be set to midnight).
++ */
++ t_end = t_start;
++ }
++ else {
++ /*
++ * If this is not an all-day event and there is no
++ * end time specified, make the default one hour
++ * from the start time.
++ */
++ t_end = t_start;
++ t_end.hour += 1;
++ t_end.second = 0;
++ t_end = icaltime_normalize(t_end);
++ /* t_end = icaltime_from_timet(now, 0); */
++ }
+ }
+ else {
+ /*
+- * If this is not an all-day event and there is no
+- * end time specified, make the default one hour
+- * from the start time.
++ * If an existing event has no end date/time this is
++ * supposed to mean end = start.
+ */
+ t_end = t_start;
+- t_end.hour += 1;
+- t_end.second = 0;
+- t_end = icaltime_normalize(t_end);
+- /* t_end = icaltime_from_timet(now, 0); */
+ }
+ }
+ display_icaltimetype_as_webform(&t_end, "dtend", 0);
+diff -ruN webcit-7.43-dfsg.orig/fmt_date.c webcit-7.43-dfsg/fmt_date.c
+--- webcit-7.43-dfsg.orig/fmt_date.c 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/fmt_date.c 2009-04-01 12:10:42.000000000 +0200
+@@ -67,6 +67,7 @@
+ * show the month and day, and the time
+ * older than 6 months, show only the date
+ * DATEFMT_RAWDATE: show full date, regardless of age
++ * DATEFMT_LOCALEDATE: show full date as prefered for the locale
+ */
+
+ switch (Format) {
+@@ -98,6 +99,9 @@
+ case DATEFMT_RAWDATE:
+ wc_strftime(buf, 32, "%a %b %d %Y", &tm);
+ break;
++ case DATEFMT_LOCALEDATE:
++ wc_strftime(buf, 32, "%x", &tm);
++ break;
+ }
+ }
+
+diff -ruN webcit-7.43-dfsg.orig/messages.c webcit-7.43-dfsg/messages.c
+--- webcit-7.43-dfsg.orig/messages.c 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/messages.c 2009-04-01 12:10:42.000000000 +0200
+@@ -399,6 +399,7 @@
+ long len;
+ int n;
+ int skipit;
++ const char *Ptr;
+
+ if (WCC->summ != NULL) {
+ DeleteHash(&WCC->summ);
+@@ -408,23 +409,24 @@
+
+ Buf = NewStrBuf();
+ serv_puts(servcmd);
+- StrBuf_ServGetln(Buf);
++ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
+ FreeStrBuf(&Buf);
+ return (nummsgs);
+ }
+ Buf2 = NewStrBuf();
+- while (len = StrBuf_ServGetln(Buf),
++ while (len = StrBuf_ServGetlnBuffered(Buf),
+ ((len != 3) ||
+ strcmp(ChrPtr(Buf), "000")!= 0))
+ {
+ if (nummsgs < maxload) {
+ skipit = 0;
++ Ptr = NULL;
+ Msg = (message_summary*)malloc(sizeof(message_summary));
+ memset(Msg, 0, sizeof(message_summary));
+
+- Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
+- Msg->date = StrBufExtract_long(Buf, 1, '|');
++ Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
++ Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
+ /*
+ * as citserver probably gives us messages in forward date sorting
+ * nummsgs should be the same order as the message date.
+@@ -436,14 +438,14 @@
+ }
+ if (!skipit) {
+ Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
+- StrBufExtract_token(Buf2, Buf, 2, '|');
++ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
+ if (StrLength(Buf2) != 0) {
+ /** Handle senders with RFC2047 encoding */
+ StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
+ }
+
+ /** Nodename */
+- StrBufExtract_token(Buf2, Buf, 3, '|');
++ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
+ if ((StrLength(Buf2) !=0 ) &&
+ ( ((WCC->room_flags & QR_NETWORK)
+ || ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
+@@ -456,9 +458,9 @@
+ /** Not used:
+ StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
+ */
+-
++ StrBufSkip_NTokenS(Buf, &Ptr, '|', 1);
+ Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
+- StrBufExtract_token(Buf2, Buf, 5, '|');
++ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
+ if (StrLength(Buf2) == 0)
+ StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
+ else {
+@@ -1158,9 +1160,10 @@
+ {
+ const StrBuf *ref = sbstr("references");
+ references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
+- lprintf(9, "Converting: %s\n", ChrPtr(references));
++ if (*ChrPtr(references) == '|') { /* remove leading '|' if present */
++ StrBufCutLeft(references, 1);
++ }
+ StrBufReplaceChars(references, '|', '!');
+- lprintf(9, "Converted: %s\n", ChrPtr(references));
+ }
+ if (havebstr("subject")) {
+ const StrBuf *Subj;
+diff -ruN webcit-7.43-dfsg.orig/msg_renderers.c webcit-7.43-dfsg/msg_renderers.c
+--- webcit-7.43-dfsg.orig/msg_renderers.c 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/msg_renderers.c 2009-04-01 12:10:42.000000000 +0200
+@@ -1132,7 +1132,7 @@
+ RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM, CTX_MAILSUM);
+ RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, CTX_MAILSUM);
+ RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
+- RegisterNamespace("MAIL:SUMM:REFIDS", 0, 0, tmplput_MAIL_SUMM_REFIDS, CTX_MAILSUM);
++ RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS, CTX_MAILSUM);
+ RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO, CTX_MAILSUM);
+ RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY, CTX_MAILSUM);
+ RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY, CTX_NONE);
+diff -ruN webcit-7.43-dfsg.orig/paging.c webcit-7.43-dfsg/paging.c
+--- webcit-7.43-dfsg.orig/paging.c 2009-02-20 19:31:00.000000000 +0100
++++ webcit-7.43-dfsg/paging.c 2009-04-01 12:10:42.000000000 +0200
+@@ -1,15 +1,11 @@
+ /*
+ * $Id: paging.c 6912 2009-01-08 23:11:56Z dothebart $
+ */
+-/**
+- * \defgroup PageFunc Functions which implement the chat and paging facilities.
+- * \ingroup ClientPower
+- */
+-/*@{*/
++
+ #include "webcit.h"
+
+-/**
+- * \brief display the form for paging (x-messaging) another user
++/*
++ * display the form for paging (x-messaging) another user
+ */
+ void display_page(void)
+ {
+@@ -501,6 +497,25 @@
+ wDumpContent(0);
+ }
+
++
++void ajax_send_instant_message(void) {
++ char recp[256];
++ char buf[256];
++
++ safestrncpy(recp, bstr("recp"), sizeof recp);
++
++ serv_printf("SEXP %s|-", recp);
++ serv_getln(buf, sizeof buf);
++
++ if (buf[0] == '4') {
++ text_to_server(bstr("msg"));
++ serv_puts("000");
++ }
++
++ escputs(buf); /* doesn't really matter what we return - the client ignores it */
++}
++
++
+ void
+ InitModule_PAGING
+ (void)
+@@ -510,6 +525,5 @@
+ WebcitAddUrlHandler(HKEY("chat"), do_chat, 0);
+ WebcitAddUrlHandler(HKEY("chat_recv"), chat_recv, 0);
+ WebcitAddUrlHandler(HKEY("chat_send"), chat_send, 0);
++ WebcitAddUrlHandler(HKEY("ajax_send_instant_message"), ajax_send_instant_message, AJAX);
+ }
+-
+-/*@}*/
+diff -ruN webcit-7.43-dfsg.orig/po/es.po webcit-7.43-dfsg/po/es.po
+--- webcit-7.43-dfsg.orig/po/es.po 2009-03-17 04:27:26.000000000 +0100
++++ webcit-7.43-dfsg/po/es.po 2009-04-01 12:10:42.000000000 +0200
+@@ -4,7 +4,8 @@
+ #
+ # Spanish translation
+ # Copyright (C) 2005 - 2009 By Gabriel C. Huertas
+-# This file is distributed under GPL v2 <TODO>
++# This file is distributed under the GNU General Public License;
++# either Version 2 or (at your option) any later version.
+ #
+ #, fuzzy
+ msgid ""
+diff -ruN webcit-7.43-dfsg.orig/README.txt webcit-7.43-dfsg/README.txt
+--- webcit-7.43-dfsg.orig/README.txt 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/README.txt 2009-04-01 12:10:42.000000000 +0200
+@@ -1,5 +1,5 @@
+ WEBCIT for the Citadel System
+- version 7.43
++ version 7.44
+
+ Copyright (C) 1996-2009 by the authors. Portions written by:
+
+diff -ruN webcit-7.43-dfsg.orig/roomops.c webcit-7.43-dfsg/roomops.c
+--- webcit-7.43-dfsg.orig/roomops.c 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/roomops.c 2009-04-01 12:10:42.000000000 +0200
+@@ -4020,30 +4020,23 @@
+
+ switch(WCC->wc_view) {
+ case VIEW_BBS:
+- return TP->Tokens->Params[2]->Start[7]=='B';
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
+ case VIEW_MAILBOX:
+- return TP->Tokens->Params[2]->Start[7]=='M';
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
+ case VIEW_ADDRESSBOOK:
+- return TP->Tokens->Params[2]->Start[7]=='A';
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
+ case VIEW_TASKS:
+- return TP->Tokens->Params[2]->Start[7]=='T';
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
+ case VIEW_NOTES:
+- return TP->Tokens->Params[2]->Start[7]=='N';
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
+ case VIEW_WIKI:
+- return TP->Tokens->Params[2]->Start[7]=='W';
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
+ case VIEW_JOURNAL:
+- return TP->Tokens->Params[2]->Start[7]=='J';
+-
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
+ case VIEW_CALENDAR:
+- if (TP->Tokens->Params[2]->len < 13)
+- return 0;
+- return TP->Tokens->Params[2]->Start[10]=='E';
+-
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
+ case VIEW_CALBRIEF:
+- if (TP->Tokens->Params[3]->len < 13)
+- return 0;
+- return TP->Tokens->Params[2]->Start[10]=='B';
+-
++ return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
+ default:
+ return 0;
+ }
+diff -ruN webcit-7.43-dfsg.orig/static/instant_messenger.html webcit-7.43-dfsg/static/instant_messenger.html
+--- webcit-7.43-dfsg.orig/static/instant_messenger.html 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/static/instant_messenger.html 2009-04-01 12:10:42.000000000 +0200
+@@ -55,8 +55,9 @@
+
+ // Send the text to the server
+ parms = 'r=' + Math.random()
+- + '&g_cmd=SEXP ' + recipient + '|-\n' + escape(thetext);
+- new Ajax.Request('../ajax_servcmd',
++ + '&recp=' + recipient
++ + '&msg=' + encodeURIComponent(thetext);
++ new Ajax.Request('../ajax_send_instant_message',
+ {
+ method: 'post',
+ parameters: parms
+diff -ruN webcit-7.43-dfsg.orig/static/summaryview.js webcit-7.43-dfsg/static/summaryview.js
+--- webcit-7.43-dfsg.orig/static/summaryview.js 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/static/summaryview.js 2009-04-01 12:10:42.000000000 +0200
+@@ -272,6 +272,7 @@
+ method: 'post',
+ parameters: 'g_cmd=SEEN ' + msgId + '|1',
+ onComplete: CtdlMarkRowAsRead(parent)});
++ // If the shift key modifier is used, mark a range...
+ } else if (event.button != 2 && event.shiftKey) {
+ markRow(parent);
+ var rowId = parent.ctdlRowId;
+@@ -288,8 +289,14 @@
+ WCLog("Marking row "+x);
+ markRow(rowArray[x]);
+ }
++ // If the ctrl key modifier is used, toggle one message
+ } else if (event.button != 2 && (event.ctrlKey || event.altKey)) {
+- markRow(parent);
++ if (parent.ctdlMarked == true) {
++ unmarkRow(parent);
++ }
++ else {
++ markRow(parent);
++ }
+ }
+ }
+ function CtdlMarkRowAsRead(rowElement) {
+@@ -338,7 +345,7 @@
+ currentSorterToggle.className = "";
+ }
+ }
+-function markRow( row) {
++function markRow(row) {
+ var msgId = row.ctdlMsgId;
+ row.className = row.className += " marked_row";
+ row.ctdlMarked = true;
+diff -ruN webcit-7.43-dfsg.orig/static/t/richedit.html webcit-7.43-dfsg/static/t/richedit.html
+--- webcit-7.43-dfsg.orig/static/t/richedit.html 2009-02-20 19:30:59.000000000 +0100
++++ webcit-7.43-dfsg/static/t/richedit.html 2009-04-01 12:10:42.000000000 +0200
+@@ -6,7 +6,7 @@
+ browsers : "msie,gecko,safari,opera",
+ theme : "advanced",
+ plugins : "iespell",
+- theme_advanced_buttons1 : "bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code",
++ theme_advanced_buttons1 : "bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, blockquote, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code",
+ theme_advanced_buttons2 : "",
+ theme_advanced_buttons3 : "",
+ content_css : "static/webcit-tinymce.css"
+diff -ruN webcit-7.43-dfsg.orig/static/t/view_message.html webcit-7.43-dfsg/static/t/view_message.html
+--- webcit-7.43-dfsg.orig/static/t/view_message.html 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/static/t/view_message.html 2009-04-01 12:10:42.000000000 +0200
+@@ -12,35 +12,26 @@
+ <?!("COND:MAIL:ANON", 4)>****<??("X", 4)>
+ <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
+ <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
+-<?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></p><??("X", 7)>
++<?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT("X")></p><??("X", 7)>
+ <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
+-
+-<?!("COND:MAIL:SUMM:RFCA", 8)>
+- <??("COND:ROOM:TYPE_IS", 9, "VIEW_BBS")>
+- <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
+- <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
+- <a href="display_enter?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
+- <??("X", 9)>
+-
+- <?!("COND:ROOM:TYPE_IS", 10, "VIEW_BBS")>
+- <a href="display_enter?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
+- <a href="display_enter?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
+- <?!("X", 10)>
++<?!("COND:ROOM:TYPE_IS", 8, "VIEW_BBS")>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
+ <?!("X", 8)>
+-<??("COND:MAIL:SUMM:RFCA", 11)>
+- <??("COND:ROOM:TYPE_IS", 12, "VIEW_BBS")>
+- <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
+- <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>%2C<?MAIL:SUMM:ALLRCPT("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
+- <a href="display_enter?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
+- <??("X", 12)>
+-
+- <?!("COND:ROOM:TYPE_IS", 13, "VIEW_BBS")>
+- <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
+- <a href="display_enter?replyquote=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>%3C<?MAIL:SUMM:RFCA("U")>%3E&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
+- <?!("X", 13)>
+-<??("X", 11)>
+- <a href="confirm_move_msg?msgid=<?MAIL:SUMM:N>"><span>[</span><?_("Move")><span>]</span></a>
++<??("COND:ROOM:TYPE_IS", 9, "VIEW_BBS")>
++ <?!("COND:MAIL:SUMM:RFCA", 10)>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?fwdquote=<?MAIL:SUMM:N>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
++ <?!("X", 10)>
++ <??("COND:MAIL:SUMM:RFCA", 11)>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=<?MAIL:SUMM:FROM("U")>%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>
++ <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?fwdquote=<?MAIL:SUMM:N>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Fwd:%%20", "Fwd:")>"><span>[</span><?_("Forward")><span>]</span></a>
++ <??("X", 11)>
++<??("X", 9)>
+ <?!("COND:ROOM:EDITACCESS", 14)>
++ <a href="confirm_move_msg?msgid=<?MAIL:SUMM:N>"><span>[</span><?_("Move")><span>]</span></a>
+ <a href="delete_msg?msgid=<?MAIL:SUMM:N>" onclick="return confirm('<?_("Delete this message?")>');"><span>[</span><?_("Delete")><span>]</span> </a>
+ <??("X", 14)>
+ <a href="#" onclick="window.open('msgheaders/<?MAIL:SUMM:N>', 'headers<?MAIL:SUMM:N>', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); "><span>[</span><?_("Headers")><span>]</span></a>
+diff -ruN webcit-7.43-dfsg.orig/webcit.c webcit-7.43-dfsg/webcit.c
+--- webcit-7.43-dfsg.orig/webcit.c 2009-02-20 19:31:00.000000000 +0100
++++ webcit-7.43-dfsg/webcit.c 2009-04-01 12:10:42.000000000 +0200
+@@ -845,6 +845,8 @@
+ MINIMUM_CIT_VERSION / 100,
+ MINIMUM_CIT_VERSION % 100
+ );
++ hprintf("HTTP/1.1 200 OK\r\n");
++ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ goto SKIP_ALL_THIS_CRAP;
+diff -ruN webcit-7.43-dfsg.orig/webcit.h webcit-7.43-dfsg/webcit.h
+--- webcit-7.43-dfsg.orig/webcit.h 2009-03-17 04:27:27.000000000 +0100
++++ webcit-7.43-dfsg/webcit.h 2009-04-01 12:10:42.000000000 +0200
+@@ -113,9 +113,9 @@
+ #define PORT_NUM 2000 /* port number to listen on */
+ #define DEVELOPER_ID 0
+ #define CLIENT_ID 4
+-#define CLIENT_VERSION 743 /* This version of WebCit */
+-#define MINIMUM_CIT_VERSION 743 /* min required Citadel ver */
+ #define LIBCITADEL_MIN 743 /* min required libcitadel ver */
++#define CLIENT_VERSION 744 /* This version of WebCit */
++#define MINIMUM_CIT_VERSION 744 /* min required Citadel ver */
+ #define DEFAULT_HOST "localhost" /* Default Citadel server */
+ #define DEFAULT_PORT "504"
+ #define TARGET "webcit01" /* Target for inline URL's */
+@@ -725,6 +725,7 @@
+ #define DATEFMT_FULL 0
+ #define DATEFMT_BRIEF 1
+ #define DATEFMT_RAWDATE 2
++#define DATEFMT_LOCALEDATE 3
+ void webcit_fmt_date(char *buf, time_t thetime, int Format);
+ int fetch_http(char *url, char *target_buf, int maxbytes);
+ void free_attachments(wcsession *sess);
More information about the Pkg-citadel-commit
mailing list