[Phpgroupware-cvs] phpgwapi/inc/class.contacts_ldap.inc.php, 1.11.2.5.2.9

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.contacts_ldap.inc.php

date: 2004/06/21 07:49:45;  author: powerstat;  state: Exp;  lines: +9 -15

Log Message:
partly phpdoc update for contacts backend - still not finished.
=====================================================================
Index: phpgwapi/inc/class.contacts_ldap.inc.php
diff -u phpgwapi/inc/class.contacts_ldap.inc.php:1.11.2.5.2.8 
phpgwapi/inc/class.contacts_ldap.inc.php:1.11.2.5.2.9
--- phpgwapi/inc/class.contacts_ldap.inc.php:1.11.2.5.2.8       Thu Mar 11 
01:08:21 2004
+++ phpgwapi/inc/class.contacts_ldap.inc.php    Mon Jun 21 07:49:45 2004
@@ -17,7 +17,7 @@
        * @package phpgwapi
        * @subpackage contacts
        * This class provides a contact database scheme. It attempts to be 
based on the vcard 2.1 standard,
-       * with mods as needed to make for more reasonable sql storage. The LDAP 
schema used here may require 
+       * with mods as needed to make for more reasonable sql storage. The LDAP 
schema used here may require
        * installation of schema files available in the phpgwapi/doc/ldap dir. 
Please see the README file there.
        * @internal Syntax: CreateObject('phpgwapi.contacts');
        * @internal Example: $contacts = CreateObject('phpgwapi.contacts');
@@ -56,16 +56,16 @@
                        'title'               => 'title',
 
                        'adr_one_street'      => 'street',
-                       'adr_one_locality'    => 'l', 
-                       'adr_one_region'      => 'st', 
+                       'adr_one_locality'    => 'l',
+                       'adr_one_region'      => 'st',
                        'adr_one_postalcode'  => 'postalcode',
                        'adr_one_countryname' => 'co',
                        'adr_one_type'        => 'phpgwadronetype',
                        'label'               => 'phpgwaddresslabel',
 
                        'adr_two_street'      => 'phpgwadrtwostreet',
-                       'adr_two_locality'    => 'phpgwadrtwolocality', 
-                       'adr_two_region'      => 'phpgwadrtworegion', 
+                       'adr_two_locality'    => 'phpgwadrtwolocality',
+                       'adr_two_region'      => 'phpgwadrtworegion',
                        'adr_two_postalcode'  => 'phpgwadrtwopostalcode',
                        'adr_two_countryname' => 'phpgwadrtwocountryname',
                        'adr_two_type'        => 'phpgwadrtwotype',
@@ -73,7 +73,7 @@
                        'tel_work'            => 'telephonenumber',
                        'tel_home'            => 'homephone',
                        'tel_voice'           => 'phpgwvoicetelephonenumber',
-                       'tel_fax'             => 'facsimiletelephonenumber', 
+                       'tel_fax'             => 'facsimiletelephonenumber',
                        'tel_msg'             => 'phpgwmsgtelephonenumber',
                        'tel_cell'            => 'phpgwcelltelephonenumber',
                        'tel_pager'           => 'phpgwpagertelephonenumber',
@@ -157,7 +157,6 @@
                        print_debug('contacts_ldap:','Inside 
contacts_ldap','api');
                }
 
-               /* send this the id and whatever fields you want to see */
                function read_single_entry($id,$fields = '')
                {
                        if (!$fields || empty($fields)) { $fields = 
$this->stock_contact_fields; }
@@ -288,7 +287,6 @@
                        return $return_fields;
                }
 
-               /* send this the range, query, sort, order and whatever fields 
you want to see */
                function 
read($start=0,$limit=0,$fields='',$query='',$filter='',$sort='',$order='', 
$lastmod=-1)
                {
                        if(!$start)  { $start  = 0; }
@@ -340,7 +338,7 @@
                        }
                        or maybe not like this - i am not sure what i am doing 
:)
                */
-       
+
 
                        if (is_array($this->grants))
                        {
@@ -470,7 +468,6 @@
                        return $return_fields;
                }
 
-               /* Used by read() above to build the ldap filter string */
                function makefilter($qarray,$extra='',$query='', $DEBUG=False)
                {
                        if(!is_array($qarray))
@@ -641,7 +638,7 @@
                        $ldap_fields['objectclass'][0] = 'organizationalPerson';
                        $ldap_fields['objectclass'][1] = 'inetOrgPerson';
                        $ldap_fields['objectclass'][2] = 'phpgwContact';
-                       //$ldap_fields['last_mod'] = 
$GLOBALS['phpgw']->datetime->gmtnow;               
+                       //$ldap_fields['last_mod'] = 
$GLOBALS['phpgw']->datetime->gmtnow;
 
                        /* _debug_array($ldap_fields); */
                        $err = ldap_add($this->ldap, $dn, $ldap_fields);
@@ -843,7 +840,6 @@
                        }
                }
 
-               /* Used by admin to change ownership on account delete */
                function change_owner($old_owner='',$new_owner='')
                {
                        if (!($new_owner && $old_owner))
@@ -864,7 +860,6 @@
                        return;
                }
 
-               /* This is where the real work of delete() is done, shared 
class file contains calling function */
                function delete_($id)
                {
                        $response= $GLOBALS['phpgw']->hooks->process(array(
@@ -902,7 +897,6 @@
                        return $return_value;
                }
 
-               // This is for the admin script deleteaccount.php
                function delete_all($owner=0)
                {
                        if 
(!$GLOBALS['phpgw_info']['server']['ldap_contact_context'])