From 09ae698e4382c2f709dd73ec2a876320174060a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 4 Jul 2008 09:20:42 +0000
Subject: [PATCH] Better error management

---
 htdocs/admin/ldap_contacts.php | 27 +++++++++++++++------------
 htdocs/admin/ldap_groups.php   | 27 ++++++++++++++++-----------
 htdocs/admin/ldap_members.php  | 29 +++++++++++++++++------------
 htdocs/admin/ldap_users.php    | 27 ++++++++++++++++-----------
 4 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 66079921d99..52ced4610c9 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2006-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,16 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
  
 /**
     	\file       htdocs/admin/ldap_contacts.php
 		\ingroup    ldap
 		\brief      Page d'administration/configuration du module Ldap
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
@@ -255,15 +252,21 @@ print info_admin($langs->trans("LDAPDescValues"));
 /*
  * Test de la connexion
  */
+print '<br>';
+if (! function_exists("ldap_connect"))
+{
+	print '<a class="butActionRefused" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$langs->trans("LDAPTestSynchroContact").'</a>';
+}
+else if (empty($conf->global->LDAP_SERVER_HOST))
+{
+	print '<a class="butActionRefused" href="#" title="'.$langs->trans('SetupNotComplete').'">'.$langs->trans("LDAPTestSynchroContact").'</a>';
+}
+else print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test">'.$langs->trans("LDAPTestSynchroContact").'</a>';
+print '<br><br>';
+
+
 if (function_exists("ldap_connect"))
 {
-	if ($conf->global->LDAP_SERVER_HOST)
-	{
-		print '<br>';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test">'.$langs->trans("LDAPTestSynchroContact").'</a>';
-		print '<br><br>';
-	}
-
 	if ($_GET["action"] == 'test')
 	{
 		// Creation objet
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index c6d7d3e8047..d3b80da4710 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -18,16 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
  
 /**
     	\file       htdocs/admin/ldap_groups.php
 		\ingroup    ldap
 		\brief      Page d'administration/configuration du module Ldap
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
@@ -175,15 +172,23 @@ print info_admin($langs->trans("LDAPDescValues"));
 /*
  * Test de la connexion
  */
+print '<br>';
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
+{
+	if (! function_exists("ldap_connect"))
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$langs->trans("LDAPTestSynchroGroup").'</a>';
+	}
+	else if (empty($conf->global->LDAP_SERVER_HOST))
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans('SetupNotComplete').'">'.$langs->trans("LDAPTestSynchroGroup").'</a>';
+	}
+	else print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testgroup">'.$langs->trans("LDAPTestSynchroGroup").'</a>';
+	print '<br><br>';
+}
+
 if (function_exists("ldap_connect"))
 {
-	if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
-	{
-		print '<br>';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testgroup">'.$langs->trans("LDAPTestSynchroGroup").'</a>';
-		print '<br><br>';
-	}
-
 	if ($_GET["action"] == 'testgroup')
 	{
 		// Creation objet
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 43c9f0d12dc..e3462f30a30 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005      Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2006-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,15 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
  
 /**
     	\file       htdocs/admin/ldap_members.php
 		\ingroup    ldap adherent
 		\brief      Page d'administration/configuration du module Ldap adherent
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
@@ -366,16 +364,23 @@ print info_admin($langs->trans("LDAPDescValues"));
 /*
  * Test de la connexion
  */
+if ($conf->global->LDAP_MEMBER_ACTIVE)
+{
+	print '<br>';
+	if (! function_exists("ldap_connect"))
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$langs->trans("LDAPTestSynchroMember").'</a>';
+	}
+	else if (empty($conf->global->LDAP_SERVER_HOST))
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans('SetupNotComplete').'">'.$langs->trans("LDAPTestSynchroMember").'</a>';
+	}
+	else print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testmember">'.$langs->trans("LDAPTestSynchroMember").'</a>';
+	print '<br><br>';
+}
+
 if (function_exists("ldap_connect"))
 {
-	if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_MEMBER_ACTIVE)
-	{
-		print '<br>';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testmember">'.$langs->trans("LDAPTestSynchroMember").'</a>';
-//		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testtype">'.$langs->trans("LDAPTestSynchroTypeMember").'</a>';
-		print '<br><br>';
-	}
-
 	if ($_GET["action"] == 'testmember')
 	{
 		// Creation objet
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 3ddfb74d63b..be8796eb834 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -18,16 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
  
 /**
     	\file       htdocs/admin/ldap_users.php
 		\ingroup    ldap
 		\brief      Page d'administration/configuration du module Ldap
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
@@ -267,15 +264,23 @@ print info_admin($langs->trans("LDAPDescValues"));
 /*
  * Test de la connexion
  */
+if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
+{
+	print '<br>';
+	if (! function_exists("ldap_connect"))
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$langs->trans("LDAPTestSynchroUser").'</a>';
+	}
+	else if (empty($conf->global->LDAP_SERVER_HOST))
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans('SetupNotComplete').'">'.$langs->trans("LDAPTestSynchroUser").'</a>';
+	}
+	else print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testuser">'.$langs->trans("LDAPTestSynchroUser").'</a>';
+	print '<br><br>';	
+}
+
 if (function_exists("ldap_connect"))
 {
-	if ($conf->global->LDAP_SERVER_HOST && $conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
-	{
-		print '<br>';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testuser">'.$langs->trans("LDAPTestSynchroUser").'</a>';
-		print '<br><br>';
-	}
-
 	if ($_GET["action"] == 'testuser')
 	{
 		// Creation objet