From 3512e59df5b07246d2d61e8c42aea73a69a57dfe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Feb 2006 01:04:04 +0000 Subject: [PATCH] Fix: bug #15823 Look: Uniformisation du look. --- htdocs/admin/clicktodial.php | 2 +- htdocs/admin/external_rss.php | 110 +++++++++++----------------------- htdocs/admin/mailing.php | 2 +- 3 files changed, 37 insertions(+), 77 deletions(-) diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index bf125f383bf..ea1e2896497 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -43,7 +43,7 @@ if ($_POST["action"] == 'setvalue' && $user->admin) } else { - dolibarr_error($db); + dolibarr_print_error($db); } } diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index ec43147c2fa..987a68d0c9e 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -1,7 +1,7 @@ * Copyright (C) 2003,2005 Rodolphe Quiedeville - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * @@ -49,7 +49,7 @@ else { dolibarr_print_error($db); } -if ($_POST["action"] == 'add') +if ($_POST["action"] == 'add' || $_POST["modify"]) { $external_rss_urlrss = "external_rss_urlrss_" . $_POST["norss"]; @@ -59,18 +59,13 @@ if ($_POST["action"] == 'add') $db->begin(); - $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "'; "; - $db->query($sql); + $result1=dolibarr_set_const($db, "EXTERNAL_RSS_TITLE_" . $_POST["norss"],$_POST[$external_rss_title]); + if ($result1) $result2=dolibarr_set_const($db, "EXTERNAL_RSS_URLRSS_" . $_POST["norss"],$_POST[$external_rss_urlrss]); - $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name ='EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "'; "; - $db->query($sql); - - $sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','".$_POST[$external_rss_title]."',0) ;"; - $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','".$_POST[$external_rss_urlrss]."',0) ;"; - - if ($db->query($sql1) && $db->query($sql2)) + if ($result1 && $result2) { $db->commit(); + //$mesg='
'.$langs->trans("Success").'
'; header("Location: external_rss.php"); } else @@ -86,47 +81,13 @@ if ($_POST["delete"]) if(isset($_POST["norss"])) { $db->begin(); - $sql1 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URL_" . $_POST["norss"]."'"; - $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."'"; - $sql3 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."'"; - - $result1 = $db->query($sql1); - $result2 = $db->query($sql2); - $result3 = $db->query($sql3); - - if ($result1 && $result2 && $result3) - { - $db->commit(); - header("Location: external_rss.php"); - } - else - { - $db->rollback(); - dolibarr_print_error($db); - } - } -} - -if ($_POST["modify"]) -{ - $external_rss_urlrss = "external_rss_urlrss_" . $_POST["norss"]; - if(isset($_POST[$external_rss_urlrss])) { - $db->begin(); - - $external_rss_title = "external_rss_title_" . $_POST["norss"]; - - $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_TITLE_" . $_POST["norss"]."';"; - $db->query($sql); - - $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'EXTERNAL_RSS_URLRSS_" . $_POST["norss"]."';"; - $db->query($sql); - - $sql1 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES('" . "EXTERNAL_RSS_TITLE_" . $_POST["norss"] . "','". $_POST[$external_rss_title]."',0) ;"; - $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES('" . "EXTERNAL_RSS_URLRSS_" . $_POST["norss"] . "','". $_POST[$external_rss_urlrss]."',0)"; - - if ($db->query($sql1) && $db->query($sql2)) + $result1=dolibarr_del_const($db,"EXTERNAL_RSS_TITLE_" . $_POST["norss"]); + if ($result1) $result2=dolibarr_del_const($db,"EXTERNAL_RSS_URLRSS_" . $_POST["norss"]); + + if ($result1 && $result2) { $db->commit(); + //$mesg='
'.$langs->trans("Success").'
'; header("Location: external_rss.php"); } else @@ -155,17 +116,17 @@ print ''.$langs->trans("Example").''; print ''; print ''; print ''.$langs->trans("Title").''; -print ''; +print ''; print 'April,
LinuxFR,
Lolix,
Parinux'; print ''; ?> URL du RSS - " size="45"> + " size="64"> http://wiki.april.org/RecentChanges?format=rss,
http://www.linuxfr.org/backend.rss,
http://back.fr.lolix.org/jobs.rss.php3,
http://parinux.org/backend.rss -"> +"> @@ -179,28 +140,27 @@ print ''; -
- Syndication du flux numéro " . ($i+1) . " - - - Titre - - - - URL du RSS - - - - -trans("Modify")."\"> -trans("Delete")."\"> - - -
- -"; +for($i = 0; $i < $nbexternalrss; $i++) +{ + print "
"; + print "Syndication du flux numéro " . ($i+1) . ""; + print ""; + print ""; + print "".$langs->trans("Title").""; + print ""; + print ""; + print ""; + print "URL du RSS"; + print ""; + print ""; + print ""; + print ""; + print "trans("Modify")."\">  "; + print "trans("Delete")."\">"; + print ""; + print ""; + print "
"; + print ""; } ?> diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index e39e78f1126..652b248289f 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -44,7 +44,7 @@ if ($_POST["action"] == 'setvalue' && $user->admin) } else { - dolibarr_error($db); + dolibarr_print_error($db); } }