Qual: vcard is not really an external project but now a specific doli…

…barr class file, so i moved it into core/class
Dolibarr · Aug 26, 2011 · 4ff832e · 4ff832e
1 parent addf46c
commit 4ff832e
Show file tree

Hide file tree

Showing 20 changed files with 3,574 additions and 3,087 deletions.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -29,9 +29,7 @@ NuSoap            0.9.5    LGPL 2.1                    Yes              Interfac
 OdtPHP            1.0.1    GPL 2.0                     Yes              Library to build/edit ODT files
 Php-barcode       0.3pl1   GPL 2.0                     Yes              Bar code generation
 PHPExcel		  1.7.6    LGPL 2.1                    Yes              Read/Write XLS files, read ODS files
-SMTPs             1.15     GPL                         Yes              SMTPS library
 TCPDF             5.9.098  LGPL 3.0                    Yes				PDF generation
-VCard             2.0      GPL 2.0                     Yes              VCard library
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
@@ -45,6 +43,8 @@ Copyright (C) 2011
 - Regis Houssin <regis@dolibarr.fr>
 - Juanjo Menent
 - Philippe Grand
+- Jean Heimburger <jean@tiaris.info>
+- Philippe Grand
 
 Copyright (C) 2010
 - Laurent Destailleur <eldy@users.sourceforge.net>

diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
@@ -24,7 +24,7 @@
  *      \file       htdocs/admin/external_rss.php
  *      \ingroup    external_rss
  *      \brief      Page to setupe module ExternalRss
- *      \version    $Id: external_rss.php,v 1.49 2011/08/17 13:44:16 eldy Exp $
+ *      \version    $Id: external_rss.php,v 1.50 2011/08/26 19:09:03 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -286,7 +286,10 @@
 		}
 		else
 		{
-			print '<font class="error">'.$langs->trans("Offline").'</div>';
+			print '<font class="error">'.$langs->trans("Offline");
+			$langs->load("errors");
+			if ($rssparser->error) print ' - '.$langs->trans($rssparser->error);
+			print '</div>';
 		}
 		print "</td>";
 		print "</tr>";
@@ -320,5 +323,5 @@
 
 $db->close();
 
-llxFooter('$Date: 2011/08/17 13:44:16 $ - $Revision: 1.49 $');
+llxFooter('$Date: 2011/08/26 19:09:03 $ - $Revision: 1.50 $');
 ?>
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
@@ -20,13 +20,13 @@
  *	    \file       htdocs/contact/vcard.php
  *      \ingroup    societe
  *		\brief      Onglet vcard d'un contact
- *		\version    $Id: vcard.php,v 1.27 2011/07/31 23:54:12 eldy Exp $
+ *		\version    $Id: vcard.php,v 1.28 2011/08/26 23:40:49 eldy Exp $
  */
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
-require_once(DOL_DOCUMENT_ROOT."/includes/vcard/vcard.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/vcard.class.php");
 
 
 $contact = new Contact($db);