[dev] Patch: Allow public LDAP address to be added to Private SQL
address books
jonathan soong
jon.soong at imvs.sa.gov.au
Thu Aug 21 20:33:58 PDT 2003
This is a patch for CVS HEAD (as of today) which allows LDAP addresses
to be added to Private SQL address books
I hope someone can have a look at it and maybe add it. I would hate to
have to rewrite this for the next version of Turba!
Jon
----------------------------------------------------------------------------------------------------------------------
Basically:
I have changed the turba_member field in turba_objects.
Rather than just having a serialized array of object_id's, i.e.:
a:3:{i:0;s:32:"876d1826fdb03265df3243272a5f4420";i:1;s:32:"16469607fe47e22d129464135ee79160";}
This is really just: array(XXX,YYY)
I now have serialized array of arrays, with each inner array
containing the source where the entry is from, i.e:
a:2:{i:0;a:2:{i:0;s:8:"imvsldap";i:1;s:47:"uid=iisjsoo,ou=Users,dc=imvs,dc=sa,dc=gov,dc=au";}
i:1;a:2:{i:0;s:8:"localsql";i:1;s:32:"4cf194f308531d497fc909be896e6f05";}}
This is: array( array(localsql, XXX), array(localldap,YYY)
Advanced Search results can be added to the Personal Address Book.
I did this by moving the 'add' functionality into a separate include
file "lib/adduser.inc" (so that normal
Search/Browse/Advanced Search can all use the functionality). This makes
sense to me.
The patch is attached. (It should be applied to Turba 1.2 STABLE).
Jon
--------------------------------------------------------------------------------------------------------------
I have altered:
advanced.php
browse.php
lib/AbstractObject.php
lib/api.php
lib/Group.php
lib/Turba.php
templates/browse/actions.inc
templates/browse/contactrow.inc
And added:
/lib/adduser.inc
Below are some notes, and things that NEED to be changed to make it work.
--------------------------------------------------------------------------------------------------------------
NOTE:
In config/sources.php, you will need to add the following line to the
bottom of the file, where 'localsql' is the name of your
sql source.. (i.e. $cfgSources['localsql'] )
define('PERSONAL_ADDRESS_BOOK_SOURCE', 'localsql');
Also, make sure that $cfgSources['localsql'] array has something that
looks like:
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
'__type' => 'object_type',
'__members' => 'object_members',
Also,
In lib/api.php, i don't check for 'turba_lists' as was in CVS,
i couldn't work out why this was needed, so i just
assume it is a turba_list.
---------------------------------------------------------------------------------------------------------------------
-------------- next part --------------
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/CVS/Entries turba/CVS/Entries
--- turba.CURRENTCVS/CVS/Entries Fri Aug 22 12:43:53 2003
+++ turba/CVS/Entries Fri Aug 22 11:19:26 2003
@@ -3,7 +3,6 @@
/addlink.php/1.6/Tue Jul 8 02:41:05 2003//
/addobject.php/1.29/Wed Jul 23 15:21:12 2003//
/advanced.php/1.45/Wed Jul 23 15:18:30 2003//
-/browse.php/1.38/Thu Jul 17 16:29:40 2003//
/data.php/1.47/Tue Jun 17 23:28:07 2003//
/deleteobject.php/1.18/Thu May 22 19:42:42 2003//
/displayobject.php/1.31/Thu May 22 19:42:42 2003//
@@ -14,4 +13,13 @@
/prefs.php/1.16/Thu May 22 19:42:42 2003//
/search.php/1.81/Tue Jul 22 17:08:49 2003//
/test.php/1.4/Fri Apr 11 19:54:21 2003//
-D
+D/config////
+D/docs////
+D/graphics////
+D/lib////
+D/locale////
+D/packaging////
+D/po////
+D/scripts////
+D/templates////
+/browse.php/1.38/Fri Aug 22 01:49:26 2003//
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/CVS/Entries.Log turba/CVS/Entries.Log
--- turba.CURRENTCVS/CVS/Entries.Log Fri Aug 22 12:44:10 2003
+++ turba/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1,9 +0,0 @@
-A D/config////
-A D/docs////
-A D/graphics////
-A D/lib////
-A D/locale////
-A D/packaging////
-A D/po////
-A D/scripts////
-A D/templates////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/advanced.php turba/advanced.php
--- turba.CURRENTCVS/advanced.php Thu Jul 24 00:48:30 2003
+++ turba/advanced.php Fri Aug 22 12:22:34 2003
@@ -20,6 +20,20 @@
$js_onLoad = 'document.dirsearch.name.focus();';
require TURBA_TEMPLATES . '/common-header.inc';
+/* iijsoo
+ * The next bit of code alows for the addition of search results to
+ * Personal Address Books
+ */
+$actionID = Horde::getFormData('actionID');
+if (isset($actionID)) {
+ switch ($actionID) {
+ case 'add':
+ require TURBA_BASE . '/lib/adduser.inc';
+ break;
+ }
+}
+
+
/* Make sure the search session variable is registered in the session,
and obtain a global-scope reference to it. */
if (!array_key_exists('turba_search_results', $_SESSION)) {
@@ -109,16 +123,49 @@
$addresses = Horde::getFormData('addresses');
if (is_object($_SESSION['turba_search_results']) &&
($_SESSION['turba_search_results']->count() > 0)) {
- require TURBA_TEMPLATES . '/advanced/results_head.inc';
+// require TURBA_TEMPLATES . '/advanced/results_head.inc';
}
+
+/* iisjsoo:
+ * need to create an addToList variable that
+ * will hold all the address books that can be
+ * added to - similar to code found in browse.php
+ * - this could/should probably be made into a function
+ */
+
+ $tmp_driver = &Turba_Source::singleton(PERSONAL_ADDRESS_BOOK_SOURCE, $cfgSources[PERSONAL_ADDRESS_BOOK_SOURCE]);
+ $listList = $tmp_driver->search(array('__type' => 'Group'), null, null, 0);
+ $listList->reset();
+ while ($listObject = $listList->next()) {
+ $addToList[] = array('name' => $listObject->getValue('name'), 'key' => PERSONAL_ADDRESS_BOOK_SOURCE."|".$listObject->getValue('__key'));
+ }
+
$numDisplayed = 0;
if (is_object($_SESSION['turba_search_results']) &&
($_SESSION['turba_search_results']->count() > 0)) {
- require_once TURBA_BASE . '/lib/ListView.php';
- $display = new Turba_ListView($_SESSION['turba_search_results'], TURBA_TEMPLATES . '/browse/contactrow.inc');
+
+/* iisjsoo:
+ * This next bit of code has been hacked together, following
+ * the design of the browse.php pages. It allows for users to
+ * add Advanced Search results to personal address books.
+ */
+
+ include TURBA_TEMPLATES . '/browse/javascript.inc';
+ include TURBA_TEMPLATES . '/browse/header.inc';
+ $listType = 'search';
+ include TURBA_TEMPLATES . '/browse/actions.inc';
+ include TURBA_TEMPLATES . '/browse/column_headers.inc';
+ include_once TURBA_BASE . '/lib/ListView.php';
+
+ $display = &new Turba_ListView($_SESSION['turba_search_results'], TURBA_TEMPLATES . '/browse/contactrow.inc');
+// $display = new Turba_ListView($_SESSION['turba_search_results'], TURBA_TEMPLATES . '/search/row.inc');
$numDisplayed = $display->display();
$_SESSION['turba_search_results'] = $_SESSION['turba_search_results']->serialize();
+ include TURBA_TEMPLATES . '/browse/column_footers.inc';
+ require TURBA_TEMPLATES . '/browse/footer.inc';
+
+
}
require TURBA_TEMPLATES . '/advanced/foot.inc';
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/browse.php turba/browse.php
--- turba.CURRENTCVS/browse.php Fri Jul 18 01:59:40 2003
+++ turba/browse.php Fri Aug 22 12:32:48 2003
@@ -66,26 +66,41 @@
/* Run through the action handlers. */
switch ($actionID) {
case 'delete':
+
/* Remove a contact from a list. */
$keys = Horde::getFormData('objectkeys');
if (is_array($keys)) {
-
$key = Horde::getFormData('key', false);
if ($key && $key != "**search") {
/* We are removing a contact from a list. */
$list = $driver->getObject($key);
foreach ($keys as $objectKey) {
- if (!$list->removeMember($driver->getObject($objectKey))) {
- $notification->push(_("There was an error removing this object."), 'horde.error');
+/* iisjsoo
+ *
+ * This was changed so that it takes into account the source of the
+ * entry
+ *
+ */
+ list($objectKeySource, $objectKey) = Turba::splitSourceAndKey($objectKey);
+ $driver = &Turba_Source::singleton($objectKeySource, $cfgSources[$objectKeySource]);
+ if (!$list->removeMemberSource($driver->getObject($objectKey))) {
+ $notification->push(_("Failed to access the specified address book."), 'horde.error');
} else {
- $notification->push(_("Contact removed from list."), 'horde.success');
+ $notification->push(_("Contact removed from list."));
}
}
} else {
/* We are deleting an object. */
foreach ($keys as $objectKey) {
+/* iisjsoo
+ *
+ * This was changed so that it takes into account the source of the
+ * entry
+ *
+ */
+ list($objectKeySource, $objectKey) = Turba::splitSourceAndKey($objectKey);
if (!$driver->removeObject($objectKey)) {
- $notification->push(_("There was an error deleting this object."), 'horde.error');
+ $notification->push(_("FThere was an error deleting this object."), 'horde.error');
}
}
}
@@ -102,46 +117,10 @@
}
break;
+
case 'add':
/* Add a contact to a list */
- $keys = Horde::getFormData('objectkeys');
- $targetKey = Horde::getFormData('targetList');
- if (empty($targetKey)) {
- break;
- }
-
- if (!Horde::getFormData('targetNew')) {
- $target = $driver->getObject($targetKey);
- }
-
- if (!empty($target) && is_object($target) && $target->isGroup()) {
- /* Adding contact to an existing list */
- if (is_array($keys)) {
- foreach ($keys as $objectKey) {
- $target->addMember($driver->getObject($objectKey));
- }
- $target->store();
- }
- } else {
- /* Adding conect to a new list */
- $newList = array();
- $newList['__owner'] = Auth::getAuth();
- $newList['__type'] = 'Group';
- $newList['name'] = $targetKey;
-
- $targetKey = $driver->addObject($newList);
- $target = $driver->getObject($targetKey);
- if (!empty($target) && is_object($target) && $target->isGroup()) {
- if (is_array($keys)) {
- foreach ($keys as $objectKey) {
- $target->addMember($driver->getObject($objectKey));
- }
- $target->store();
- }
- } else {
- $notification->push(_("There was an error creating a new list."), 'horde.error');
- }
- }
+ require TURBA_BASE . '/lib/adduser.inc';
break;
}
}
@@ -160,13 +139,20 @@
!isset($columns[$prefs->getValue('sortby') - 1])) ?
(($prefs->getValue('name_format') == 'first_last') ? 'name' : 'lastname') : $columns[$prefs->getValue('sortby') - 1];
- /* Create list of lists for Add to. */
+/* Create list of lists for Add to. */
+/* iisjsoo:
+ * this next block is new - it is used so that addresses can be added
+ * to any address books. (e.g. ldap addresses can be added to sql books)
+*/
$addToList = array();
- if (!empty($cfgSources[$source]['map']['__type'])) {
- $listList = $driver->search(array('__type' => 'Group'), null, null, 0);
+ foreach ($sources as $src=>$val) {
+ if (!empty($cfgSources[$src]['map']['__type'])) {
+ $tmp_driver = &Turba_Source::singleton($source, $cfgSources[$src]);
+ $listList = $tmp_driver->search(array('__type' => 'Group'), null, null, 0);
$listList->reset();
while ($listObject = $listList->next()) {
- $addToList[] = array('name' => $listObject->getValue('name'), 'key' => $listObject->getValue('__key'));
+ $addToList[] = array('name' => $listObject->getValue('name'), 'key' => $src."|".$listObject->getValue('__key'));
+ }
}
}
@@ -188,24 +174,41 @@
$display = &new Turba_ListView($results, TURBA_TEMPLATES . '/browse/contactrow.inc');
} elseif (Horde::getFormData('key')) {
/* We are displaying the contents of a list */
- $list = $driver->getObject(Horde::getFormData('key'));
- if (isset($list) && is_object($list) && !is_a($list,'PEAR_Error') && $list->isGroup()) {
- $title = sprintf(_("Addresses in list: %s"), $list->getValue('name'));
$templates[] = '/browse/header.inc';
- /* Show List Members */
- if (!is_object($results = $list->listMembers($sortcolumn, $prefs->getValue('sortdir')))) {
- $notification->push(_("Failed to browse list"), 'horde.error');
- } else {
+ /* iisjsoo:
+ * First we will grab an array using the listMembersArray() function to
+ * give us all users in this list as well as the source they come from.
+ *
+ * Then we will go thru the list and extract the users from their sources
+ * into a Turba_List which will be passed on.
+ *
+ * Note: there could be a performance enhancement here - make only one driver
+ * for each source
+ */
+ require_once TURBA_BASE . '/lib/List.php';
+ $results = &new Turba_List();
$listType = 'list';
+
+ $driver = &Turba_Source::singleton(PERSONAL_ADDRESS_BOOK_SOURCE, $cfgSources[PERSONAL_ADDRESS_BOOK_SOURCE]);
+ $list = $driver->getObject(Horde::getFormData('key'));
+ $results_array = $list->listMembersArray();
+ if (count($results_array) != 0) {
+ foreach ($results_array as $tmp=>$listMember) {
+ /* iisjsoo:
+ * The $results_array contains entries of the form:
+ * 'localsql'|'38183e5d7ace6910e33eb925f29181c6'
+ * 'localldap'|'uid=asddf,dn=adsf,dn=com'
+ */
+ list($listMemberSource, $listMemberKey) = Turba::getListMember($listMember);
+ $driver = &Turba_Source::singleton($listMemberSource, $cfgSources[$listMemberSource]);
+ $tmp2= $driver->getObject($listMemberKey);
+ $results->insert($tmp2);
+ }
+ }
$templates[] = '/browse/actions.inc';
$templates[] = '/browse/column_headers.inc';
-
require_once TURBA_BASE . '/lib/ListView.php';
$display = &new Turba_ListView($results, TURBA_TEMPLATES . '/browse/contactrow.inc');
- }
- } else {
- $notification->push(_("There was an error displaying the select List"), 'horde.error');
- }
} else {
/* We are displaying the contents of the address book */
if ($source_count > 1) {
@@ -230,7 +233,6 @@
$listType = 'directory';
$templates[] = '/browse/actions.inc';
$templates[] = '/browse/column_headers.inc';
-
require_once TURBA_BASE . '/lib/ListView.php';
$display = &new Turba_ListView($results, TURBA_TEMPLATES . '/browse/contactrow.inc');
}
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/docs/CVS/Entries turba/docs/CVS/Entries
--- turba.CURRENTCVS/docs/CVS/Entries Fri Aug 22 12:43:54 2003
+++ turba/docs/CVS/Entries Fri Aug 22 11:03:27 2003
@@ -1,5 +1,5 @@
/CHANGES/1.133/Fri Jul 4 18:07:45 2003//
-/CREDITS/1.44/Fri Aug 15 11:51:33 2003//
/INSTALL/1.9/Wed Jun 4 01:23:46 2003//
/LDAP/1.2/Thu Jan 30 17:48:03 2003//
+/CREDITS/1.44/Fri Aug 22 01:33:27 2003//
D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/graphics/CVS/Entries turba/graphics/CVS/Entries
--- turba.CURRENTCVS/graphics/CVS/Entries Fri Aug 22 12:43:54 2003
+++ turba/graphics/CVS/Entries Fri Aug 22 11:03:27 2003
@@ -1,9 +1,9 @@
/add.gif/1.2/Tue Feb 4 16:28:11 2003/-kb/
/checkbox.gif/1.1/Wed Jun 19 21:35:06 2002/-kb/
-/delete.gif/1.2/Mon Aug 18 17:06:46 2003/-kb/
/edit.gif/1.2/Fri Aug 15 02:21:09 2003/-kb/
/group.gif/1.3/Tue Aug 5 17:51:53 2003/-kb/
/search.gif/1.3/Wed Feb 5 16:59:39 2003/-kb/
/turba.gif/1.4/Mon Dec 17 05:06:38 2001/-kb/
/user.gif/1.1/Mon Mar 11 18:56:16 2002/-kb/
+/delete.gif/1.2/Fri Aug 22 01:33:27 2003/-kb/
D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/AbstractObject.php turba/lib/AbstractObject.php
--- turba.CURRENTCVS/lib/AbstractObject.php Fri Aug 22 03:16:27 2003
+++ turba/lib/AbstractObject.php Fri Aug 22 12:25:22 2003
@@ -56,6 +56,16 @@
return $this->source->name;
}
+ /* iisjsoo
+ * return the type of source this is (e.g. ldap, sql)
+ */
+ function getSourceType()
+ {
+ return $this->source->driver->type;
+ }
+
+
+
/**
* Returns the value of the specified attribute.
*
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/CVS/Entries turba/lib/CVS/Entries
--- turba.CURRENTCVS/lib/CVS/Entries Fri Aug 22 12:43:54 2003
+++ turba/lib/CVS/Entries Fri Aug 22 11:19:27 2003
@@ -1,5 +1,4 @@
/.htaccess/1.1/Sat Dec 29 21:22:47 2001//
-/AbstractObject.php/1.22/Thu Aug 21 17:46:27 2003//
/Driver.php/1.33/Mon Apr 28 20:02:48 2003//
/Group.php/1.17/Tue Feb 25 16:37:20 2003//
/List.php/1.34/Tue Feb 25 16:37:21 2003//
@@ -14,4 +13,9 @@
/api.php/1.60/Fri Aug 8 12:55:02 2003//
/base.php/1.45/Sun Apr 20 20:51:24 2003//
/version.php/1.10/Thu Nov 15 21:30:18 2001//
-D
+D/Block////
+D/Driver////
+D/List////
+D/ListView////
+D/ObjectView////
+/AbstractObject.php/1.22/Fri Aug 22 01:33:27 2003//
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/CVS/Entries.Log turba/lib/CVS/Entries.Log
--- turba.CURRENTCVS/lib/CVS/Entries.Log Fri Aug 22 12:43:55 2003
+++ turba/lib/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1,7 +0,0 @@
-A D/Block////
-A D/ContactView////
-A D/Driver////
-A D/List////
-A D/ListView////
-A D/ObjectView////
-A D/js////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/ContactView/CVS/Entries turba/lib/ContactView/CVS/Entries
--- turba.CURRENTCVS/lib/ContactView/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/lib/ContactView/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/ContactView/CVS/Repository turba/lib/ContactView/CVS/Repository
--- turba.CURRENTCVS/lib/ContactView/CVS/Repository Fri Aug 22 12:43:55 2003
+++ turba/lib/ContactView/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/lib/ContactView
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/ContactView/CVS/Root turba/lib/ContactView/CVS/Root
--- turba.CURRENTCVS/lib/ContactView/CVS/Root Fri Aug 22 12:43:55 2003
+++ turba/lib/ContactView/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/Group.php turba/lib/Group.php
--- turba.CURRENTCVS/lib/Group.php Wed Feb 26 03:07:20 2003
+++ turba/lib/Group.php Fri Aug 22 12:14:40 2003
@@ -61,6 +61,36 @@
}
}
+
+ /**
+ * iisjsoo:
+ * new function (wouldn't some OO overloading be good here?)
+ * Adds a new contact entry to this group, also takes in the name of the group
+ * to add it to.
+ *
+ * @param Turba_AbstractObject $object The object to add to the Group
+ *
+ * @since Turba 1.2
+ */
+ function addMemberSource($object, $source)
+ {
+ if ($source == "") {
+ return addMember($object);
+ }
+ // Can't add itself.
+ if ($object->getValue('__key') != $this->attributes['__key']) {
+ $members = @unserialize($this->attributes['__members']);
+ if (!is_array($members)) {
+ $members = array();
+ }
+ $member_entry[] = $object->getSource();
+ $member_entry[] = $object->getValue('__key');
+ $members[] = $member_entry;
+ $this->attributes['__members'] = serialize($members);
+ }
+ }
+
+
/**
* Deletes a contact entry from this group.
*
@@ -83,6 +113,72 @@
}
/**
+ * iisjsoo: Deletes a contact entry from this group
+ * Passed the $key and $source
+ * e.g.for ldap:
+ * $key: 'uid=iisjsoo,dn=XX,dn=YY'
+ * $source: 'myldap'
+ *
+ * e.g.for sql:
+ * $key: '765ef989dc9a9d9c5'
+ * $source: 'localsql'
+ *
+ * @param Turba_AbstractObject $object The object to remove from the Group
+ *
+ * @since Turba 1.2
+ */
+ function removeMemberSource($object)
+ {
+ $members = unserialize($this->attributes['__members']);
+ /* iisjsoo
+ * convert old style entries to the new style, assume that the source
+ * was the PERSONAL_ADDRESS_BOOK_SOURCE
+ */
+ for ($i=0; $i<count($members); $i++) {
+ if (!is_array($members)) {
+ $newFormatMember = array(PERSONAL_ADDRESS_BOOK_SOURCE, $members[$i]);
+ $members[$i]= $newFormatMember;
+ }
+ }
+
+ $key = $object->getValue('__key');
+ $source = $object->getSource();
+ $memberToRemove = array($source,$key);
+
+ if(($i = array_search($memberToRemove, $members)) !== false) {
+ unset($members[$i]);
+ } else {
+ $notification->push(_("Could not find the member."), 'horde.error');
+ }
+
+
+ $this->attributes['__members'] = serialize($members);
+ $this->store();
+ return true;
+ }
+ /** iisjsoo
+ * Function to return a Turba_List of arrays containing the Source of
+ * an entry and the entry's Key (object_id for sql, dn for ldap)
+ * e.g.
+ * list => (array('localsql', '73ebb2f4623ec959e5c6b12608750f57'),
+ * array('localldap', 'uid=itpdfdr,ou=Users,dc=xxx,dc=xxx,dc=com,dc=au'))
+ */
+ function listMembersArray()
+ {
+ $children = unserialize($this->attributes['__members']);
+ if (!is_array($children)) {
+ $children = array();
+ }
+ reset($children);
+ $list = array();
+ foreach ($children as $member) {
+ $list[] = $member;
+ }
+ return $list; //we can't sort this yet, lets work it out later
+ }
+
+
+ /**
* Retrieve the Objects in this group
*
* @param $sort_criteria The requested sort order which is passed to
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/ListView/CVS/Entries turba/lib/ListView/CVS/Entries
--- turba.CURRENTCVS/lib/ListView/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/lib/ListView/CVS/Entries Fri Aug 22 11:03:27 2003
@@ -1,3 +1,3 @@
-/Rolodex.php/1.9/Sun Aug 17 22:07:58 2003//
/Tree.php/1.8/Thu Mar 21 17:00:11 2002//
+/Rolodex.php/1.9/Fri Aug 22 01:33:27 2003//
D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/ObjectView/CVS/Entries turba/lib/ObjectView/CVS/Entries
--- turba.CURRENTCVS/lib/ObjectView/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/lib/ObjectView/CVS/Entries Fri Aug 22 11:03:27 2003
@@ -1,3 +1,3 @@
/List.php/1.6/Thu Mar 21 17:00:12 2002//
-/PhotoID.php/1.6/Sat Aug 16 11:37:35 2003//
+/PhotoID.php/1.6/Fri Aug 22 01:33:27 2003//
D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/Turba.php turba/lib/Turba.php
--- turba.CURRENTCVS/lib/Turba.php Wed Jun 18 07:58:01 2003
+++ turba/lib/Turba.php Fri Aug 22 11:27:02 2003
@@ -14,6 +14,58 @@
* @package turba
*/
class Turba {
+/* iisjsoo
+ *
+ * Function written to take an $objectKey of form:
+ *
+ * 'localsql'|'38183e5d7ace6910e33eb925f29181c6'
+ * 'localldap'|'uid=asddf,dn=adsf,dn=com'
+ *
+ * and it returns an array of the two parts:
+ *
+ * 'localsql'|'38183e5d7ace6910e33eb925f29181c6'
+ * 'localldap'|'uid=asddf,dn=adsf,dn=com'
+ *
+ * and it returns an array of the two parts:
+ *
+ * Array([0]=>'localsql', [1]=>'38183e5d7ace6910e33eb925f29181c6')
+ * Array([0]=>'localldap', [1]=>'uid=asddf,dn=adsf,dn=com')
+ *
+ * You should probably call it like:
+ * list($objectKeySource, $objectKey) = splitSourceAndKey($objectKey);
+ */
+
+function splitSourceAndKey($objectKey) {
+ if (preg_match("/\|/", $objectKey)) {
+ $objectKeyArr = preg_split('/\|/', $objectKey);
+ $objectKeySource = $objectKeyArr[0];
+ $objectKeyKey = $objectKeyArr[1];
+ return array($objectKeySource, $objectKeyKey);
+ } else {
+ // this is for backwards compatibility
+ return array(PERSONAL_ADDRESS_BOOK_SOURCE, $objectKey);
+// return -1;
+ }
+}
+
+
+/* iisjsoo
+ *
+ * Function written to send back a list member and a source
+ * when it is sent as an array.
+ *
+ * It defaults to sending back the PERSONAL_ADDRESS_BOOK_SOURCE
+ * if a string and not an array is sent
+ *
+ */
+function getListMember($listMember) {
+ if (is_array($listMember)) {
+ return array($listMember[0], $listMember[1]);
+ } else {
+ // this is for backwards compatibility
+ return array(PERSONAL_ADDRESS_BOOK_SOURCE, $listMember);
+ }
+}
function getBareEmail($address)
{
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/adduser.inc turba/lib/adduser.inc
--- turba.CURRENTCVS/lib/adduser.inc Thu Jan 1 09:30:00 1970
+++ turba/lib/adduser.inc Fri Aug 22 12:43:00 2003
@@ -0,0 +1,71 @@
+<?
+ /* Add a contact to a list */
+ $keys = Horde::getFormData('objectkeys');
+ $targetKey = Horde::getFormData('targetList');
+ if (empty($targetKey)) {
+ $notification->push(_("You did not specify a list."), 'horde.error');
+ return;
+ }
+
+/* iisjsoo
+ *
+ * I need to first get a driver for the PERSONAL_ADDRESS_BOOK_SOURCE and then get
+ * the object
+ *
+ */
+ list($targetKeySource, $newTargetKey) = Turba::splitSourceAndKey($targetKey);
+ if (!Horde::getFormData('targetNew')) {
+ $driver = &Turba_Source::singleton(PERSONAL_ADDRESS_BOOK_SOURCE, $cfgSources[PERSONAL_ADDRESS_BOOK_SOURCE]);
+ $target = $driver->getObject($newTargetKey);
+ }
+
+
+ if (!empty($target) && is_object($target) && $target->isGroup()) {
+ /* Adding contact to an existing list */
+ if (is_array($keys)) {
+ foreach ($keys as $objectKey) {
+/* iisjsoo
+ *
+ * This was changed so that it takes into account the source of the
+ * entry
+ *
+ */
+ list($objectKeySource, $objectKey) = Turba::splitSourceAndKey($objectKey);
+ $driver = &Turba_Source::singleton($objectKeySource, $cfgSources[$objectKeySource]);
+ $target->addMemberSource($driver->getObject($objectKey),$objectKeySource);
+ }
+ $target->store();
+ }
+ } else {
+ /* Adding conect to a new list */
+ $newList = array();
+ $newList['__owner'] = Auth::getAuth();
+ $newList['__type'] = 'Group';
+ $newList['name'] = $targetKey;
+
+ // added the next line when moved to adduser.inc
+ $driver = &Turba_Source::singleton(PERSONAL_ADDRESS_BOOK_SOURCE, $cfgSources[PERSONAL_ADDRESS_BOOK_SOURCE]);
+
+ $targetKey = $driver->addObject($newList);
+ $target = $driver->getObject($targetKey);
+
+ if (!empty($target) && is_object($target) && $target->isGroup()) {
+ if (is_array($keys)) {
+ foreach ($keys as $objectKey) {
+/* iisjsoo
+ *
+ * This was changed so that it takes into account the source of the
+ * entry
+ *
+ */
+ list($objectKeySource, $objectKey) = Turba::splitSourceAndKey($objectKey);
+ $driver = &Turba_Source::singleton($objectKeySource, $cfgSources[$objectKeySource]);
+ $target->addMemberSource($driver->getObject($objectKey),$objectKeySource);
+ }
+ $target->store();
+ }
+ } else {
+ $notification->push(_("There was an error creating a new list."), 'horde.error');
+ }
+ }
+?>
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/api.php turba/lib/api.php
--- turba.CURRENTCVS/lib/api.php Fri Aug 8 22:25:02 2003
+++ turba/lib/api.php Fri Aug 22 12:25:12 2003
@@ -233,39 +233,32 @@
'source' => $source
);
} else {
- /* Is a distribution list. */
+ /* Is a Distribution List */
$listatt = $ob->getAttributes();
$seeninlist = array();
- $members = $ob->listMembers();
- if (is_a($members, 'Turba_List')) {
- if ($members->count() == 1) {
- $ob = $members->next();
- $att = $ob->getAttributes();
- $email = '';
- foreach ($att as $key => $value) {
- if (!empty($value) && isset($attributes[$key]) &&
- $attributes[$key]['type'] == 'email') {
- $email = $value;
- }
- }
- $results[$name][] = array('name' => $listatt['name'] . ' - ' . $att['name'], 'email' => $email, 'id' => $att['__key'], 'source' => $source );
- } else {
+ $members = $ob->listMembersArray();
+
+/* iisjsoo
+ *
+ * i'm not sure how to get around this..
+ * members is no longer a 'turba_list', but an array of arrays...
+ * maybe this should just check the return value of $ob->listMembersArray()
+ */
+ if (get_class($members) == 'turba_list' || 1==1) {
$email = '';
- while ($ob = $members->next()) {
- $att = $ob->getAttributes();
- foreach ($att as $key => $value) {
- if (!empty($value) && isset($attributes[$key]) &&
- $attributes[$key]['type'] == 'email' &&
- empty($seeninlist[trim(String::lower($att['name'])) . trim(String::lower($value))])) {
+ $members = $ob->listMembersArray();
- $email .= ($email == '') ? '' : ', ';
- $email .= '"' . $att['name'] . '" <' . $value . '>';
- $seeninlist[trim(String::lower($att['name'])) . trim(String::lower($value))] = true;
- }
- }
- }
- $results[$name][] = array('name' => $listatt['name'], 'email' => $email, 'id' => $listatt['__key'], 'source' => $source);
- }
+ foreach($members as $key=>$val){
+ list($listMemberSource, $listMemberKey) = Turba::getListMember($val);
+ $driver = &Turba_Source::singleton($listMemberSource, $cfgSources[$listMemberSource]);
+ $listMember= $driver->getObject($listMemberKey);
+ $emailAddress = '"'.$listMember->getValue('name').
+ '" <'.$listMember->getValue('email').'>';
+ $email .= $emailAddress .= ',';
+ }
+ // get rid of trailing ','
+ $email = preg_replace("/,$/","",$email);
+ $results[$name][] = array('name' => $listatt['name'], 'email' => $email);
}
}
}
@@ -273,6 +266,7 @@
}
}
}
+
return $results;
}
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/js/CVS/Entries turba/lib/js/CVS/Entries
--- turba.CURRENTCVS/lib/js/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/lib/js/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/js/CVS/Repository turba/lib/js/CVS/Repository
--- turba.CURRENTCVS/lib/js/CVS/Repository Fri Aug 22 12:43:55 2003
+++ turba/lib/js/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/lib/js
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/lib/js/CVS/Root turba/lib/js/CVS/Root
--- turba.CURRENTCVS/lib/js/CVS/Root Fri Aug 22 12:43:55 2003
+++ turba/lib/js/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/CVS/Entries turba/locale/CVS/Entries
--- turba.CURRENTCVS/locale/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/locale/CVS/Entries Fri Aug 22 11:19:27 2003
@@ -1,2 +1,35 @@
/.htaccess/1.1/Sat Dec 29 21:22:48 2001//
-D
+D/ar_SY////
+D/bg_BG////
+D/ca_ES////
+D/cs_CZ////
+D/da_DK////
+D/de_DE////
+D/el_GR////
+D/en_US////
+D/es_ES////
+D/et_EE////
+D/fi_FI////
+D/fr_FR////
+D/hu_HU////
+D/it_IT////
+D/ja_JP////
+D/ko_KR////
+D/lt_LT////
+D/lv_LV////
+D/mk_MK////
+D/nb_NO////
+D/nl_NL////
+D/nn_NO////
+D/pl_PL////
+D/pt_BR////
+D/pt_PT////
+D/ro_RO////
+D/ru_RU////
+D/ru_RU.KOI8-R////
+D/sk_SK////
+D/sl_SI////
+D/sv_SE////
+D/uk_UA////
+D/zh_CN////
+D/zh_TW////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/CVS/Entries.Log turba/locale/CVS/Entries.Log
--- turba.CURRENTCVS/locale/CVS/Entries.Log Fri Aug 22 12:44:04 2003
+++ turba/locale/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1,40 +0,0 @@
-A D/ar_SY////
-A D/bg_BG////
-A D/ca_ES////
-A D/cs_CZ////
-A D/da_DK////
-A D/de////
-A D/de_DE////
-A D/el_GR////
-A D/en_US////
-A D/es_ES////
-A D/et_EE////
-A D/fi_FI////
-A D/fr////
-A D/fr_FR////
-A D/hu_HU////
-A D/it_IT////
-A D/ja_JP////
-A D/ko_KR////
-A D/lt_LT////
-A D/lv_LV////
-A D/mk_MK////
-A D/nb_NO////
-A D/nl////
-A D/nl_NL////
-A D/nn_NO////
-A D/no_BOK////
-A D/pl_PL////
-A D/pt_BR////
-A D/pt_PT////
-A D/ro_RO////
-A D/ru_RU////
-A D/ru_RU.KOI8-R////
-A D/ru_koi////
-A D/ru_win////
-A D/sk_SK////
-A D/sl_SI////
-A D/sv_SE////
-A D/uk_UA////
-A D/zh_CN////
-A D/zh_TW////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ar_SY/CVS/Entries turba/locale/ar_SY/CVS/Entries
--- turba.CURRENTCVS/locale/ar_SY/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/locale/ar_SY/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ar_SY/CVS/Entries.Log turba/locale/ar_SY/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ar_SY/CVS/Entries.Log Fri Aug 22 12:43:55 2003
+++ turba/locale/ar_SY/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/bg_BG/CVS/Entries turba/locale/bg_BG/CVS/Entries
--- turba.CURRENTCVS/locale/bg_BG/CVS/Entries Fri Aug 22 12:43:55 2003
+++ turba/locale/bg_BG/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/bg_BG/CVS/Entries.Log turba/locale/bg_BG/CVS/Entries.Log
--- turba.CURRENTCVS/locale/bg_BG/CVS/Entries.Log Fri Aug 22 12:43:55 2003
+++ turba/locale/bg_BG/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ca_ES/CVS/Entries turba/locale/ca_ES/CVS/Entries
--- turba.CURRENTCVS/locale/ca_ES/CVS/Entries Fri Aug 22 12:43:56 2003
+++ turba/locale/ca_ES/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ca_ES/CVS/Entries.Log turba/locale/ca_ES/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ca_ES/CVS/Entries.Log Fri Aug 22 12:43:56 2003
+++ turba/locale/ca_ES/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/cs_CZ/CVS/Entries turba/locale/cs_CZ/CVS/Entries
--- turba.CURRENTCVS/locale/cs_CZ/CVS/Entries Fri Aug 22 12:43:56 2003
+++ turba/locale/cs_CZ/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/cs_CZ/CVS/Entries.Log turba/locale/cs_CZ/CVS/Entries.Log
--- turba.CURRENTCVS/locale/cs_CZ/CVS/Entries.Log Fri Aug 22 12:43:56 2003
+++ turba/locale/cs_CZ/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/da_DK/CVS/Entries turba/locale/da_DK/CVS/Entries
--- turba.CURRENTCVS/locale/da_DK/CVS/Entries Fri Aug 22 12:43:56 2003
+++ turba/locale/da_DK/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/da_DK/CVS/Entries.Log turba/locale/da_DK/CVS/Entries.Log
--- turba.CURRENTCVS/locale/da_DK/CVS/Entries.Log Fri Aug 22 12:43:56 2003
+++ turba/locale/da_DK/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/CVS/Entries turba/locale/de/CVS/Entries
--- turba.CURRENTCVS/locale/de/CVS/Entries Fri Aug 22 12:43:56 2003
+++ turba/locale/de/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/CVS/Entries.Log turba/locale/de/CVS/Entries.Log
--- turba.CURRENTCVS/locale/de/CVS/Entries.Log Fri Aug 22 12:43:56 2003
+++ turba/locale/de/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/CVS/Repository turba/locale/de/CVS/Repository
--- turba.CURRENTCVS/locale/de/CVS/Repository Fri Aug 22 12:43:56 2003
+++ turba/locale/de/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/de
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/CVS/Root turba/locale/de/CVS/Root
--- turba.CURRENTCVS/locale/de/CVS/Root Fri Aug 22 12:43:56 2003
+++ turba/locale/de/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/LC_MESSAGES/CVS/Entries turba/locale/de/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/de/LC_MESSAGES/CVS/Entries Fri Aug 22 12:43:56 2003
+++ turba/locale/de/LC_MESSAGES/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/LC_MESSAGES/CVS/Repository turba/locale/de/LC_MESSAGES/CVS/Repository
--- turba.CURRENTCVS/locale/de/LC_MESSAGES/CVS/Repository Fri Aug 22 12:43:56 2003
+++ turba/locale/de/LC_MESSAGES/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/de/LC_MESSAGES
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de/LC_MESSAGES/CVS/Root turba/locale/de/LC_MESSAGES/CVS/Root
--- turba.CURRENTCVS/locale/de/LC_MESSAGES/CVS/Root Fri Aug 22 12:43:56 2003
+++ turba/locale/de/LC_MESSAGES/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de_DE/CVS/Entries turba/locale/de_DE/CVS/Entries
--- turba.CURRENTCVS/locale/de_DE/CVS/Entries Fri Aug 22 12:43:56 2003
+++ turba/locale/de_DE/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1,2 +1,2 @@
/help.xml/1.3/Mon Jul 14 23:01:13 2003//
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/de_DE/CVS/Entries.Log turba/locale/de_DE/CVS/Entries.Log
--- turba.CURRENTCVS/locale/de_DE/CVS/Entries.Log Fri Aug 22 12:43:56 2003
+++ turba/locale/de_DE/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/el_GR/CVS/Entries turba/locale/el_GR/CVS/Entries
--- turba.CURRENTCVS/locale/el_GR/CVS/Entries Fri Aug 22 12:43:57 2003
+++ turba/locale/el_GR/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/el_GR/CVS/Entries.Log turba/locale/el_GR/CVS/Entries.Log
--- turba.CURRENTCVS/locale/el_GR/CVS/Entries.Log Fri Aug 22 12:43:57 2003
+++ turba/locale/el_GR/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/es_ES/CVS/Entries turba/locale/es_ES/CVS/Entries
--- turba.CURRENTCVS/locale/es_ES/CVS/Entries Fri Aug 22 12:43:57 2003
+++ turba/locale/es_ES/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/es_ES/CVS/Entries.Log turba/locale/es_ES/CVS/Entries.Log
--- turba.CURRENTCVS/locale/es_ES/CVS/Entries.Log Fri Aug 22 12:43:57 2003
+++ turba/locale/es_ES/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/et_EE/CVS/Entries turba/locale/et_EE/CVS/Entries
--- turba.CURRENTCVS/locale/et_EE/CVS/Entries Fri Aug 22 12:43:58 2003
+++ turba/locale/et_EE/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/et_EE/CVS/Entries.Log turba/locale/et_EE/CVS/Entries.Log
--- turba.CURRENTCVS/locale/et_EE/CVS/Entries.Log Fri Aug 22 12:43:58 2003
+++ turba/locale/et_EE/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fi_FI/CVS/Entries turba/locale/fi_FI/CVS/Entries
--- turba.CURRENTCVS/locale/fi_FI/CVS/Entries Fri Aug 22 12:43:58 2003
+++ turba/locale/fi_FI/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1,2 +1,2 @@
/help.xml/1.3/Mon Jul 14 23:01:04 2003//
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fi_FI/CVS/Entries.Log turba/locale/fi_FI/CVS/Entries.Log
--- turba.CURRENTCVS/locale/fi_FI/CVS/Entries.Log Fri Aug 22 12:43:58 2003
+++ turba/locale/fi_FI/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/CVS/Entries turba/locale/fr/CVS/Entries
--- turba.CURRENTCVS/locale/fr/CVS/Entries Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/CVS/Entries.Log turba/locale/fr/CVS/Entries.Log
--- turba.CURRENTCVS/locale/fr/CVS/Entries.Log Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/CVS/Repository turba/locale/fr/CVS/Repository
--- turba.CURRENTCVS/locale/fr/CVS/Repository Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/fr
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/CVS/Root turba/locale/fr/CVS/Root
--- turba.CURRENTCVS/locale/fr/CVS/Root Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/LC_MESSAGES/CVS/Entries turba/locale/fr/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/fr/LC_MESSAGES/CVS/Entries Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/LC_MESSAGES/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/LC_MESSAGES/CVS/Repository turba/locale/fr/LC_MESSAGES/CVS/Repository
--- turba.CURRENTCVS/locale/fr/LC_MESSAGES/CVS/Repository Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/LC_MESSAGES/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/fr/LC_MESSAGES
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr/LC_MESSAGES/CVS/Root turba/locale/fr/LC_MESSAGES/CVS/Root
--- turba.CURRENTCVS/locale/fr/LC_MESSAGES/CVS/Root Fri Aug 22 12:43:58 2003
+++ turba/locale/fr/LC_MESSAGES/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr_FR/CVS/Entries turba/locale/fr_FR/CVS/Entries
--- turba.CURRENTCVS/locale/fr_FR/CVS/Entries Fri Aug 22 12:43:58 2003
+++ turba/locale/fr_FR/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/fr_FR/CVS/Entries.Log turba/locale/fr_FR/CVS/Entries.Log
--- turba.CURRENTCVS/locale/fr_FR/CVS/Entries.Log Fri Aug 22 12:43:58 2003
+++ turba/locale/fr_FR/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/hu_HU/CVS/Entries turba/locale/hu_HU/CVS/Entries
--- turba.CURRENTCVS/locale/hu_HU/CVS/Entries Fri Aug 22 12:43:59 2003
+++ turba/locale/hu_HU/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/hu_HU/CVS/Entries.Log turba/locale/hu_HU/CVS/Entries.Log
--- turba.CURRENTCVS/locale/hu_HU/CVS/Entries.Log Fri Aug 22 12:43:59 2003
+++ turba/locale/hu_HU/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/it_IT/CVS/Entries turba/locale/it_IT/CVS/Entries
--- turba.CURRENTCVS/locale/it_IT/CVS/Entries Fri Aug 22 12:43:59 2003
+++ turba/locale/it_IT/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/it_IT/CVS/Entries.Log turba/locale/it_IT/CVS/Entries.Log
--- turba.CURRENTCVS/locale/it_IT/CVS/Entries.Log Fri Aug 22 12:43:59 2003
+++ turba/locale/it_IT/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ja_JP/CVS/Entries turba/locale/ja_JP/CVS/Entries
--- turba.CURRENTCVS/locale/ja_JP/CVS/Entries Fri Aug 22 12:44:00 2003
+++ turba/locale/ja_JP/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ja_JP/CVS/Entries.Log turba/locale/ja_JP/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ja_JP/CVS/Entries.Log Fri Aug 22 12:44:00 2003
+++ turba/locale/ja_JP/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ja_JP/LC_MESSAGES/CVS/Entries turba/locale/ja_JP/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/ja_JP/LC_MESSAGES/CVS/Entries Fri Aug 22 12:44:00 2003
+++ turba/locale/ja_JP/LC_MESSAGES/CVS/Entries Fri Aug 22 11:03:29 2003
@@ -1,2 +1,2 @@
-/turba.mo/1.4/Fri Aug 15 11:49:28 2003/-kb/
+/turba.mo/1.4/Fri Aug 22 01:33:29 2003/-kb/
D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ko_KR/CVS/Entries turba/locale/ko_KR/CVS/Entries
--- turba.CURRENTCVS/locale/ko_KR/CVS/Entries Fri Aug 22 12:44:00 2003
+++ turba/locale/ko_KR/CVS/Entries Fri Aug 22 11:03:22 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ko_KR/CVS/Entries.Log turba/locale/ko_KR/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ko_KR/CVS/Entries.Log Fri Aug 22 12:44:00 2003
+++ turba/locale/ko_KR/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/lt_LT/CVS/Entries turba/locale/lt_LT/CVS/Entries
--- turba.CURRENTCVS/locale/lt_LT/CVS/Entries Fri Aug 22 12:44:00 2003
+++ turba/locale/lt_LT/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/lt_LT/CVS/Entries.Log turba/locale/lt_LT/CVS/Entries.Log
--- turba.CURRENTCVS/locale/lt_LT/CVS/Entries.Log Fri Aug 22 12:44:00 2003
+++ turba/locale/lt_LT/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/lv_LV/CVS/Entries turba/locale/lv_LV/CVS/Entries
--- turba.CURRENTCVS/locale/lv_LV/CVS/Entries Fri Aug 22 12:44:01 2003
+++ turba/locale/lv_LV/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/lv_LV/CVS/Entries.Log turba/locale/lv_LV/CVS/Entries.Log
--- turba.CURRENTCVS/locale/lv_LV/CVS/Entries.Log Fri Aug 22 12:44:01 2003
+++ turba/locale/lv_LV/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/mk_MK/CVS/Entries turba/locale/mk_MK/CVS/Entries
--- turba.CURRENTCVS/locale/mk_MK/CVS/Entries Fri Aug 22 12:44:01 2003
+++ turba/locale/mk_MK/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/mk_MK/CVS/Entries.Log turba/locale/mk_MK/CVS/Entries.Log
--- turba.CURRENTCVS/locale/mk_MK/CVS/Entries.Log Fri Aug 22 12:44:01 2003
+++ turba/locale/mk_MK/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nb_NO/CVS/Entries turba/locale/nb_NO/CVS/Entries
--- turba.CURRENTCVS/locale/nb_NO/CVS/Entries Fri Aug 22 12:44:01 2003
+++ turba/locale/nb_NO/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nb_NO/CVS/Entries.Log turba/locale/nb_NO/CVS/Entries.Log
--- turba.CURRENTCVS/locale/nb_NO/CVS/Entries.Log Fri Aug 22 12:44:01 2003
+++ turba/locale/nb_NO/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/CVS/Entries turba/locale/nl/CVS/Entries
--- turba.CURRENTCVS/locale/nl/CVS/Entries Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/CVS/Entries.Log turba/locale/nl/CVS/Entries.Log
--- turba.CURRENTCVS/locale/nl/CVS/Entries.Log Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/CVS/Repository turba/locale/nl/CVS/Repository
--- turba.CURRENTCVS/locale/nl/CVS/Repository Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/nl
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/CVS/Root turba/locale/nl/CVS/Root
--- turba.CURRENTCVS/locale/nl/CVS/Root Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/LC_MESSAGES/CVS/Entries turba/locale/nl/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/nl/LC_MESSAGES/CVS/Entries Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/LC_MESSAGES/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/LC_MESSAGES/CVS/Repository turba/locale/nl/LC_MESSAGES/CVS/Repository
--- turba.CURRENTCVS/locale/nl/LC_MESSAGES/CVS/Repository Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/LC_MESSAGES/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/nl/LC_MESSAGES
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl/LC_MESSAGES/CVS/Root turba/locale/nl/LC_MESSAGES/CVS/Root
--- turba.CURRENTCVS/locale/nl/LC_MESSAGES/CVS/Root Fri Aug 22 12:44:01 2003
+++ turba/locale/nl/LC_MESSAGES/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl_NL/CVS/Entries turba/locale/nl_NL/CVS/Entries
--- turba.CURRENTCVS/locale/nl_NL/CVS/Entries Fri Aug 22 12:44:01 2003
+++ turba/locale/nl_NL/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nl_NL/CVS/Entries.Log turba/locale/nl_NL/CVS/Entries.Log
--- turba.CURRENTCVS/locale/nl_NL/CVS/Entries.Log Fri Aug 22 12:44:01 2003
+++ turba/locale/nl_NL/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nn_NO/CVS/Entries turba/locale/nn_NO/CVS/Entries
--- turba.CURRENTCVS/locale/nn_NO/CVS/Entries Fri Aug 22 12:44:02 2003
+++ turba/locale/nn_NO/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/nn_NO/CVS/Entries.Log turba/locale/nn_NO/CVS/Entries.Log
--- turba.CURRENTCVS/locale/nn_NO/CVS/Entries.Log Fri Aug 22 12:44:02 2003
+++ turba/locale/nn_NO/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/CVS/Entries turba/locale/no_BOK/CVS/Entries
--- turba.CURRENTCVS/locale/no_BOK/CVS/Entries Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/CVS/Entries.Log turba/locale/no_BOK/CVS/Entries.Log
--- turba.CURRENTCVS/locale/no_BOK/CVS/Entries.Log Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/CVS/Repository turba/locale/no_BOK/CVS/Repository
--- turba.CURRENTCVS/locale/no_BOK/CVS/Repository Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/no_BOK
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/CVS/Root turba/locale/no_BOK/CVS/Root
--- turba.CURRENTCVS/locale/no_BOK/CVS/Root Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/LC_MESSAGES/CVS/Entries turba/locale/no_BOK/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/no_BOK/LC_MESSAGES/CVS/Entries Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/LC_MESSAGES/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/LC_MESSAGES/CVS/Repository turba/locale/no_BOK/LC_MESSAGES/CVS/Repository
--- turba.CURRENTCVS/locale/no_BOK/LC_MESSAGES/CVS/Repository Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/LC_MESSAGES/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/no_BOK/LC_MESSAGES
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/no_BOK/LC_MESSAGES/CVS/Root turba/locale/no_BOK/LC_MESSAGES/CVS/Root
--- turba.CURRENTCVS/locale/no_BOK/LC_MESSAGES/CVS/Root Fri Aug 22 12:44:02 2003
+++ turba/locale/no_BOK/LC_MESSAGES/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/pl_PL/CVS/Entries turba/locale/pl_PL/CVS/Entries
--- turba.CURRENTCVS/locale/pl_PL/CVS/Entries Fri Aug 22 12:44:02 2003
+++ turba/locale/pl_PL/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/pl_PL/CVS/Entries.Log turba/locale/pl_PL/CVS/Entries.Log
--- turba.CURRENTCVS/locale/pl_PL/CVS/Entries.Log Fri Aug 22 12:44:02 2003
+++ turba/locale/pl_PL/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/pt_BR/CVS/Entries turba/locale/pt_BR/CVS/Entries
--- turba.CURRENTCVS/locale/pt_BR/CVS/Entries Fri Aug 22 12:44:02 2003
+++ turba/locale/pt_BR/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/pt_BR/CVS/Entries.Log turba/locale/pt_BR/CVS/Entries.Log
--- turba.CURRENTCVS/locale/pt_BR/CVS/Entries.Log Fri Aug 22 12:44:02 2003
+++ turba/locale/pt_BR/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/pt_PT/CVS/Entries turba/locale/pt_PT/CVS/Entries
--- turba.CURRENTCVS/locale/pt_PT/CVS/Entries Fri Aug 22 12:44:02 2003
+++ turba/locale/pt_PT/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/pt_PT/CVS/Entries.Log turba/locale/pt_PT/CVS/Entries.Log
--- turba.CURRENTCVS/locale/pt_PT/CVS/Entries.Log Fri Aug 22 12:44:02 2003
+++ turba/locale/pt_PT/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ro_RO/CVS/Entries turba/locale/ro_RO/CVS/Entries
--- turba.CURRENTCVS/locale/ro_RO/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ro_RO/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ro_RO/CVS/Entries.Log turba/locale/ro_RO/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ro_RO/CVS/Entries.Log Fri Aug 22 12:44:03 2003
+++ turba/locale/ro_RO/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_RU/CVS/Entries turba/locale/ru_RU/CVS/Entries
--- turba.CURRENTCVS/locale/ru_RU/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_RU/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_RU/CVS/Entries.Log turba/locale/ru_RU/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ru_RU/CVS/Entries.Log Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_RU/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_RU.KOI8-R/CVS/Entries turba/locale/ru_RU.KOI8-R/CVS/Entries
--- turba.CURRENTCVS/locale/ru_RU.KOI8-R/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_RU.KOI8-R/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_RU.KOI8-R/CVS/Entries.Log turba/locale/ru_RU.KOI8-R/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ru_RU.KOI8-R/CVS/Entries.Log Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_RU.KOI8-R/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/CVS/Entries turba/locale/ru_koi/CVS/Entries
--- turba.CURRENTCVS/locale/ru_koi/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/CVS/Entries.Log turba/locale/ru_koi/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ru_koi/CVS/Entries.Log Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/CVS/Repository turba/locale/ru_koi/CVS/Repository
--- turba.CURRENTCVS/locale/ru_koi/CVS/Repository Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/ru_koi
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/CVS/Root turba/locale/ru_koi/CVS/Root
--- turba.CURRENTCVS/locale/ru_koi/CVS/Root Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/LC_MESSAGES/CVS/Entries turba/locale/ru_koi/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/ru_koi/LC_MESSAGES/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/LC_MESSAGES/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/LC_MESSAGES/CVS/Repository turba/locale/ru_koi/LC_MESSAGES/CVS/Repository
--- turba.CURRENTCVS/locale/ru_koi/LC_MESSAGES/CVS/Repository Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/LC_MESSAGES/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/ru_koi/LC_MESSAGES
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_koi/LC_MESSAGES/CVS/Root turba/locale/ru_koi/LC_MESSAGES/CVS/Root
--- turba.CURRENTCVS/locale/ru_koi/LC_MESSAGES/CVS/Root Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_koi/LC_MESSAGES/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/CVS/Entries turba/locale/ru_win/CVS/Entries
--- turba.CURRENTCVS/locale/ru_win/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/CVS/Entries.Log turba/locale/ru_win/CVS/Entries.Log
--- turba.CURRENTCVS/locale/ru_win/CVS/Entries.Log Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/CVS/Repository turba/locale/ru_win/CVS/Repository
--- turba.CURRENTCVS/locale/ru_win/CVS/Repository Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/ru_win
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/CVS/Root turba/locale/ru_win/CVS/Root
--- turba.CURRENTCVS/locale/ru_win/CVS/Root Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/LC_MESSAGES/CVS/Entries turba/locale/ru_win/LC_MESSAGES/CVS/Entries
--- turba.CURRENTCVS/locale/ru_win/LC_MESSAGES/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/LC_MESSAGES/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/LC_MESSAGES/CVS/Repository turba/locale/ru_win/LC_MESSAGES/CVS/Repository
--- turba.CURRENTCVS/locale/ru_win/LC_MESSAGES/CVS/Repository Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/LC_MESSAGES/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/locale/ru_win/LC_MESSAGES
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/ru_win/LC_MESSAGES/CVS/Root turba/locale/ru_win/LC_MESSAGES/CVS/Root
--- turba.CURRENTCVS/locale/ru_win/LC_MESSAGES/CVS/Root Fri Aug 22 12:44:03 2003
+++ turba/locale/ru_win/LC_MESSAGES/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/sk_SK/CVS/Entries turba/locale/sk_SK/CVS/Entries
--- turba.CURRENTCVS/locale/sk_SK/CVS/Entries Fri Aug 22 12:44:03 2003
+++ turba/locale/sk_SK/CVS/Entries Fri Aug 22 11:03:23 2003
@@ -1,2 +1,2 @@
/help.xml/1.3/Mon Jul 14 23:00:59 2003//
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/sk_SK/CVS/Entries.Log turba/locale/sk_SK/CVS/Entries.Log
--- turba.CURRENTCVS/locale/sk_SK/CVS/Entries.Log Fri Aug 22 12:44:03 2003
+++ turba/locale/sk_SK/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/sl_SI/CVS/Entries turba/locale/sl_SI/CVS/Entries
--- turba.CURRENTCVS/locale/sl_SI/CVS/Entries Fri Aug 22 12:44:04 2003
+++ turba/locale/sl_SI/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/sl_SI/CVS/Entries.Log turba/locale/sl_SI/CVS/Entries.Log
--- turba.CURRENTCVS/locale/sl_SI/CVS/Entries.Log Fri Aug 22 12:44:04 2003
+++ turba/locale/sl_SI/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/sv_SE/CVS/Entries turba/locale/sv_SE/CVS/Entries
--- turba.CURRENTCVS/locale/sv_SE/CVS/Entries Fri Aug 22 12:44:04 2003
+++ turba/locale/sv_SE/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/sv_SE/CVS/Entries.Log turba/locale/sv_SE/CVS/Entries.Log
--- turba.CURRENTCVS/locale/sv_SE/CVS/Entries.Log Fri Aug 22 12:44:04 2003
+++ turba/locale/sv_SE/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/uk_UA/CVS/Entries turba/locale/uk_UA/CVS/Entries
--- turba.CURRENTCVS/locale/uk_UA/CVS/Entries Fri Aug 22 12:44:04 2003
+++ turba/locale/uk_UA/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/uk_UA/CVS/Entries.Log turba/locale/uk_UA/CVS/Entries.Log
--- turba.CURRENTCVS/locale/uk_UA/CVS/Entries.Log Fri Aug 22 12:44:04 2003
+++ turba/locale/uk_UA/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/zh_CN/CVS/Entries turba/locale/zh_CN/CVS/Entries
--- turba.CURRENTCVS/locale/zh_CN/CVS/Entries Fri Aug 22 12:44:04 2003
+++ turba/locale/zh_CN/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/zh_CN/CVS/Entries.Log turba/locale/zh_CN/CVS/Entries.Log
--- turba.CURRENTCVS/locale/zh_CN/CVS/Entries.Log Fri Aug 22 12:44:04 2003
+++ turba/locale/zh_CN/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/zh_TW/CVS/Entries turba/locale/zh_TW/CVS/Entries
--- turba.CURRENTCVS/locale/zh_TW/CVS/Entries Fri Aug 22 12:44:04 2003
+++ turba/locale/zh_TW/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1 +1 @@
-D
+D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/locale/zh_TW/CVS/Entries.Log turba/locale/zh_TW/CVS/Entries.Log
--- turba.CURRENTCVS/locale/zh_TW/CVS/Entries.Log Fri Aug 22 12:44:04 2003
+++ turba/locale/zh_TW/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/LC_MESSAGES////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/packaging/CVS/Entries turba/packaging/CVS/Entries
--- turba.CURRENTCVS/packaging/CVS/Entries Fri Aug 22 12:44:05 2003
+++ turba/packaging/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1 +1 @@
-D
+D/redhat////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/packaging/CVS/Entries.Log turba/packaging/CVS/Entries.Log
--- turba.CURRENTCVS/packaging/CVS/Entries.Log Fri Aug 22 12:44:05 2003
+++ turba/packaging/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-A D/redhat////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/po/CVS/Entries turba/po/CVS/Entries
--- turba.CURRENTCVS/po/CVS/Entries Fri Aug 22 12:44:08 2003
+++ turba/po/CVS/Entries Fri Aug 22 11:03:30 2003
@@ -16,7 +16,6 @@
/fr_FR.po/1.6/Wed Jan 8 16:45:35 2003//
/hu_HU.po/1.1/Fri Jun 7 14:14:59 2002//
/it_IT.po/1.8/Mon Mar 10 02:30:04 2003//
-/ja_JP.po/1.3/Fri Aug 15 11:49:27 2003//
/ko_KR.po/1.3/Mon Dec 31 14:05:56 2001//
/lt_LT.po/1.4/Sun Apr 6 14:28:16 2003//
/lv_LV.po/1.1/Sun Dec 1 12:52:46 2002//
@@ -39,4 +38,5 @@
/xgettext.sh/1.1/Tue May 15 21:28:58 2001//
/zh_CN.po/1.2/Wed Jan 2 10:26:52 2002//
/zh_TW.po/1.14/Wed Jul 30 11:14:16 2003//
+/ja_JP.po/1.3/Fri Aug 22 01:33:30 2003//
D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/scripts/CVS/Entries turba/scripts/CVS/Entries
--- turba.CURRENTCVS/scripts/CVS/Entries Fri Aug 22 12:44:10 2003
+++ turba/scripts/CVS/Entries Fri Aug 22 11:03:24 2003
@@ -1,3 +1,4 @@
/.htaccess/1.1/Sat Dec 29 21:22:49 2001//
/Turba.reg/1.1/Wed Jul 17 20:57:32 2002/-kb/
-D
+D/drivers////
+D/ldap////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/scripts/CVS/Entries.Log turba/scripts/CVS/Entries.Log
--- turba.CURRENTCVS/scripts/CVS/Entries.Log Fri Aug 22 12:44:10 2003
+++ turba/scripts/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1,2 +0,0 @@
-A D/drivers////
-A D/ldap////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/CVS/Entries turba/templates/CVS/Entries
--- turba.CURRENTCVS/templates/CVS/Entries Fri Aug 22 12:44:10 2003
+++ turba/templates/CVS/Entries Fri Aug 22 11:19:27 2003
@@ -1,4 +1,12 @@
/.htaccess/1.1/Sat Dec 29 21:22:49 2001//
/common-footer.inc/1.7/Sat Jun 15 05:05:23 2002//
/common-header.inc/1.18/Tue Jun 10 15:18:54 2003//
-D
+D/addlink////
+D/advanced////
+D/block////
+D/browse////
+D/data////
+D/index////
+D/menu////
+D/miniwindow////
+D/prefs////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/CVS/Entries.Log turba/templates/CVS/Entries.Log
--- turba.CURRENTCVS/templates/CVS/Entries.Log Fri Aug 22 12:44:11 2003
+++ turba/templates/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1,17 +0,0 @@
-A D/add////
-A D/addlink////
-A D/advanced////
-A D/block////
-A D/browse////
-A D/data////
-A D/display////
-A D/edit////
-A D/index////
-A D/javascript////
-A D/login////
-A D/manage////
-A D/menu////
-A D/miniwindow////
-A D/prefs////
-A D/search////
-A D/wml////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/add/CVS/Entries turba/templates/add/CVS/Entries
--- turba.CURRENTCVS/templates/add/CVS/Entries Fri Aug 22 12:44:10 2003
+++ turba/templates/add/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/add/CVS/Repository turba/templates/add/CVS/Repository
--- turba.CURRENTCVS/templates/add/CVS/Repository Fri Aug 22 12:44:10 2003
+++ turba/templates/add/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/add
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/add/CVS/Root turba/templates/add/CVS/Root
--- turba.CURRENTCVS/templates/add/CVS/Root Fri Aug 22 12:44:10 2003
+++ turba/templates/add/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/browse/actions.inc turba/templates/browse/actions.inc
--- turba.CURRENTCVS/templates/browse/actions.inc Wed Jun 18 07:58:04 2003
+++ turba/templates/browse/actions.inc Fri Aug 22 12:28:05 2003
@@ -12,7 +12,9 @@
</td>
<td align="right" nowrap="nowrap">
-<?php if (!empty($cfgSources[$source]['map']['__type'])): ?>
+<?php
+ $source = PERSONAL_ADDRESS_BOOK_SOURCE;
+ if (!empty($cfgSources[$source]['map']['__type'])): ?>
<form name='targetList' action="javascript:void(0)" onsubmit="return false">
<input type="button" class="button" onclick="ListUpdate(); Submit('add'); return false;" value="<?php echo _("Add to") ?>" />
<select name="listList">
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/browse/contactrow.inc turba/templates/browse/contactrow.inc
--- turba.CURRENTCVS/templates/browse/contactrow.inc Sat May 17 12:06:55 2003
+++ turba/templates/browse/contactrow.inc Fri Aug 22 11:36:56 2003
@@ -48,7 +48,11 @@
}
?>
<tr class="<?php echo $class ?>" onmouseover="javascript:style.backgroundColor='<?php echo $hi ?>';" onmouseout="javascript:style.backgroundColor='<?php echo $lo ?>';">
- <td><input type="checkbox" name="objectkeys[]" value="<?php echo htmlspecialchars($ob->getValue('__key')) ?>" /></td>
+<!-- iisjsoo
+ Changed the next line to include the source of where the entry comes from
+-->
+ <td><input type="checkbox" name="objectkeys[]" value="<?php echo htmlspecialchars($ob->getSource()) . "|" .htmlspecialchars($ob->getValue('__key')) ?>" /></td>
+
<td><?php echo $edit_url ?></td>
<td><?php echo $del_url ?></td>
<td><?php echo $ob->isGroup() ? Horde::img('group.gif', _("Group")) : ' ' ?></td>
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/display/CVS/Entries turba/templates/display/CVS/Entries
--- turba.CURRENTCVS/templates/display/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/display/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/display/CVS/Repository turba/templates/display/CVS/Repository
--- turba.CURRENTCVS/templates/display/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/display/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/display
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/display/CVS/Root turba/templates/display/CVS/Root
--- turba.CURRENTCVS/templates/display/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/display/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/edit/CVS/Entries turba/templates/edit/CVS/Entries
--- turba.CURRENTCVS/templates/edit/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/edit/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/edit/CVS/Repository turba/templates/edit/CVS/Repository
--- turba.CURRENTCVS/templates/edit/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/edit/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/edit
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/edit/CVS/Root turba/templates/edit/CVS/Root
--- turba.CURRENTCVS/templates/edit/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/edit/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/javascript/CVS/Entries turba/templates/javascript/CVS/Entries
--- turba.CURRENTCVS/templates/javascript/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/javascript/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/javascript/CVS/Repository turba/templates/javascript/CVS/Repository
--- turba.CURRENTCVS/templates/javascript/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/javascript/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/javascript
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/javascript/CVS/Root turba/templates/javascript/CVS/Root
--- turba.CURRENTCVS/templates/javascript/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/javascript/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/login/CVS/Entries turba/templates/login/CVS/Entries
--- turba.CURRENTCVS/templates/login/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/login/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/login/CVS/Repository turba/templates/login/CVS/Repository
--- turba.CURRENTCVS/templates/login/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/login/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/login
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/login/CVS/Root turba/templates/login/CVS/Root
--- turba.CURRENTCVS/templates/login/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/login/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/manage/CVS/Entries turba/templates/manage/CVS/Entries
--- turba.CURRENTCVS/templates/manage/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/manage/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/manage/CVS/Repository turba/templates/manage/CVS/Repository
--- turba.CURRENTCVS/templates/manage/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/manage/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/manage
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/manage/CVS/Root turba/templates/manage/CVS/Root
--- turba.CURRENTCVS/templates/manage/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/manage/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/search/CVS/Entries turba/templates/search/CVS/Entries
--- turba.CURRENTCVS/templates/search/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/search/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/search/CVS/Repository turba/templates/search/CVS/Repository
--- turba.CURRENTCVS/templates/search/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/search/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/search
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/search/CVS/Root turba/templates/search/CVS/Root
--- turba.CURRENTCVS/templates/search/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/search/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/CVS/Entries turba/templates/wml/CVS/Entries
--- turba.CURRENTCVS/templates/wml/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/CVS/Entries.Log turba/templates/wml/CVS/Entries.Log
--- turba.CURRENTCVS/templates/wml/CVS/Entries.Log Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/CVS/Entries.Log Thu Jan 1 09:30:00 1970
@@ -1,2 +0,0 @@
-A D/menu////
-A D/search////
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/CVS/Repository turba/templates/wml/CVS/Repository
--- turba.CURRENTCVS/templates/wml/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/wml
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/CVS/Root turba/templates/wml/CVS/Root
--- turba.CURRENTCVS/templates/wml/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/menu/CVS/Entries turba/templates/wml/menu/CVS/Entries
--- turba.CURRENTCVS/templates/wml/menu/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/menu/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/menu/CVS/Repository turba/templates/wml/menu/CVS/Repository
--- turba.CURRENTCVS/templates/wml/menu/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/menu/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/wml/menu
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/menu/CVS/Root turba/templates/wml/menu/CVS/Root
--- turba.CURRENTCVS/templates/wml/menu/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/menu/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/search/CVS/Entries turba/templates/wml/search/CVS/Entries
--- turba.CURRENTCVS/templates/wml/search/CVS/Entries Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/search/CVS/Entries Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-D
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/search/CVS/Repository turba/templates/wml/search/CVS/Repository
--- turba.CURRENTCVS/templates/wml/search/CVS/Repository Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/search/CVS/Repository Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-turba/templates/wml/search
diff -burN --exclude='*.dist' --exclude=config --exclude='*.back' --exclude='*.modified' --exclude='*.sql' turba.CURRENTCVS/templates/wml/search/CVS/Root turba/templates/wml/search/CVS/Root
--- turba.CURRENTCVS/templates/wml/search/CVS/Root Fri Aug 22 12:44:11 2003
+++ turba/templates/wml/search/CVS/Root Thu Jan 1 09:30:00 1970
@@ -1 +0,0 @@
-:pserver:cvsread at anoncvs.horde.org:/repository
More information about the dev
mailing list