cvs: pear /Net_LDAP2 LDAP2.php package2.xml /Net_LDAP2/LDAP2 Schema.php

[email protected] ("Benedikt Hallinger")
Newsgroups php.pear.cvs
Message-ID <cvsbeni1208756221@cvsserver> 
beni		Mon Apr 21 05:37:01 2008 UTC

  Modified files:              
    /pear/Net_LDAP2	LDAP2.php package2.xml 
    /pear/Net_LDAP2/LDAP2	Schema.php 
  Log:
  * Fixed bug #13721 (some constants)
  
  
http://cvs.php.net/viewvc.cgi/pear/Net_LDAP2/LDAP2.php?r1=1.2&r2=1.3&diff_format=u
Index: pear/Net_LDAP2/LDAP2.php
diff -u pear/Net_LDAP2/LDAP2.php:1.2 pear/Net_LDAP2/LDAP2.php:1.3
--- pear/Net_LDAP2/LDAP2.php:1.2	Thu Mar 20 09:32:39 2008
+++ pear/Net_LDAP2/LDAP2.php	Mon Apr 21 05:37:01 2008
@@ -13,7 +13,7 @@
 * @author    Benedikt Hallinger <[email protected]>
 * @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
 * @license   http://www.gnu.org/copyleft/lesser.html LGPL
-* @version   CVS: $Id: LDAP2.php,v 1.2 2008/03/20 09:32:39 beni Exp $
+* @version   CVS: $Id: LDAP2.php,v 1.3 2008/04/21 05:37:01 beni Exp $
 * @link      http://pear.php.net/package/Net_LDAP22/
 */
 
@@ -32,12 +32,12 @@
 /**
 *  Error constants for errors that are not LDAP errors.
 */
-define('NET_LDAP_ERROR', 1000);
+define('NET_LDAP2_ERROR', 1000);
 
 /**
 * Net_LDAP2 Version
 */
-define('NET_LDAP_VERSION', '2.0.0');
+define('NET_LDAP2_VERSION', '2.0.0');
 
 /**
 * Net_LDAP2 - manipulate LDAP servers the right way!
@@ -50,7 +50,7 @@
 * @author    Benedikt Hallinger <[email protected]>
 * @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
 * @license   http://www.gnu.org/copyleft/lesser.html LGPL
-* @version   CVS: $Id: LDAP2.php,v 1.2 2008/03/20 09:32:39 beni Exp $
+* @version   CVS: $Id: LDAP2.php,v 1.3 2008/04/21 05:37:01 beni Exp $
 * @link      http://pear.php.net/package/Net_LDAP22/
 */
 class Net_LDAP2 extends PEAR
@@ -134,7 +134,7 @@
     */
     public static function getVersion()
     {
-        return NET_LDAP_VERSION;
+        return NET_LDAP2_VERSION;
     }
 
     /**
@@ -788,7 +788,7 @@
                     if ($err) {
                         $msg = @ldap_err2str($err);
                     } else {
-                        $err = NET_LDAP_ERROR;
+                        $err = NET_LDAP2_ERROR;
                         $msg = $this->errorMessage($err);
                     }
                     return $this->raiseError($msg, $err);
@@ -820,7 +820,7 @@
                     if ($err) {
                         $msg = @ldap_err2str($err);
                     } else {
-                        $err = NET_LDAP_ERROR;
+                        $err = NET_LDAP2_ERROR;
                         $msg = $this->errorMessage($err);
                     }
                     return $this->raiseError($msg, $err);
@@ -1110,7 +1110,7 @@
 
          return isset($errorMessages[$errorcode]) ?
             $errorMessages[$errorcode] :
-            $errorMessages[NET_LDAP_ERROR] . ' (' . $errorcode . ')';
+            $errorMessages[NET_LDAP2_ERROR] . ' (' . $errorcode . ')';
     }
 
     /**
@@ -1330,13 +1330,13 @@
      * @access public
      * @see PEAR_Error
      */
-    public function __construct($message = 'Net_LDAP2_Error', $code = NET_LDAP_ERROR, $mode = PEAR_ERROR_RETURN,
+    public function __construct($message = 'Net_LDAP2_Error', $code = NET_LDAP2_ERROR, $mode = PEAR_ERROR_RETURN,
                          $level = E_USER_NOTICE, $debuginfo = null)
     {
         if (is_int($code)) {
             $this->PEAR_Error($message . ': ' . Net_LDAP2::errorMessage($code), $code, $mode, $level, $debuginfo);
         } else {
-            $this->PEAR_Error("$message: $code", NET_LDAP_ERROR, $mode, $level, $debuginfo);
+            $this->PEAR_Error("$message: $code", NET_LDAP2_ERROR, $mode, $level, $debuginfo);
         }
     }
 }
