diff --git a/htdocs/adherents/public.php b/htdocs/adherents/public.php index 7d6780d4676..cac2b2546c2 100644 --- a/htdocs/adherents/public.php +++ b/htdocs/adherents/public.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2009 Laurent Destailleur + * Copyright (C) 2006-2010 Laurent Destailleur * * 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 ''; print ''; // 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 ''; -print ''; -print ''; +print ''; +print ''; +print ''; print '
'.$langs->trans("Description").''.$langs->trans("URL").'
'.$langs->trans("BlankSubscriptionForm").''.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/new.php'.'
'.$langs->trans("PublicMemberList").''.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_list.php'.'
'.$langs->trans("PublicMemberCard").''.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_card.php?id=xxx'.'
'.$langs->trans("BlankSubscriptionForm").''.img_picto('','object_globe.png').' '.''.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/new.php'.'
'.$langs->trans("PublicMemberList").''.img_picto('','object_globe.png').' '.''.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_list.php'.'
'.$langs->trans("PublicMemberCard").''.img_picto('','object_globe.png').' '.$urlwithouturlroot.DOL_URL_ROOT.'/public/members/public_card.php?id=xxx'.'
'; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 97043ae73e6..9fb3c090024 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -95,7 +95,7 @@ print " "; print ""; print ""; -print "".$langs->trans("PasswordTogetVCalExport").""; +print ''.$langs->trans("PasswordTogetVCalExport").""; print "global->MAIN_AGENDA_XCAL_EXPORTKEY) . "\" size=\"40\">"; print " "; print ""; @@ -131,16 +131,18 @@ print "
"; $message=''; $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root); $urlvcal=''.$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').''; -$message.=$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal); +$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal); $message.='
'; $urlical=''.$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').''; -$message.=$langs->trans("WebCalUrlForVCalExport",'ical',$urlical); +$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'ical',$urlical); $message.='
'; $urlrss=''.$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').''; -$message.=$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss); +$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss); $message.='
'; $message.='
'; -$message.=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'
'; +print $message; + +$message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'
'; $message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'
'; $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'
'; $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'
'; diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index 75dc26fa426..556e713c9de 100644 --- 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 diff --git a/htdocs/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang index 7376fdb1efc..32435fc41b0 100644 --- 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 \ No newline at end of file +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 diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index c4805c620f1..3227e8ea377 100644 --- 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='
'.$langs->trans("SetupSaved").'
'; } @@ -88,26 +89,10 @@ $var=true; print ''; print ''; -print ''; +print ''; print ''; print "\n"; -/* -$var=!$var; -print ''; -*/ - -$var=!$var; -print ''; - $var=!$var; print ''; +$var=true; +print ''; +print ''; +print ''; +print "\n"; + /* $var=!$var; print ''; */ +/* $var=!$var; print ''; +*/ + +$var=!$var; +print ''; + +$var=!$var; +print ''; $var=!$var; print ''; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index e41b3f74aa3..b9bd6f2a1d8 100644 --- 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 ''; $var=!$var; print ''; + +$var=!$var; +print ''; diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index 4f39052b026..25ffc3fe533 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2009 Laurent Destailleur + * Copyright (C) 2006-2010 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * 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 '
'; -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; +print '
'."\n"; +print ''."\n"; +print ''."\n"; +print ''."\n"; +print ''."\n"; +print ''."\n"; +print ''."\n"; +print "\n"; +print ''."\n"; +print ''."\n"; print "\n"; print '
'.$langs->trans("Parameter").''.$langs->trans("AccountParameter").''.$langs->trans("Value").'
'; -print $langs->trans("PAYBOX_CGI_URL_V1").''; -print ''; -print '
'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi'; -print '
'; -print ''.$langs->trans("PAYBOX_CGI_URL_V2").''; -print ''; -print '
'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi'; -print '
'; print ''.$langs->trans("PAYBOX_PBX_SITE").''; @@ -129,6 +114,12 @@ print 'trans("Test").')'; print '
'.$langs->trans("UsageParameter").''.$langs->trans("Value").'
'; @@ -138,16 +129,32 @@ print '
'.$langs->trans("Example").': 978 (EUR)'; print '
'; -print $langs->trans("PAYBOX_CREDITOR").''; +print $langs->trans("PAYBOX_CGI_URL_V1").''; +print ''; +print '
'.$langs->trans("Example").': http://mysite/cgi-bin/module_linux.cgi'; +print '
'; +print ''.$langs->trans("PAYBOX_CGI_URL_V2").''; +print ''; +print '
'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi'; +print '
'; +print $langs->trans("VendorName").''; print ''; print '
'.$langs->trans("Example").': '.$mysoc->nom; print '
'; -print $langs->trans("PAYBOX_CSS_URL").''; +print $langs->trans("CSSUrlForPaymentForm").''; print ''; print '
'.$langs->trans("Example").': http://mysite/mycss.css'; print '
'; -print $langs->trans("PAYPAL_CSS_URL").''; +print $langs->trans("VendorName").''; +print ''; +print '
'.$langs->trans("Example").': '.$mysoc->nom; +print '
'; +print $langs->trans("CSSUrlForPaymentForm").''; print ''; print '
'.$langs->trans("Example").': http://mysite/mycss.css'; print '
'."\n"; @@ -723,9 +726,10 @@ if ($_REQUEST["source"] == 'membersubscription') if (! $found && ! $mesg) $mesg=$langs->trans("ErrorBadParameters"); -if ($mesg) print ''; +if ($mesg) print ''."\n"; -print '

'.$mesg.'

'.$mesg.'
'; +print ''."\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 ''; +print ''."\n"; -print ''; -print ''; +print ''."\n"; +print ''."\n"; print ''; print '
'; diff --git a/htdocs/webcalendar/admin/webcalendar.php b/htdocs/webcalendar/admin/webcalendar.php index cef95f19f1b..90da83abd13 100644 --- a/htdocs/webcalendar/admin/webcalendar.php +++ b/htdocs/webcalendar/admin/webcalendar.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * @@ -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."
\n"; //print "W ".$webcal->localdb." - ".$webcal->localdb->db."
\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 "
"; $message=''; $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root); $urlvcal=''.$urlwithouturlroot.DOL_URL_ROOT.'/webcal/webcalexport.php?format=vcal&exportkey='.$conf->global->PHPWEBCALENDAR_PASSWORD_VCALEXPORT.''; -$message.=$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal); +$message.=img_picto('','object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport",'vcal',$urlvcal); $message.='
'; $urlical=''.$urlwithouturlroot.DOL_URL_ROOT.'/webcal/webcalexport.php?format=ical&type=event&exportkey='.$conf->global->PHPWEBCALENDAR_PASSWORD_VCALEXPORT.''; -$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();