lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Refonte de la gestion des erreurs du module webcalendar

Browse Source
This commit is contained in:
Laurent Destailleur 2004-10-30 01:45:57 +00:00
parent 48bf4ea8ff
commit 70848f1215
3 changed files with 103 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/clients.php
View File

@ -20,11 +20,21 @@
* $Source$ * $Source$
* *
*/ */
/*!
\file htdocs/compta/clients.php
\ingroup compta
\brief Page accueil des clients
\version $Revision$
*/
require("./pre.inc.php"); require("./pre.inc.php");
require("../contact.class.php"); require("../contact.class.php");
require("../lib/webcal.class.php");
require("../cactioncomm.class.php"); require("../cactioncomm.class.php");
require("../actioncomm.class.php"); require("../actioncomm.class.php");
if ($conf->webcal->enabled) {
require("../lib/webcal.class.php");
}
llxHeader(); llxHeader();

1
htdocs/compta/fiche.php
View File

@ -29,7 +29,6 @@
require("./pre.inc.php"); require("./pre.inc.php");
require("../contact.class.php"); require("../contact.class.php");
require("../lib/webcal.class.php");
require("../cactioncomm.class.php"); require("../cactioncomm.class.php");
require("../actioncomm.class.php"); require("../actioncomm.class.php");
require("../facture.class.php"); require("../facture.class.php");

167
htdocs/lib/webcal.class.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* 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
@ -20,115 +21,131 @@
* *
*/ */
/*! \file htdocs/lib/webcal.class.php /*!
\brief Classe permettant d'acceder a la database webcalendar. \file htdocs/lib/webcal.class.php
\author Rodolphe Quiedeville. \ingroup webcal
\version $Revision$ \brief Ensemble des fonctions permettant d'acceder a la database webcalendar.
\author Rodolphe Quiedeville.
Ensemble des fonctions permettant d'acceder a la database webcalendar. \version $Revision$
*/ */
/*! \class Webcal require_once (DOL_DOCUMENT_ROOT ."/lib/".$conf->webcal->db->type.".lib.php");
\brief Classe permettant d'acceder a la database webcalendar
/*!
Ensemble des fonctions permettant d'acceder a la database webcalendar \class Webcal
\brief Classe permettant d'acceder a la database webcalendar
*/ */
class Webcal { class Webcal {
var $localdb; var $localdb;
var $heure = -1; var $heure = -1;
var $duree = 0; var $duree = 0;
var $date;
var $texte;
var $desc;
/*! /*!
\brief Permet de se connecter a la database webcalendar. \brief Constructeur de la classe d'interface à Webcalendar
*/ */
function Webcal() function Webcal()
{ {
global $conf; global $conf;
$this->localdb = new Db($conf->webcal->db->type, // On initie la connexion à la base Webcalendar
$conf->webcal->db->host, $this->localdb = new DoliDb(
$conf->webcal->db->user, $conf->webcal->db->type,
$conf->webcal->db->pass, $conf->webcal->db->host,
$conf->webcal->db->name); $conf->webcal->db->user,
$conf->webcal->db->pass,
$conf->webcal->db->name);
} }
/*! /*!
\brief ajoute une entree dans le calendrier de l'utilsateur \brief Ajoute une entree dans le calendrier de l'utilisateur
\param[in] user le login de l'utilisateur \param[in] user le login de l'utilisateur
\param[in] date la date de l'evenement dans le calendrier \param[in] date la date de l'evenement dans le calendrier
\param[in] texte le titre a indiquer dans l'evenement \param[in] texte le titre a indiquer dans l'evenement
\param[in] desc la description a indiquer dans l'evenement \param[in] desc la description a indiquer dans l'evenement
\return int 1 en cas de succès, -1,-2, -3 en cas d'erreur
*/ */
function add($user, $date, $texte, $desc) function add($user, $date, $texte, $desc)
{ {
// Recupère l'id max+1 dans la base webcalendar
$id = $this->get_next_id(); $id = $this->get_next_id();
$cal_id = $id; if ($id > 0) {
$cal_create_by = $user->webcal_login; $cal_id = $id;
$cal_date = strftime('%Y%m%d', $date); $cal_create_by = $user->webcal_login;
$cal_time = $this->heure; $cal_date = strftime('%Y%m%d', $date);
$cal_mod_date = strftime('%Y%m%d', time()); $cal_time = $this->heure;
$cal_mod_time = strftime('%H%M', time()); $cal_mod_date = strftime('%Y%m%d', time());
$cal_duration = $this->duree; $cal_mod_time = strftime('%H%M', time());
$cal_priority = 2; $cal_duration = $this->duree;
$cal_type = "E"; $cal_priority = 2;
$cal_access = "P"; $cal_type = "E";
$cal_name = $texte; $cal_access = "P";
$cal_description = $desc; $cal_name = $texte;
$cal_description = $desc;
$sql = "INSERT INTO webcal_entry (cal_id, cal_create_by,cal_date,cal_time,cal_mod_date,
cal_mod_time,cal_duration,cal_priority,cal_type, cal_access, cal_name,cal_description)";
$sql .= " VALUES ($cal_id, '$cal_create_by', $cal_date, $cal_time,$cal_mod_date, $cal_mod_time,
$cal_duration,$cal_priority,'$cal_type', '$cal_access', '$cal_name','$cal_description')";
$sql = "INSERT INTO webcal_entry (cal_id, cal_create_by,cal_date,cal_time,cal_mod_date, if ( $this->localdb->query($sql) )
cal_mod_time,cal_duration,cal_priority,cal_type, cal_access, cal_name,cal_description)"; {
$sql = "INSERT INTO webcal_entry_user (cal_id, cal_login, cal_status)";
$sql .= " VALUES ($cal_id, '$cal_create_by', 'A')";
if ( $this->localdb->query($sql) )
{
// OK
return 1;
}
else
{
$error = $this->localdb->error() . '<br>' .$sql;
return -1;
}
}
else
{
$error = $this->localdb->error() . '<br>' .$sql;
return -2;
}
}
else {
$error = $this->localdb->error() . '<br>' .$sql;
return -3;
}
}
$sql .= " VALUES ($cal_id, '$cal_create_by', $cal_date, $cal_time,$cal_mod_date, $cal_mod_time,
$cal_duration,$cal_priority,'$cal_type', '$cal_access', '$cal_name','$cal_description')";
if ( $this->localdb->query($sql) )
{
$sql = "INSERT INTO webcal_entry_user (cal_id, cal_login, cal_status)";
$sql .= " VALUES ($cal_id, '$cal_create_by', 'A')";
if ( $this->localdb->query($sql) )
{
}
else
{
$error = $this->localdb->error() . '<br>' .$sql;
}
}
else
{
$error = $this->localdb->error() . '<br>' .$sql;
}
$this->localdb->close();
}
/*! /*!
\brief obtient l'id suivant dans le webcalendar \brief Obtient l'id suivant dans le webcalendar
\return id retourne l'id suivant dans le webcalendar \return id retourne l'id suivant dans le webcalendar
*/ */
function get_next_id() function get_next_id()
{ {
$sql = "SELECT max(cal_id) FROM webcal_entry";
$sql = "SELECT max(cal_id) FROM webcal_entry"; if ($this->localdb->query($sql))
{
if ($this->localdb->query($sql)) $id = $this->localdb->result(0, 0) + 1;
{ return $id;
$id = $this->localdb->result(0, 0) + 1; }
return $id; else
} {
else print $this->localdb->error();
{ return -1;
print $this->localdb->error(); }
}
} }
} }
?> ?>