Work on paypal module

2010-10-31 13:29:33 +00:00 · 2010-10-31 13:29:33 +00:00 · e0f2520647
commit e0f2520647
parent 21e326b308
8 changed files with 86 additions and 58 deletions
--- a/htdocs/adherents/public.php
+++ b/htdocs/adherents/public.php
@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 *
 * 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,7 +20,7 @@
 /**
 *     	\file       htdocs/adherents/public.php
 *		\ingroup    member
- *		\brief      Fichier de la page de l'espace publique adherent
+ *		\brief      File of main public page for member module
 *		\author	    Laurent Destailleur
 *		\version    $Id$
 */
@ -49,9 +49,9 @@ print '<table class="border" cellspacing="0" cellpadding="3">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td><td>'.$langs->trans("URL").'</td></tr>';
 // Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root);
-print '<tr><td>'.$langs->trans("BlankSubscriptionForm").'</td><td><a target="_blank" href="'.DOL_URL_ROOT.'/public/members/new.php'.'">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/new.php'.'</a></td></tr>';
-print '<tr><td>'.$langs->trans("PublicMemberList").'</td><td><a target="_blank" href="'.DOL_URL_ROOT.'/public/members/public_list.php'.'">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_list.php'.'</a></td></tr>';
-print '<tr><td>'.$langs->trans("PublicMemberCard").'</td><td>'.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_card.php?id=xxx'.'</td></tr>';
+print '<tr><td>'.$langs->trans("BlankSubscriptionForm").'</td><td>'.img_picto('','object_globe.png').' '.'<a target="_blank" href="'.DOL_URL_ROOT.'/public/members/new.php'.'">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/new.php'.'</a></td></tr>';
+print '<tr><td>'.$langs->trans("PublicMemberList").'</td><td>'.img_picto('','object_globe.png').' '.'<a target="_blank" href="'.DOL_URL_ROOT.'/public/members/public_list.php'.'">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_list.php'.'</a></td></tr>';
+print '<tr><td>'.$langs->trans("PublicMemberCard").'</td><td>'.img_picto('','object_globe.png').' '.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_card.php?id=xxx'.'</td></tr>';
 print '</table>';


--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@ -95,7 +95,7 @@ print "<td>&nbsp;</td>";
 print "</tr>";

 print "<tr class=\"impair\">";
-print "<td>".$langs->trans("PasswordTogetVCalExport")."</td>";
+print '<td class="fieldrequired">'.$langs->trans("PasswordTogetVCalExport")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_XCAL_EXPORTKEY\" value=\"". ($_POST["MAIN_AGENDA_XCAL_EXPORTKEY"]?$_POST["MAIN_AGENDA_XCAL_EXPORTKEY"]:$conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) . "\" size=\"40\"></td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
@ -131,16 +131,18 @@ print "<br>";
 $message='';
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root);
 $urlvcal='<a href="'.$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>';
-$message.=$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal);
+$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal);
 $message.='<br>';
 $urlical='<a href="'.$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>';
-$message.=$langs->trans("WebCalUrlForVCalExport",'ical',$urlical);
+$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'ical',$urlical);
 $message.='<br>';
 $urlrss='<a href="'.$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>';
-$message.=$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss);
+$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss);
 $message.='<br>';
 $message.='<br>';
-$message.=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
+print $message;
+
+$message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@ -27,4 +27,7 @@ YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction
 AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
+PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
+VendorName=Name of vendor
+CSSUrlForPaymentForm=CSS style sheet url for payment form

--- a/htdocs/langs/fr_FR/paybox.lang
+++ b/htdocs/langs/fr_FR/paybox.lang
@ -26,4 +26,7 @@ YourPaymentHasBeenRecorded=Cette page confirme que votre paiement a bien été e
 YourPaymentHasNotBeenRecorded=Votre paiement n'a pas été enregistré et la transaction a été annulée. Merci.
 AccountParameter=Paramètres du compte
 UsageParameter=Paramètres d'utilisation
