diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 3030dc6fcb9..3ca9949a494 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -40,8 +41,8 @@ $def = array(); $lastexternalrss=0; // positionne la variable pour le nombre de rss externes -$sql ="select MAX(name) as name from ".MAIN_DB_PREFIX."const"; -$sql.=" WHERE name like 'EXTERNAL_RSS_URLRSS_%'"; +$sql ="SELECT MAX(".$db->decrypt('name').") as name FROM ".MAIN_DB_PREFIX."const"; +$sql.=" WHERE ".$db->decrypt('name')." LIKE 'EXTERNAL_RSS_URLRSS_%'"; $result=$db->query($sql); if ($result) { @@ -119,7 +120,7 @@ if ($_POST["delete"]) // Supprime boite box_external_rss de definition des boites $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def"; - $sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'"; + $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".$_POST["norss"]." %'"; $resql=$db->query($sql); if ($resql) @@ -201,29 +202,25 @@ print ''.$langs->trans("Title").''; print ''; print 'April,
LinuxFR,
Lolix'; print ''; -?> - - URL du RSS - " size="64"> - http://wiki.april.org/RecentChanges?format=rss
http://linuxfr.org/backend/news/rss20.rss
http://back.fr.lolix.org/jobs.rss.php3 - - -"> - - - - -'; +print 'URL du RSS'; +print ''; +print 'http://wiki.april.org/RecentChanges?format=rss
http://linuxfr.org/backend/news/rss20.rss
http://back.fr.lolix.org/jobs.rss.php3'; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; print ''; - print '
'; - print ''; -$sql ="select rowid, file, note from ".MAIN_DB_PREFIX."boxes_def"; +$sql ="SELECT rowid, file, note FROM ".MAIN_DB_PREFIX."boxes_def"; $sql.=" WHERE file = 'box_external_rss.php'"; $sql.=" ORDER BY note"; diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php index 6641f5bb9f8..483bc6b5f4e 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/includes/boxes/box_external_rss.php @@ -1,8 +1,8 @@ - * Copyright (C) 2003 �ric Seigne + * Copyright (C) 2003 Eric Seigne * Copyright (C) 2004-2008 Laurent Destailleur - * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -20,11 +20,11 @@ */ /** - \file htdocs/includes/boxes/box_external_rss.php - \ingroup external_rss - \brief Fichier de gestion d'une box pour le module external_rss - \version $Id$ -*/ + * \file htdocs/includes/boxes/box_external_rss.php + * \ingroup external_rss + * \brief Fichier de gestion d'une box pour le module external_rss + * \version $Id$ + */ include_once(MAGPIERSS_PATH."rss_fetch.inc"); include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); @@ -44,7 +44,7 @@ class box_external_rss extends ModeleBoxes { var $info_box_contents = array(); /** - * \brief Constructeur de la classe + * Constructeur de la classe */ function box_external_rss($DB,$param) { @@ -58,8 +58,8 @@ class box_external_rss extends ModeleBoxes { } /** - * \brief Charge les donn�es en m�moire pour affichage ult�rieur - * \param $max Nombre maximum d'enregistrements � charger + * Charge les donnees en memoire pour affichage ulterieur + * @param $max Nombre maximum d'enregistrements a charger */ function loadBox($max=5) { @@ -105,7 +105,7 @@ class box_external_rss extends ModeleBoxes { 'sublink' => $link, 'subtext'=>$langs->trans("LastRefreshDate").': '.(isset($rss->date)?dol_print_date($rss->date,"dayhourtext"):$langs->trans("Unknown")), 'subpicto'=>'object_bookmark'); } - // INFO sur le �lements + // INFO sur le elements for($i = 0; $i < $max && $i < sizeof($rss->items); $i++) { $item = $rss->items[$i];