From 45aafae21517c53619d2675eca3bd75a50568f95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 28 Nov 2008 09:46:47 +0000 Subject: [PATCH] Removed deprecated files --- htdocs/lib/images.lib.php | 2 +- htdocs/public/dons/donateurs_code.php | 2 +- htdocs/public/dons/index.php | 101 -------------------------- htdocs/public/dons/pre.inc.php | 52 ------------- htdocs/public/dons/therm.php | 3 +- 5 files changed, 4 insertions(+), 156 deletions(-) delete mode 100644 htdocs/public/dons/index.php delete mode 100644 htdocs/public/dons/pre.inc.php diff --git a/htdocs/lib/images.lib.php b/htdocs/lib/images.lib.php index d62b791ddba..d87dfc70f09 100644 --- a/htdocs/lib/images.lib.php +++ b/htdocs/lib/images.lib.php @@ -266,7 +266,7 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0) $height="200"; $maximumValue=125000; - $imageDir = "http://eucd.info/images/"; + $imageDir = "http://eucd.info/images/therm/"; $imageTop = $imageDir . "therm_top.png"; $imageMiddleActual = $imageDir . "therm_actual.png"; diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php index 6c627cd021f..14153259f65 100644 --- a/htdocs/public/dons/donateurs_code.php +++ b/htdocs/public/dons/donateurs_code.php @@ -18,7 +18,7 @@ * $Id$ */ -require("./pre.inc.php"); +require("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/don.class.php"); $langs->load("donations"); diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php deleted file mode 100644 index 6975e084f19..00000000000 --- a/htdocs/public/dons/index.php +++ /dev/null @@ -1,101 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ -*/ - -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT ."/don.class.php"); - -if ($conf->don->enabled) -{ - $don = new Don($db); - - $don->projetid = $_POST["projetid"]; - $don->date = time(); - $don->prenom = $_POST["prenom"]; - $don->nom = $_POST["nom"]; - $don->societe = $_POST["societe"]; - $don->adresse = $_POST["adresse"]; - $don->cp = $_POST["cp"]; - $don->ville = $_POST["ville"]; - $don->pays = $_POST["pays"]; - $don->public = 1; - if ($_POST["public"] == "FALSE") - { - $don->public = 0; - } - $don->email = $_POST["email"]; - $don->amount = $_POST["montant"]; - $don->note = $_POST["commentaire"]; - - - if ($_POST["action"] == 'add') - { - - if ($don->check($conf->don->minimum)) - { - require("valid.php"); - } - else - { - require("erreur.php"); - } - } - elseif ($_POST["action"] == 'valid' && $_POST["valid"] == 'Valider') - { - - if ($don->check($conf->don->minimum)) - { - $ref_commande = $don->create(0); - - if ($ref_commande) - { - $date_limite = dolibarr_print_date(time() + (3 * 7 * 24 * 3600), 'dayhourtext'); - - include ("mail.php"); - - include ("mail_moderator.php"); - - mail($don->email, $subject, $body, "From: contact@eucd.info"); - - mail($conf->don->email_moderator, $subject_moderator, $body_moderator); - - require("merci.php"); - } - else - { - print "Erreur : can't insert value in db"; - } - } - else - { - require("erreur.php"); - } - } - else - { - require("don.php"); - } -} -else -{ - print "Cette fonctionnalit� n'est pas activ� sur ce site"; -} - - -?> diff --git a/htdocs/public/dons/pre.inc.php b/htdocs/public/dons/pre.inc.php deleted file mode 100644 index b58c9c743a8..00000000000 --- a/htdocs/public/dons/pre.inc.php +++ /dev/null @@ -1,52 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * - */ - -require("../../main.inc.php"); - -function llxHeader($head = "") -{ - global $user, $conf, $langs; - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/public/adherents/","Non adherent"); - $menu->add_submenu("new.php","Inscription"); - $menu->add(DOL_URL_ROOT."/public/adherents/","Adherents"); - $menu->add_submenu("priv_edit.php","Edition de sa fiche"); - $menu->add_submenu("priv_liste.php","Liste des adherents"); - - left_menu($menu->liste); -} - - -function llxHeaderVierge($head = "") -{ - global $user, $conf, $langs; - - top_htmlhead(''); - print ''; - -} - -?> diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php index 1b7c5b377d7..4102e8b4d96 100644 --- a/htdocs/public/dons/therm.php +++ b/htdocs/public/dons/therm.php @@ -26,6 +26,7 @@ require("../../master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/don.class.php"); /* @@ -37,7 +38,7 @@ $intentValue = $dontherm->sum_donations(1); $pendingValue = $dontherm->sum_donations(2); $actualValue = $dontherm->sum_donations(3); -$dbt->close(); +$db->close(); /*