[PHP-DEV] CVS update: php3/functions From: amitay (php-dev <email protected>)
Date: 04/23/98

Date: Thursday April 23, 1998 @ 18:03
Author: amitay

Update of /repository/php3/functions
In directory asf:/tmp/cvs-serv19216/functions

Modified Files:
        ldap.c php3_ldap.h
Log Message:
Added ldap_explode_dn.

Index: php3/functions/ldap.c
diff -c php3/functions/ldap.c:1.38 php3/functions/ldap.c:1.39
*** php3/functions/ldap.c:1.38 Fri Mar 27 15:02:41 1998
--- php3/functions/ldap.c Thu Apr 23 18:03:29 1998
***************
*** 24,30 ****
   */
   
  
! /* $Id: ldap.c,v 1.38 1998/03/27 20:02:41 amitay Exp $ */
  
  #ifndef MSVC5
  #include "config.h"
--- 24,30 ----
   */
   
  
! /* $Id: ldap.c,v 1.39 1998/04/23 22:03:29 amitay Exp $ */
  
  #ifndef MSVC5
  #include "config.h"
***************
*** 99,108 ****
          {"ldap_get_attributes", php3_ldap_get_attributes, NULL},
          {"ldap_get_values", php3_ldap_get_values, NULL},
          {"ldap_get_dn", php3_ldap_get_dn, NULL},
- /*
- {"ldap_explode_rdn", php3_ldap_explode_rdn, NULL},
          {"ldap_explode_dn", php3_ldap_explode_dn, NULL},
- */
          {"ldap_dn2ufn", php3_ldap_dn2ufn, NULL},
          {"ldap_add", php3_ldap_add, NULL},
          {"ldap_delete", php3_ldap_delete, NULL},
--- 99,105 ----
***************
*** 268,274 ****
  
          php3_printf("<table>"
                                  "<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.38 1998/03/27 20:02:41 amitay Exp $</td></tr>\n"
  #if HAVE_NSLDAP
                                  "<tr><td>SDK Version:</td><td>%f</td></tr>"
                                  "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>"
--- 265,271 ----
  
          php3_printf("<table>"
                                  "<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.39 1998/04/23 22:03:29 amitay Exp $</td></tr>\n"
  #if HAVE_NSLDAP
                                  "<tr><td>SDK Version:</td><td>%f</td></tr>"
                                  "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>"
***************
*** 1008,1025 ****
  }
  
  
! #if 0
! void php3_ldap_explode_rdn(INTERNAL_FUNCTION_PARAMETERS)
  {
! RETURN_TRUE;
! }
  
  
! void php3_ldap_explode_dn(INTERNAL_FUNCTION_PARAMETERS)
! {
! RETURN_TRUE;
  }
- #endif
  
  
  void php3_ldap_dn2ufn(INTERNAL_FUNCTION_PARAMETERS)
--- 1005,1040 ----
  }
  
  
! void php3_ldap_explode_dn(INTERNAL_FUNCTION_PARAMETERS)
  {
! YYSTYPE *dn, *with_attrib;
! char **ldap_value;
! int i, count;
  
+ if(ARG_COUNT(ht) != 2 || getParameters(ht, 2, &dn, &with_attrib)== FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
  
! convert_to_string(dn);
! convert_to_long(with_attrib);
!
! ldap_value = ldap_explode_dn(dn->value.str.val, with_attrib->value.lval);
!
! i=0;
! while(ldap_value[i] != NULL) i++;
! count = i;
!
! if(array_init(return_value) == FAILURE) {
! RETURN_FALSE;
! }
!
! add_assoc_long(return_value, "count", count);
! for(i=0; i<count; i++) {
! add_index_string(return_value, i, ldap_value[i], 1);
! }
!
! ldap_value_free(ldap_value);
  }
  
  
  void php3_ldap_dn2ufn(INTERNAL_FUNCTION_PARAMETERS)
Index: php3/functions/php3_ldap.h
diff -c php3/functions/php3_ldap.h:1.13 php3/functions/php3_ldap.h:1.14
*** php3/functions/php3_ldap.h:1.13 Fri Mar 27 15:02:42 1998
--- php3/functions/php3_ldap.h Thu Apr 23 18:03:29 1998
***************
*** 24,30 ****
   */
  
  
! /* $Id: php3_ldap.h,v 1.13 1998/03/27 20:02:42 amitay Exp $ */
  
  #ifndef _PHP3_LDAP_H
  #define _PHP3_LDAP_H
--- 24,30 ----
   */
  
  
! /* $Id: php3_ldap.h,v 1.14 1998/04/23 22:03:29 amitay Exp $ */
  
  #ifndef _PHP3_LDAP_H
  #define _PHP3_LDAP_H
***************
*** 69,78 ****
  
  /*extern void php3_ber_free(INTERNAL_FUNCTION_PARAMETERS);*/
  extern void php3_ldap_get_dn(INTERNAL_FUNCTION_PARAMETERS);
- /*
- extern void php3_ldap_explode_rdn(INTERNAL_FUNCTION_PARAMETERS);
  extern void php3_ldap_explode_dn(INTERNAL_FUNCTION_PARAMETERS);
- */
  extern void php3_ldap_dn2ufn(INTERNAL_FUNCTION_PARAMETERS);
  
  extern void php3_ldap_add(INTERNAL_FUNCTION_PARAMETERS);
--- 69,75 ----