Fix: encryption

This commit is contained in:
Regis Houssin 2009-07-29 13:38:29 +00:00
parent e2b7712dca
commit ca89b338aa
5 changed files with 21 additions and 15 deletions

View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> /* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* 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
@ -117,10 +118,4 @@ print '</form>';
print '</table>'; print '</table>';
print '<br>'; print '<br>';
?> ?>

View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2007-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,7 +48,9 @@ if ($_POST["action"] == 'set')
// Action desactivation d'un sous module // Action desactivation d'un sous module
if ($_GET["action"] == 'unset') if ($_GET["action"] == 'unset')
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name LIKE 'EDITEUR_LIVRE_FORMAT_%'"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
$sql.= " WHERE ".$db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey);
$sql.= " LIKE 'EDITEUR_LIVRE_FORMAT_%'";
$sql.= " AND rowid='".$_GET["id"]."';"; $sql.= " AND rowid='".$_GET["id"]."';";
if ($db->query($sql)) if ($db->query($sql))
{ {
@ -89,8 +92,12 @@ print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;
$sql = "SELECT";
$sql = "SELECT rowid,value FROM ".MAIN_DB_PREFIX."const WHERE name LIKE 'EDITEUR_LIVRE_FORMAT_%'"; $sql.= " rowid";
$sql.= ", ".$db->decrypt('value',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey)." as value";
$sql.= " FROM ".MAIN_DB_PREFIX."const";
$sql.= " WHERE ".$db->decrypt('name',$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey);
$sql.= " LIKE 'EDITEUR_LIVRE_FORMAT_%'";
$result = $db->query($sql); $result = $db->query($sql);
while ($obj = $db->fetch_object($result) ) while ($obj = $db->fetch_object($result) )
@ -109,4 +116,4 @@ print '</table>';
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');
?> ?>

View File

@ -26,7 +26,7 @@
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
//$langs->load("multicompany"); $langs->load("admin");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
@ -38,7 +38,7 @@ accessforbidden();
*/ */
llxHeader('',$langs->trans("MultiCompanySetup"),'MultiCompanyConfiguration'); llxHeader('',$langs->trans("MultiCompanySetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup'); print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup');
@ -49,7 +49,7 @@ print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup');
*/ */
print '<br>'; print '<br>';
print_titre($langs->trans("MultiCompanyModule")); //print_titre($langs->trans("MultiCompanyModule"));
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');

View File

@ -1068,3 +1068,5 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
##### Bank ##### ##### Bank #####
BankSetupModule=Bank module setup BankSetupModule=Bank module setup
FreeLegalTextOnChequeReceipts=Free text on cheque receipts FreeLegalTextOnChequeReceipts=Free text on cheque receipts
##### Multicompany #####
MultiCompanySetup=Multi-company module setup

View File

@ -1067,4 +1067,6 @@ WSDLCanBeDownloadedHere=Le descripteur WSDL des services fournis peut etre récu
EndPointIs=Les clients SOAP doivent envoyer leur requetes vers l'endpoint Dolibarr à l'URL EndPointIs=Les clients SOAP doivent envoyer leur requetes vers l'endpoint Dolibarr à l'URL
##### Bank ##### ##### Bank #####
BankSetupModule=Configuration du module Banque BankSetupModule=Configuration du module Banque
FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques
##### Multicompany #####
MultiCompanySetup=Configuration du module Multi-société