Fix: utf-8

Fix: encryption
This commit is contained in:
Regis Houssin 2009-07-29 14:35:59 +00:00
parent 09b8019002
commit 59095f8749
3 changed files with 23 additions and 11 deletions

View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * 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 * 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 * 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 '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>'; print '<td>'.$langs->trans("Parameter").'</td>';
print '<td>'.$langs->trans("Value").'</td>'; print '<td>'.$langs->trans("Value").'</td>';
print '<td>'.$langs->trans("Entity").'</td>';
print "</tr>\n"; 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); $result = $db->query($sql);
if ($result) if ($result)
{ {
@ -62,11 +74,11 @@ if ($result)
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td>$obj->name</td>\n"; print '<tr '.$bc[$var].'>';
print '<td>'.$obj->name.'</td>'."\n";
print '<td>'; print '<td>'.$obj->value.'</td>'."\n";
print $obj->value; print '<td>'.$obj->entity.'</td>'."\n";
print "</td></tr>\n"; print "</tr>\n";
$i++; $i++;
} }

View File

@ -30,7 +30,7 @@ class pdf_courrier_droit_editeur
{ {
/** /**
\brief Constructeur \brief Constructeur
\param db Handler acc<EFBFBD>s base de donn<EFBFBD>e \param db Handler acces base de donnees
*/ */
function pdf_courrier_droit_editeur ($db) function pdf_courrier_droit_editeur ($db)
{ {
@ -53,7 +53,7 @@ class pdf_courrier_droit_editeur
} }
/** /**
\brief G<EFBFBD>n<EFBFBD>re le document \brief Genere le document
\return int 0 = ok, <> 0 = ko \return int 0 = ok, <> 0 = ko
*/ */
function Generate($numero) function Generate($numero)

View File

@ -37,7 +37,7 @@ print_titre($langs->trans("DocumentsBuilder"));
print "<table class=\"noborder\" width=\"100%\">\n"; print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n"; print "<tr class=\"liste_titre\">\n";
print ' <td>'.$langs->trans("Name").'</td>'; 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"; print "</tr>\n";