From 59095f874981121c8e411c3cfa2483525247f06f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 29 Jul 2009 14:35:59 +0000
Subject: [PATCH] Fix: utf-8 Fix: encryption

---
 htdocs/admin/system/constall.php              | 28 +++++++++++++------
 .../pdf_courrier_droit_editeur.class.php      |  4 +--
 htdocs/docs/index.php                         |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index f2f8669e931..68ae507cb56 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * 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
@@ -47,9 +48,20 @@ print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
+print '<td>'.$langs->trans("Entity").'</td>';
 print "</tr>\n";
 
-$sql = "SELECT rowid, name, value, type, note FROM ".MAIN_DB_PREFIX."const ORDER BY name ASC";
+$sql = "SELECT";
+$sql.= " rowid";
+$sql.= ", ".$db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as name";
+$sql.= ", ".$db->decrypt('value',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as value";
+$sql.= ", type";
+$sql.= ", note";
+$sql.= ", entity";
+$sql.= " FROM ".MAIN_DB_PREFIX."const";
+$sql.= " WHERE entity IN (0,".$conf->entity.")";
+$sql.= " ORDER BY entity, name ASC";
+
 $result = $db->query($sql);
 if ($result)
 {
@@ -62,11 +74,11 @@ if ($result)
       $obj = $db->fetch_object($result);
       $var=!$var;
 
-      print "<tr $bc[$var]><td>$obj->name</td>\n";
-
-      print '<td>';
-      print $obj->value;
-      print "</td></tr>\n";
+      print '<tr '.$bc[$var].'>';
+      print '<td>'.$obj->name.'</td>'."\n";
+      print '<td>'.$obj->value.'</td>'."\n";
+      print '<td>'.$obj->entity.'</td>'."\n";
+      print "</tr>\n";
 
       $i++;
     }
diff --git a/htdocs/docs/class/pdf_courrier_droit_editeur.class.php b/htdocs/docs/class/pdf_courrier_droit_editeur.class.php
index 6258ac4757a..b8257035887 100644
--- a/htdocs/docs/class/pdf_courrier_droit_editeur.class.php
+++ b/htdocs/docs/class/pdf_courrier_droit_editeur.class.php
@@ -30,7 +30,7 @@ class pdf_courrier_droit_editeur
 {
 	/**
 	 \brief      Constructeur
-	 \param	    db		Handler acc�s base de donn�e
+	 \param	    db		Handler acces base de donnees
   */
 	function pdf_courrier_droit_editeur ($db)
 	{
@@ -53,7 +53,7 @@ class pdf_courrier_droit_editeur
 	}
 
 	/**
-	 \brief G�n�re le document
+	 \brief Genere le document
 	 \return int 0 = ok, <> 0 = ko
   */
 	function Generate($numero)
diff --git a/htdocs/docs/index.php b/htdocs/docs/index.php
index 943ae36adc9..dda3ff0a33b 100644
--- a/htdocs/docs/index.php
+++ b/htdocs/docs/index.php
@@ -37,7 +37,7 @@ print_titre($langs->trans("DocumentsBuilder"));
 print "<table class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
 print '  <td>'.$langs->trans("Name").'</td>';
-print '  <td>'.$langs->trans("Généré le").'</td>';
+print '  <td>'.$langs->trans("Généré le").'</td>';
 print "</tr>\n";