-InformationToFindParameters=Informations pour trouver vos paramètres de compte %s
+InformationToFindParameters=Informations pour trouver vos paramètres de compte %s
+PAYBOX_CGI_URL_V2=Url du module CGI Paybox de paiement
+VendorName=Nom du vendeur
+CSSUrlForPaymentForm=Url feuille style css pour le formulaire de paiement
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@ -39,15 +39,16 @@ if (!$user->admin)
 if ($_POST["action"] == 'setvalue' && $user->admin)
 {
 	//$result=dolibarr_set_const($db, "PAYBOX_IBS_DEVISE",$_POST["PAYBOX_IBS_DEVISE"],'chaine',0,'',$conf->entity);
-	$result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"],'chaine',0,'',$conf->entity);
-	$result=dolibarr_set_const($db, "PAYBOX_CREDITOR",$_POST["PAYBOX_CREDITOR"],'chaine',0,'',$conf->entity);
 	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V1",$_POST["PAYBOX_CGI_URL_V1"],'chaine',0,'',$conf->entity);
 	$result=dolibarr_set_const($db, "PAYBOX_CGI_URL_V2",$_POST["PAYBOX_CGI_URL_V2"],'chaine',0,'',$conf->entity);
 	$result=dolibarr_set_const($db, "PAYBOX_IBS_SITE",$_POST["PAYBOX_IBS_SITE"],'chaine',0,'',$conf->entity);
 	$result=dolibarr_set_const($db, "PAYBOX_IBS_RANG",$_POST["PAYBOX_IBS_RANG"],'chaine',0,'',$conf->entity);
 	$result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT",$_POST["PAYBOX_PBX_IDENTIFIANT"],'chaine',0,'',$conf->entity);

-	if ($result >= 0)
+    $result=dolibarr_set_const($db, "PAYBOX_CREDITOR",$_POST["PAYBOX_CREDITOR"],'chaine',0,'',$conf->entity);
+	$result=dolibarr_set_const($db, "PAYBOX_CSS_URL",$_POST["PAYBOX_CSS_URL"],'chaine',0,'',$conf->entity);
+
+    if ($result >= 0)
  	{
  		$mesg='<div class="ok">'.$langs->trans("SetupSaved").'</div>';
  	}
@ -88,26 +89,10 @@ $var=true;

 print '<table class="nobordernopadding" width="100%">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td>'.$langs->trans("AccountParameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";

-/*
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_CGI_URL_V1").'</td><td>';
-print '<input size="64" type="text" name="PAYBOX_CGI_URL_V1" value="'.$conf->global->PAYBOX_CGI_URL_V1.'">';
-print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi';
-print '</td></tr>';
-*/
-
-$var=!$var;
-print '<tr '.$bc[$var].'><td>';
-print '<span class="fieldrequired">'.$langs->trans("PAYBOX_CGI_URL_V2").'</span></td><td>';
-print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
-print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi';
-print '</td></tr>';
-
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_SITE").'</span></td><td>';
@ -129,6 +114,12 @@ print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf
 print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
 print '</td></tr>';

+$var=true;
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("UsageParameter").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
 /*
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
@ -138,16 +129,32 @@ print '<br>'.$langs->trans("Example").': 978 (EUR)';
 print '</td></tr>';
 */

+/*
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_CREDITOR").'</td><td>';
+print $langs->trans("PAYBOX_CGI_URL_V1").'</td><td>';
+print '<input size="64" type="text" name="PAYBOX_CGI_URL_V1" value="'.$conf->global->PAYBOX_CGI_URL_V1.'">';
+print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi';
+print '</td></tr>';
+*/
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print '<span class="fieldrequired">'.$langs->trans("PAYBOX_CGI_URL_V2").'</span></td><td>';
+print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
+print '<br>'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi';
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("VendorName").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CREDITOR" value="'.$conf->global->PAYBOX_CREDITOR.'">';
 print '<br>'.$langs->trans("Example").': '.$mysoc->nom;
 print '</td></tr>';

 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYBOX_CSS_URL").'</td><td>';
+print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="PAYBOX_CSS_URL" value="'.$conf->global->PAYBOX_CSS_URL.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@ -44,6 +44,7 @@ if ($_POST["action"] == 'setvalue' && $user->admin)
    $result=dolibarr_set_const($db, "PAYPAL_API_PASSWORD",$_POST["PAYPAL_API_PASSWORD"],'chaine',0,'',$conf->entity);
    $result=dolibarr_set_const($db, "PAYPAL_API_SIGNATURE",$_POST["PAYPAL_API_SIGNATURE"],'chaine',0,'',$conf->entity);

+    $result=dolibarr_set_const($db, "PAYPAL_CREDITOR",$_POST["PAYPAL_CREDITOR"],'chaine',0,'',$conf->entity);
    $result=dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY",$_POST["PAYPAL_API_INTEGRAL_OR_PAYPALONLY"],'chaine',0,'',$conf->entity);
    $result=dolibarr_set_const($db, "PAYPAL_CSS_URL",$_POST["PAYPAL_CSS_URL"],'chaine',0,'',$conf->entity);

@ -148,7 +149,14 @@ print '</td></tr>';

 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("PAYPAL_CSS_URL").'</td><td>';
+print $langs->trans("VendorName").'</td><td>';
+print '<input size="64" type="text" name="PAYPAL_CREDITOR" value="'.$conf->global->PAYPAL_CREDITOR.'">';
+print '<br>'.$langs->trans("Example").': '.$mysoc->nom;
+print '</td></tr>';
+
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_CSS_URL" value="'.$conf->global->PAYPAL_CSS_URL.'">';
 print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
 print '</td></tr>';
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
 *
 * This program is free software; you can redistribute it and/or modify
@ -216,17 +216,20 @@ llxHeaderPaypal($langs->trans("PaymentForm"));

 // Common variables
 $creditor=$mysoc->nom;
-$paramcreditor='PAYBOX_CREDITOR_'.$suffix;
+$paramcreditor='PAYPAL_CREDITOR_'.$suffix;
 if (! empty($conf->global->$paramcreditor)) $creditor=$conf->global->$paramcreditor;
-else if (! empty($conf->global->PAYBOX_CREDITOR)) $creditor=$conf->global->PAYBOX_CREDITOR;
+else if (! empty($conf->global->PAYPAL_CREDITOR)) $creditor=$conf->global->PAYPAL_CREDITOR;

-print '<center>';
-print '<form name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="dopayment">';
-print '<input type="hidden" name="amount" value="'.$_REQUEST["amount"].'">';
-print '<input type="hidden" name="tag" value="'.$_REQUEST["tag"].'">';
-print '<input type="hidden" name="suffix" value="'.$_REQUEST["suffix"].'">';
+print '<center>'."\n";
+print '<form name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="amount" value="'.$_REQUEST["amount"].'">'."\n";
+print '<input type="hidden" name="tag" value="'.$_REQUEST["tag"].'">'."\n";
+print '<input type="hidden" name="suffix" value="'.$_REQUEST["suffix"].'">'."\n";
+print "\n";
+print '<!-- Form to send a Paypal payment -->'."\n";
+print '<!-- Sandbox = '.$conf->global->PAYPAL_SANDBOX.' -->'."\n";
 print "\n";

 print '<table style="font-size:14px;" summary="Logo" width="80%">'."\n";
@ -723,9 +726,10 @@ if ($_REQUEST["source"] == 'membersubscription')

 if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters");

-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>';
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";

-print '</table>';
+print '</table>'."\n";
+print "\n";

 if ($found && ! $error)	// We are in a management option and no error
 {
@ -745,10 +749,10 @@ else
 	dol_print_error_email();
 }

-print '</td></tr>';
+print '</td></tr>'."\n";

-print '</table>';
-print '</form>';
+print '</table>'."\n";
+print '</form>'."\n";
 print '</center>';
 print '<br>';

--- a/htdocs/webcalendar/admin/webcalendar.php
+++ b/htdocs/webcalendar/admin/webcalendar.php
@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
 * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
 * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
 *
@ -23,7 +23,7 @@
 /**
 *    \file       htdocs/webcalendar/admin/webcalendar.php
 *    \ingroup    webcalendar
- *    \brief      Page de configuration du module webcalendar
+ *    \brief      Page to setup webcalendar module
 *    \version    $Id$
 */

@ -49,7 +49,7 @@ if ($actionsave)
    $i=0;

    $db->begin();
-    
+
    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_URL',trim($_POST["phpwebcalendar_url"]),'chaine',0,'',$conf->entity);
    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_HOST',trim($_POST["phpwebcalendar_host"]),'chaine',0,'',$conf->entity);
    $i+=dolibarr_set_const($db,'PHPWEBCALENDAR_DBNAME',trim($_POST["phpwebcalendar_dbname"]),'chaine',0,'',$conf->entity);
@ -93,7 +93,7 @@ elseif ($actiontest)

    //print "D ".$db." - ".$db->db."<br>\n";
    //print "W ".$webcal->localdb." - ".$webcal->localdb->db."<br>\n";
-    
+
    if ($webcal->localdb->connected == 1 && $webcal->localdb->database_selected == 1)
    {
        // Verifie si bonne base
@ -145,8 +145,8 @@ elseif ($actiontest)
 }


-/**
- * Affichage du formulaire de saisie
+/*
+ * View
 */

 llxHeader();
@ -315,11 +315,12 @@ print "<br>";
 $message='';
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root);
 $urlvcal='<a href="'.DOL_URL_ROOT.'/webcal/webcalexport.php?format=vcal&exportkey='.$conf->global->PHPWEBCALENDAR_PASSWORD_VCALEXPORT.'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/webcal/webcalexport.php?format=vcal&exportkey='.$conf->global->PHPWEBCALENDAR_PASSWORD_VCALEXPORT.'</a>';
-$message.=$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal);
+$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal);
 $message.='<br>';
 $urlical='<a href="'.DOL_URL_ROOT.'/webcal/webcalexport.php?format=ical&type=event&exportkey='.$conf->global->PHPWEBCALENDAR_PASSWORD_VCALEXPORT.'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/webcal/webcalexport.php?format=ical&type=event&exportkey='.$conf->global->PHPWEBCALENDAR_PASSWORD_VCALEXPORT.'</a>';
-$message.=$langs->trans("WebCalUrlForVCalExport",'ical',$urlical);
-print info_admin($message);
+$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'ical',$urlical);
+//print info_admin($message);
+print $message;

 $db->close();