Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Corrections mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2006-09-03 13:57:44 +00:00
parent 4f344f0c3d
commit 64e33b7092
6 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/boutique.php
View File

@ -86,14 +86,16 @@ elseif ($_POST["test"])
if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1)
{
// Vérifie si bonne base par requete sur une table OSCommerce
$sql="SELECT xxx FROM zzz WHERE aaa='application_name'";
$sql ="SELECT configuration_value";
$sql.=" FROM configuration";
$sql.=" WHERE configuration_key='STORE_NAME'";
$resql=$oscommercedb->query($sql);
if ($resql) {
$mesg ="<div class=\"ok\">".$langs->trans("OSCommerceTestOk",$_POST["oscommerce_dbhost"],$_POST["oscommerce_dbname"],$_POST["oscommerce_dbuser"]);
$mesg.="</div>";
}
else {
$mesg ="<div class=\"error\">".$langs->trans("ErrorConnectOkButWrongDatabase");
$mesg ="<div class=\"error\">".$langs->trans("OSCommerceErrorConnectOkButWrongDatabase");
$mesg.="</div>";
}

2
htdocs/admin/webcalendar.php
View File

@ -108,7 +108,7 @@ elseif ($actiontest)
$mesg.="</div>";
}
else {
$mesg ="<div class=\"error\">".$langs->trans("ErrorConnectOkButWrongDatabase");
$mesg ="<div class=\"error\">".$langs->trans("WebCalErrorConnectOkButWrongDatabase");
$mesg.="</div>";
}

15
htdocs/compta/prelevement/rejet-prelevement.class.php
View File

@ -17,20 +17,19 @@
*
* $Id$
* $Source$
*
*/
/*
\file htdocs/compta/prelevement/prelevement.class.php
\ingroup prelevement
\brief Fichier de la classe des prelevements
\version $Revision$
\file htdocs/compta/prelevement/rejet-prelevement.class.php
\ingroup prelevement
\brief Fichier de la classe des prelevements
\version $Revision$
*/
/*!
\class Prelevement
\brief Classe permettant la gestion des prelevements
/**
\class Prelevement
\brief Classe permettant la gestion des prelevements
*/
class RejetPrelevement

13
htdocs/conf/conf.class.php
View File

@ -92,8 +92,11 @@ class Conf
$objp = $db->fetch_object($result);
$key=$objp->name;
$value=$objp->value; // Pas de stripslashes (ne s'applique pas sur lecture en base mais après POST quand get_magic_quotes_gpc()==1)
define ("$key", $value);
$this->global->$key=$value;
if ($key)
{
define ("$key", $value);
$this->global->$key=$value;
}
$i++;
}
}
@ -141,14 +144,14 @@ class Conf
// Module mailing
$this->mailing->enabled=defined("MAIN_MODULE_MAILING")?MAIN_MODULE_MAILING:0;
// Module notification
$this->notification->enabled=defined("MAIN_MODULE_NOTIFICATION")?MAIN_MODULE_NOTIFICATION:0;
// Module externalrss
$this->externalrss->enabled=defined("MAIN_MODULE_EXTERNALRSS")?MAIN_MODULE_EXTERNALRSS:0;
$this->externalrss->dir_temp=DOL_DATA_ROOT."/rss/temp";
// Module commande client
$this->commande->enabled=defined("MAIN_MODULE_COMMANDE")?MAIN_MODULE_COMMANDE:0;
$this->commande->dir_output=DOL_DATA_ROOT."/commande";
@ -293,7 +296,7 @@ class Conf
// outils systemes
if (! $this->global->SYSTEMTOOLS_MYSQLDUMP) $this->global->SYSTEMTOOLS_MYSQLDUMP="mysqldump";
// societe
if (! $this->global->SOCIETE_CODECLIENT_ADDON) $this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
if (! $this->global->SOCIETE_CODEFOURNISSEUR_ADDON) $this->global->SOCIETE_CODEFOURNISSEUR_ADDON="mod_codeclient_leopard";

6
htdocs/lib/functions.inc.php
View File

@ -320,6 +320,12 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
$db->begin();
if (! $name)
{
dolibarr_print_error("Error: Call to function dolibarr_set_const with wrong parameters");
exit;
}
//dolibarr_syslog("dolibarr_set_const name=$name, value=$value");
$sql = "DELETE FROM llx_const WHERE name = '$name';";
$resql=$db->query($sql);

4
htdocs/viewimage.php
View File

@ -21,13 +21,13 @@
* $Source$
*/
/** \file htdocs/viewimage.php
/**
\file htdocs/viewimage.php
\brief Wrapper permettant l'affichage de fichiers images Dolibarr
\remarks L'appel est viewimage.php?file=pathrelatifdufichier&modulepart=repfichierconcerne
\version $Revision$
*/
require_once("master.inc.php");
require_once("main.inc.php");