[Astlinux-commits] SF.net SVN: astlinux:[6198] branches/1.0/package/webinterface/altweb

[<abe...@us...>]

Revision: 6198
          http://sourceforge.net/p/astlinux/code/6198
Author:   abelbeck
Date:     2013-09-16 18:31:49 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
web interface, phone-ldap-dir.php script, add Active Directory custom variable. Thanks Ingmar

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/version.php
    branches/1.0/package/webinterface/altweb/phone-ldap-dir.php

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2013-09-13 14:01:35 UTC (rev 6197)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2013-09-16 18:31:49 UTC (rev 6198)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.25';
+$GUI_VERSION = '1.8.26';
 
 ?>

Modified: branches/1.0/package/webinterface/altweb/phone-ldap-dir.php
===================================================================
--- branches/1.0/package/webinterface/altweb/phone-ldap-dir.php	2013-09-13 14:01:35 UTC (rev 6197)
+++ branches/1.0/package/webinterface/altweb/phone-ldap-dir.php	2013-09-16 18:31:49 UTC (rev 6198)
@@ -8,6 +8,7 @@
 
 // phone-ldap-dir.php for AstLinux
 // 25-05-2013, Convert phone-dir.php for use with LDAP
+// 16-09-2013, Add Microsoft Active Directory custom variable
 //
 // Usage: https://pbx/phone-ldap-dir.php?tls&type=generic&search=
 // If 'tls' appears, regardless of value,  start_tls is enabled (defaults to disabled)
@@ -73,6 +74,7 @@
   $user = '';
   $pass = '';
   $proto_version = 3;
+  $ms_ad = FALSE;       // Set to TRUE for Active Directory server
   // end
 
   $uri = '';
@@ -95,6 +97,9 @@
     if ($proto_version > 0) {
       ldap_set_option($client, LDAP_OPT_PROTOCOL_VERSION, $proto_version);
     }
+    if ($ms_ad) {
+      ldap_set_option($client, LDAP_OPT_REFERRALS, 0);
+    }
     if ($start_tls && strncmp($uri, 'ldaps://', 8)) {  // Don't use together with ldaps://
       if (! ldap_start_tls($client)) {
         ldap_close($client);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.