Changeset 549

Timestamp:

11/11/08 14:59:58 (15 years ago)

Author:

niltonneto

Message:

resolve #372

Location:

trunk

Files:

• phpgwapi/templates/celepar/navbar.inc.php (modified) (1 diff)
• preferences/termo_aceite.php (modified) (3 diffs)

trunk/phpgwapi/templates/celepar/navbar.inc.php

@@ -243 +243 @@
                                 $agreeterm_url = $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/termo_aceite.php';
                                 
-                                if ($GLOBALS['phpgw_info']['server']['use_https'] > 0)
+                                if ($GLOBALS['phpgw_info']['server']['use_https'] == 2)
                                         $agreeterm_url = 'https://' . $agreeterm_url;
                                 else

trunk/preferences/termo_aceite.php

@@ -10 +10 @@
         *  option) any later version.                                              *
         \**************************************************************************/
-ini_set("display_errors","1");
-
         $GLOBALS['phpgw_info']['flags'] = array(
                 'noheader'   => True,
@@ -31 +29 @@
         $GLOBALS['phpgw']->template->set_var('No',lang('No'));
         $GLOBALS['phpgw']->template->set_var('url_accept',lang('Change'));
-        $GLOBALS['phpgw']->template->set_var('url_dont_accept','/logout.php');
+        $GLOBALS['phpgw']->template->set_var('url_dont_accept','../logout.php');
         $GLOBALS['phpgw']->template->set_var('do you agree with the terms?',lang('Do you agree with the terms?'));
         
@@ -38 +36 @@
         if (isset($_POST['pass']))
         {
-                $ldapManager = CreateObject('contactcenter.bo_ldap_manager');
-                $srcs = $ldapManager->get_all_ldap_sources();
                 $common = CreateObject('phpgwapi.common');
+                // For Write operations in LDAP, the ldap master values (from Setup) must be verified.
+                // If you dont use Ldap replication, ignore it.
+                if ( (!empty($GLOBALS['phpgw_info']['server']['ldap_master_host'])) &&
+                     (!empty($GLOBALS['phpgw_info']['server']['ldap_master_root_dn'])) &&
+                     (!empty($GLOBALS['phpgw_info']['server']['ldap_master_root_pw']))) {
+
+                        $ldap =$common->ldapConnect($GLOBALS['phpgw_info']['server']['ldap_master_host'],
+                        $GLOBALS['phpgw_info']['server']['ldap_master_root_dn'],
+                        $GLOBALS['phpgw_info']['server']['ldap_master_root_pw'],false);
+                }
+                else
+                // For Write operations in LDAP, use ldapConnect without parameters.
+                        $ldap =$common->ldapConnect();
                 
-                /*echo $srcs[1]['host']."----".$srcs[1]['dn']."----".$srcs[1]['pw'];
-                exit(0);*/
-                
-                $ldap =$common->ldapConnect($srcs[1]['host'],$srcs[1]['acc'],$srcs[1]['pw'],false);
-                
-                
+                                
                 $ldap_mod_replace['phpgwAgreeTerm'] = 1;
                 $dn = $GLOBALS['phpgw_info']['user']['account_dn'];
 
                 ldap_mod_replace ( $ldap, $dn, $ldap_mod_replace );
-
+                
                 header("location: ../home.php?cd=yes");
         }