diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 591933c5622328bad9deda2c73c390e9b6c7647d..e12df95942dcb4e09f2a4a9f2177faf5e83f6e33 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -89,10 +89,10 @@ print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" . $db
print "<tr $bc[1]><td>".$langs->trans("DatabaseServer")."</td><td>" . $conf->db->host . "</td></tr>\n";
print "<tr $bc[0]><td>".$langs->trans("DatabaseName")."</td><td>" . $conf->db->name . "</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("DriverType")."</td><td>" . $conf->db->type . "</td></tr>\n";
-print "<tr $bc[0]><td>".$langs->trans("User")."</td><td>" . $conf->db->user . " </td></tr>\n";
-print "<tr $bc[1]><td>".$langs->trans("Password")."</td><td>" . ereg_replace(".","*",$conf->db->pass) . " </td></tr>\n";
-print "<tr $bc[0]><td>".$langs->trans("DBStoringCharset")."</td><td>" . $db->getDefaultCharacterSetDatabase() . " </td></tr>\n";
-print "<tr $bc[1]><td>".$langs->trans("DBSortingCharset")."</td><td>" . $db->getDefaultCollationDatabase() . " </td></tr>\n";
+print "<tr $bc[0]><td>".$langs->trans("User")."</td><td>" . $conf->db->user . "</td></tr>\n";
+print "<tr $bc[1]><td>".$langs->trans("Password")."</td><td>" . $langs->trans("NotAvailable") . "</td></tr>\n";
+print "<tr $bc[0]><td>".$langs->trans("DBStoringCharset")."</td><td>" . $db->getDefaultCharacterSetDatabase() . "</td></tr>\n";
+print "<tr $bc[1]><td>".$langs->trans("DBSortingCharset")."</td><td>" . $db->getDefaultCollationDatabase() . "</td></tr>\n";
print '</table>';
print '<br>';
diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
index 46d8e3ee8d541e53e3ef890b45290c55689e0293..a2fb4515202450f893f1baa876833a14a060bbe9 100644
--- a/htdocs/fourn/product/liste.php
+++ b/htdocs/fourn/product/liste.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
@@ -16,16 +16,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/fourn/product/liste.php
\ingroup produit
\brief Page liste des produits ou services
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
@@ -75,6 +72,12 @@ if (isset($_REQUEST['catid']))
$title=$langs->trans("ProductsAndServices");
+if ($fourn_id)
+{
+ $supplier = new Fournisseur($db);
+ $supplier->fetch($fourn_id);
+}
+
$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type";
$sql .= ", pf.fk_soc, pf.ref_fourn";
$sql .= ", min(ppf.price) as price";
@@ -143,9 +146,12 @@ if ($resql)
exit;
}
- $texte = $langs->trans("List");
+ if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->nom);
+ else $texte = $langs->trans("List");
+
llxHeader("","",$texte);
+
$param="&envente=$envente&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"");
print_barre_liste($texte, $page, "liste.php", $param, $sortfield, $sortorder,'',$num);
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index eef483ade167d915cb87afa501aaf9f0d894d1e5..ee267d5be654d2d848402d54526afa7bf0e334af 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -285,7 +285,7 @@ if ($_POST["action"] == "set")
{
dolibarr_install_syslog("etape1: Creation de l'utilisateur: ".$dolibarr_main_db_user);
- //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->pass." , ".$conf->db->port;
+ //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;
$databasefortest=$conf->db->name;
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
@@ -502,7 +502,7 @@ if ($_POST["action"] == "set")
print "</td></tr>";
// Affiche aide diagnostique
- print '<tr><td colspan="2"><br>Le serveur "<b>'.$conf->db->host.'</b>", nom de base "<b>'.$conf->db->name.'</b>", login "<b>'.$conf->db->user.'</b>", ou mot de passe <b>"'.$conf->db->pass.'</b>" de la base de donn�e est peut-�tre incorrect ou la version du client PHP trop ancienne par rapport � la version de la base de donn�e.<br>';
+ print '<tr><td colspan="2"><br>Le serveur "<b>'.$conf->db->host.'</b>", nom de base "<b>'.$conf->db->name.'</b>", login "<b>'.$conf->db->user.'</b>", ou mot de passe de la base de donn�e est peut-�tre incorrect ou la version du client PHP trop ancienne par rapport � la version de la base de donn�e.<br>';
print 'Si le login n\'existe pas encore, vous devez cocher l\'option "Cr�er l\'utilisateur".<br>';
print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
print '</td></tr>';
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index e3d112be5fd47ab9ff3630113a22a8e2736759d9..01994b83d60c16ef36b39e87607024c8e4338aeb 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -30,4 +30,5 @@ ConfirmCancelThisOrder=Are you sure you want to cancel this order ?
AddCustomerOrder=Create customer order
AddCustomerInvoice=Create customer invoice
AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
\ No newline at end of file
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index dd42e5126d677a8fd0be1099a9a729da63e6a44c..b3822736d3bd7371d971717acaae74f74add9fb7 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -30,4 +30,5 @@ ConfirmCancelThisOrder=Etes-vous s
AddCustomerOrder=Cr�er commande client
AddCustomerInvoice=Cr�er facture/avoir client
AddSupplierOrder=Cr�er commande fournisseur
-AddSupplierInvoice=Cr�er facture fournisseur
\ No newline at end of file
+AddSupplierInvoice=Cr�er facture fournisseur
+ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
\ No newline at end of file
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 439f62817f053cdfd622a6510d55fa2953f607f3..8aac07c3ed64846e22f9f4b9c780c0c7d5df08da 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -181,6 +181,9 @@ if (! defined('NOREQUIREDB'))
exit;
}
}
+// Now database connexion is known we can forget password
+$dolibarr_main_db_pass='';
+$conf->db->pass='';
/*
* Creation objet $user
diff --git a/htdocs/public/bplc/bplc.php b/htdocs/public/bplc/bplc.php
index 8bc8cdabb67226afcdb25887cc79f5e9ab0434fe..988a931b0d4537de14623c9d12b65cad7777a79e 100644
--- a/htdocs/public/bplc/bplc.php
+++ b/htdocs/public/bplc/bplc.php
@@ -14,36 +14,19 @@
* 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$
*/
-/*
- * Gestion du retour du syst�me de Cyberpaiement
- * Cette page est appell�e par le serveur de la BPLC lors de l'utilisation
- * su syst�me RSTS
- *
+/**
+ * \brief Gestion du retour du systeme de Cyberpaiement
+ * Cette page est appellee par le serveur de la BPLC lors de l'utilisation
+ * au systeme RSTS
+ * \version $Id$
*/
-require("../../conf/conf.class.php");
-require("./retourbplc.class.php");
-require("../../don.class.php");
-
-$conf = new Conf();
-$conf->db->type = $dolibarr_main_db_type;
-$conf->db->port = $dolibarr_main_db_port;
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
-$conf->db->pass = $dolibarr_main_db_pass;
-
-// Si type non d�fini (pour compatibilit� avec ancienne install), on
-// travail avec mysql
-if (! $conf->db->type) { $conf->db->type = 'mysql'; }
-
-require_once(DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
+require("../../main.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/public/bplc/retourbplc.class.php");
+require_once(DOL_DOCUMENT_ROOT."/don.class.php");
-$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
$retbplc = new Retourbplc($db);
diff --git a/scripts/adherents/sync_member_dolibarr2ldap.php b/scripts/adherents/sync_member_dolibarr2ldap.php
index 8d5cc0ff91f998a3119d94f47a699170f171692a..932f52f896d55481026ea6af6a372000029376aa 100644
--- a/scripts/adherents/sync_member_dolibarr2ldap.php
+++ b/scripts/adherents/sync_member_dolibarr2ldap.php
@@ -1,6 +1,6 @@
<?PHP
-/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * 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
@@ -15,8 +15,6 @@
* 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$
*/
/**
@@ -65,7 +63,6 @@ print "type=".$conf->db->type."\n";
print "host=".$conf->db->host."\n";
print "port=".$conf->db->port."\n";
print "login=".$conf->db->user."\n";
-print "pass=".eregi_replace('.','*',$conf->db->pass)."\n";
print "database=".$conf->db->name."\n";
print "\n";
print "----- To LDAP database:\n";
diff --git a/scripts/adherents/sync_member_ldap2dolibarr.php b/scripts/adherents/sync_member_ldap2dolibarr.php
index 3cd9bb6f9ec14a6e903e2bd94df34e6c764edde9..d38a6b6c558002d22bb03ba086c500f0799d8dde 100644
--- a/scripts/adherents/sync_member_ldap2dolibarr.php
+++ b/scripts/adherents/sync_member_ldap2dolibarr.php
@@ -76,7 +76,6 @@ print "type=".$conf->db->type."\n";
print "host=".$conf->db->host."\n";
print "port=".$conf->db->port."\n";
print "login=".$conf->db->user."\n";
-print "pass=".eregi_replace('.','*',$conf->db->pass)."\n";
print "database=".$conf->db->name."\n";
print "\n";
print "Press a key to confirm...\n";