http://cvs.php.net/viewvc.cgi/pear/Net_LDAP2/package2.xml?r1=1.9&r2=1.10&diff_format=u
Index: pear/Net_LDAP2/package2.xml
diff -u pear/Net_LDAP2/package2.xml:1.9 pear/Net_LDAP2/package2.xml:1.10
--- pear/Net_LDAP2/package2.xml:1.9	Tue Apr  8 07:41:36 2008
+++ pear/Net_LDAP2/package2.xml	Mon Apr 21 05:37:01 2008
@@ -37,6 +37,7 @@
     <license>LGPL License</license>
     <notes>
         * new constructor factory for Entry objects: createExisting()
+	* Some small bugfixes
     </notes>
 
     <contents>
http://cvs.php.net/viewvc.cgi/pear/Net_LDAP2/LDAP2/Schema.php?r1=1.2&r2=1.3&diff_format=u
Index: pear/Net_LDAP2/LDAP2/Schema.php
diff -u pear/Net_LDAP2/LDAP2/Schema.php:1.2 pear/Net_LDAP2/LDAP2/Schema.php:1.3
--- pear/Net_LDAP2/LDAP2/Schema.php:1.2	Thu Mar 20 09:32:39 2008
+++ pear/Net_LDAP2/LDAP2/Schema.php	Mon Apr 21 05:37:01 2008
@@ -9,14 +9,14 @@
 * Please don't forget to add binary attributes to isBinary() below
 * to support proper value fetching from Net_LDAP2_Entry
 */
-define('NET_LDAP_SYNTAX_BOOLEAN',            '1.3.6.1.4.1.1466.115.121.1.7');
-define('NET_LDAP_SYNTAX_DIRECTORY_STRING',   '1.3.6.1.4.1.1466.115.121.1.15');
-define('NET_LDAP_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12');
-define('NET_LDAP_SYNTAX_INTEGER',            '1.3.6.1.4.1.1466.115.121.1.27');
-define('NET_LDAP_SYNTAX_JPEG',               '1.3.6.1.4.1.1466.115.121.1.28');
-define('NET_LDAP_SYNTAX_NUMERIC_STRING',     '1.3.6.1.4.1.1466.115.121.1.36');
-define('NET_LDAP_SYNTAX_OID',                '1.3.6.1.4.1.1466.115.121.1.38');
-define('NET_LDAP_SYNTAX_OCTET_STRING',       '1.3.6.1.4.1.1466.115.121.1.40');
+define('NET_LDAP2_SYNTAX_BOOLEAN',            '1.3.6.1.4.1.1466.115.121.1.7');
+define('NET_LDAP2_SYNTAX_DIRECTORY_STRING',   '1.3.6.1.4.1.1466.115.121.1.15');
+define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12');
+define('NET_LDAP2_SYNTAX_INTEGER',            '1.3.6.1.4.1.1466.115.121.1.27');
+define('NET_LDAP2_SYNTAX_JPEG',               '1.3.6.1.4.1.1466.115.121.1.28');
+define('NET_LDAP2_SYNTAX_NUMERIC_STRING',     '1.3.6.1.4.1.1466.115.121.1.36');
+define('NET_LDAP2_SYNTAX_OID',                '1.3.6.1.4.1.1466.115.121.1.38');
+define('NET_LDAP2_SYNTAX_OCTET_STRING',       '1.3.6.1.4.1.1466.115.121.1.40');
 
 /**
 * Load an LDAP Schema and provide information
@@ -31,7 +31,7 @@
 * @author   Jan Wagner <[email protected]>
 * @author   Benedikt Hallinger <[email protected]>
 * @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @version  CVS: $Id: Schema.php,v 1.2 2008/03/20 09:32:39 beni Exp $
+* @version  CVS: $Id: Schema.php,v 1.3 2008/04/21 05:37:01 beni Exp $
 * @link     http://pear.php.net/package/Net_LDAP22/
 */
 class Net_LDAP2_Schema extends PEAR
@@ -105,7 +105,7 @@
     *
     * @author Jan Wagner <[email protected]>
     * @access public
-    * @return Net_LDAP2_Schema|Net_LDAP_Error
+    * @return Net_LDAP2_Schema|NET_LDAP2_Error
     */
     public function fetch(&$ldap, $dn = null) {
         if (!$ldap instanceof Net_LDAP2) {
@@ -464,8 +464,8 @@
         // containing binary values
         // The Syntax Definitons go into constants at the top of this page
         $syntax_binary = array(
-                           NET_LDAP_SYNTAX_OCTET_STRING,
-                           NET_LDAP_SYNTAX_JPEG
+                           NET_LDAP2_SYNTAX_OCTET_STRING,
+                           NET_LDAP2_SYNTAX_JPEG
                          );
 
         // Check Syntax
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.