Parcourir la source

Removed deprecated files

Laurent Destailleur il y a 5 ans
Parent
commit
5cd4455649

+ 0 - 27
htdocs/public/paybox/index.php

@@ -1,27 +0,0 @@
-<?php
-/* Copyright (C) 2009 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/index.php
- *		\ingroup    core
- *		\brief      A redirect page to an error
- *		\author	    Laurent Destailleur
- */
-
-require '../../master.inc.php';
-
-header("Location: ".DOL_URL_ROOT.'/public/error-404.php');

+ 0 - 49
htdocs/public/paybox/newpayment.php

@@ -1,49 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/newpayment.php
- *		\ingroup    paybox
- *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- *		\author	    Laurent Destailleur
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
-
-$newurl = $_SERVER['REQUEST_URI'];
-$newurl = preg_replace('/\/paybox\/newpayment/', '/payment/newpayment', $newurl);
-header("Location: ".$newurl.(preg_match('/\?/', $newurl)?'&':'?').'paymentmethod=paybox');
-exit;

+ 0 - 162
htdocs/public/paybox/paymentko.php

@@ -1,162 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentko.php
- *		\ingroup    paybox
- *		\brief      File to show page after a failed payment
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paybox';
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-
-if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
-{
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('PAYBOX_PAYMENT_OK', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-    // Send an email
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))  $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    if ($sendemail)
-    {
-    	$sendto=$sendemail;
-    	$from=$conf->global->MAILING_EMAIL_FROM;
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content="";
-    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
-    	$content.="\n";
-    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-    	$content.="tag=".$fulltag."\npaymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-    	$result=$mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-    	}
-    }
-
-    unset($_SESSION['ipaddress']);
-}
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>\n";
-
-$key='ONLINE_PAYMENT_MESSAGE_KO';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();

+ 0 - 194
htdocs/public/paybox/paymentok.php

@@ -1,194 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paybox/paymentok.php
- *		\ingroup    paybox
- *		\brief      File to show page after a successful payment
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paybox->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-/*$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYBOXTOKEN=GETPOST('TOKEN');
-if (empty($PAYBOXTOKEN)) $PAYBOXTOKEN=GETPOST('token');
-$PAYBOXPAYERID=GETPOST('PAYERID');
-if (empty($PAYBOXPAYERID)) $PAYBOXPAYERID=GETPOST('PayerID');
-*/
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paybox';
-
-
-/*
- * Actions
- */
-
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paybox');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
-
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-// Get on url call
-/*
-$onlinetoken              = $PAYBOXTOKEN;
-*/
-$fulltag            = $FULLTAG;
-/*$payerID            = $PAYBOXPAYERID;
-// Set by newpayment.php
-$paymentType        = $_SESSION['PaymentType'];
-$currencyCodeType   = $_SESSION['currencyCodeType'];
-$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-// From env
-$ipaddress          = $_SESSION['ipaddress'];
-
-dol_syslog("Call newpaymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
-*/
-
-
-print $langs->trans("YourPaymentHasBeenRecorded")."<br><br>\n";
-
-$key='ONLINE_PAYMENT_MESSAGE_OK';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-
-// Appel des triggers
-include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-$interface=new Interfaces($db);
-$result=$interface->run_triggers('PAYBOX_PAYMENT_OK', $object, $user, $langs, $conf);
-if ($result < 0) { $error++; $errors=$interface->errors; }
-// Fin appel triggers
-
-$tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-// Send an email
-if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
-{
-	$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-	$from=$conf->global->MAILING_EMAIL_FROM;
-	// Define $urlwithroot
-	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-	// Define link to login card
-	$appli=constant('DOL_APPLICATION_TITLE');
-	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
-	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-	    if (preg_match('/\d\.\d/', $appli))
-	    {
-	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	    }
-	    else $appli.=" ".DOL_VERSION;
-	}
-	else $appli.=" ".DOL_VERSION;
-
-	$urlback=$_SERVER["REQUEST_URI"];
-	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-	$content="";
-	if (! empty($tmptag['MEM']))
-	{
-		$langs->load("members");
-		$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
-		$content.=$langs->trans("PaymentSubscription")."<br>\n";
-		$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-		$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-	}
-	else
-	{
-		$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
-	}
-	$content.="<br>\n";
-	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-    $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-	$content.="tag=".$fulltag."<br>\n";
-
-	$ishtml=dol_textishtml($content);	// May contain urls
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-	// Send an email
-	$result=$mailfile->sendfile();
-	if ($result)
-	{
-		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
-	}
-	else
-	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
-	}
-}
-
-
-
-print "\n</div>\n";
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();

+ 0 - 27
htdocs/public/paypal/index.php

@@ -1,27 +0,0 @@
-<?php
-/* Copyright (C) 2009 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paypal/index.php
- *		\ingroup    core
- *		\brief      A redirect page to an error
- *		\author	    Laurent Destailleur
- */
-
-require '../../master.inc.php';
-
-header("Location: ".DOL_URL_ROOT.'/public/error-404.php');

+ 0 - 52
htdocs/public/paypal/newpayment.php

@@ -1,52 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For paypal test: https://developer.paypal.com/
- * For paybox test: ???
- */
-
-/**
- *     	\file       htdocs/public/paypal/newpayment.php
- *		\ingroup    paypal
- *		\brief      File to offer a way to make a payment for a particular Dolibarr entity
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->paypal->enabled)) accessforbidden('', 0, 0, 1);
-
-$newurl = $_SERVER['REQUEST_URI'];
-$newurl = preg_replace('/\/paypal\/newpayment/', '/payment/newpayment', $newurl);
-header("Location: ".$newurl.(preg_match('/\?/', $newurl)?'&':'?').'paymentmethod=paypal');
-exit;

+ 0 - 173
htdocs/public/paypal/paymentko.php

@@ -1,173 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paypal/paymentko.php
- *		\ingroup    paypal
- *		\brief      File to show page after a failed payment.
- *                  This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
- *                  This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paypal->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paypal';
-
-
-/*
- * Actions
- */
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paypal');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
-
-if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
-{
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('PAYPAL_PAYMENT_KO', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-    // Send an email
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))  $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    if ($sendemail)
-    {
-    	$sendto=$sendemail;
-    	$from=$conf->global->MAILING_EMAIL_FROM;
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content="";
-    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
-    	$content.="\n";
-    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-    	$result=$mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-    	}
-    }
-
-    unset($_SESSION['ipaddress']);
-}
-
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show ko message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
-
-$key='ONLINE_PAYMENT_MESSAGE_KO';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();

+ 0 - 332
htdocs/public/paypal/paymentok.php

@@ -1,332 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/paypal/paymentok.php
- *		\ingroup    paypal
- *		\brief      File to show page after a successful payment
- *                  This page is called by paypal with url provided to payal completed with parameter TOKEN=xxx
- *                  This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-// Security check
-if (empty($conf->paypal->enabled)) accessforbidden('', 0, 0, 1);
-
-$langs->loadLangs(array("main","other","dict","bills","companies","paybox","paypal","stripe"));
-
-// Clean parameters
-$PAYPAL_API_USER="";
-if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
-$PAYPAL_API_PASSWORD="";
-if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
-$PAYPAL_API_SIGNATURE="";
-if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
-$PAYPAL_API_SANDBOX="";
-if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
-$PAYPAL_API_OK="";
-if ($urlok) $PAYPAL_API_OK=$urlok;
-$PAYPAL_API_KO="";
-if ($urlko) $PAYPAL_API_KO=$urlko;
-if (empty($PAYPAL_API_USER))
-{
-    dol_print_error('', "Paypal setup param PAYPAL_API_USER not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_PASSWORD))
-{
-    dol_print_error('', "Paypal setup param PAYPAL_API_PASSWORD not defined");
-    return -1;
-}
-if (empty($PAYPAL_API_SIGNATURE))
-{
-    dol_print_error('', "Paypal setup param PAYPAL_API_SIGNATURE not defined");
-    return -1;
-}
-
-$source=GETPOST('source');
-$ref=GETPOST('ref');
-$PAYPALTOKEN=GETPOST('TOKEN');
-if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
-$PAYPALPAYERID=GETPOST('PAYERID');
-if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='paypal';
-
-
-/*
- * Actions
- */
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayPal payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"])?dol_escape_htmltag($_SERVER["QUERY_STRING"]):'')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"])?dol_escape_htmltag($_SERVER["SCRIPT_URI"]):''), LOG_DEBUG, 0, '_paypal');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
-
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-if ($PAYPALTOKEN)
-{
-    // Get on url call
-    $onlinetoken        = $PAYPALTOKEN;
-    $fulltag            = $FULLTAG;
-    $payerID            = $PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-
-	dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
-
-
-	// Validate record
-    if (! empty($paymentType))
-    {
-        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_paypal');
-        $resArray=getDetails($onlinetoken);
-        //var_dump($resarray);
-
-        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
-        $resArray=confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
-
-        $ack = strtoupper($resArray["ACK"]);
-        if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
-        {
-        	$object->source		= $source;
-        	$object->ref		= $ref;
-        	$object->payerID	= $payerID;
-        	$object->fulltag	= $fulltag;
-        	$object->resArray	= $resArray;
-
-            // resArray was built from a string like that
-            // TOKEN=EC%2d1NJ057703V9359028&TIMESTAMP=2010%2d11%2d01T11%3a40%3a13Z&CORRELATIONID=1efa8c6a36bd8&ACK=Success&VERSION=56&BUILD=1553277&TRANSACTIONID=9B994597K9921420R&TRANSACTIONTYPE=expresscheckout&PAYMENTTYPE=instant&ORDERTIME=2010%2d11%2d01T11%3a40%3a12Z&AMT=155%2e57&FEEAMT=5%2e54&TAXAMT=0%2e00&CURRENCYCODE=EUR&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None
-            $PAYMENTSTATUS=urldecode($resArray["PAYMENTSTATUS"]);   // Should contains 'Completed'
-            $TRANSACTIONID=urldecode($resArray["TRANSACTIONID"]);
-            $TAXAMT=urldecode($resArray["TAXAMT"]);
-            $NOTE=urldecode($resArray["NOTE"]);
-
-            print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-            print $langs->trans("ThisIsTransactionId", $TRANSACTIONID)."<br><br>\n";
-
-			$key='ONLINE_PAYMENT_MESSAGE_OK';
-			if (! empty($conf->global->$key)) print $conf->global->$key;
-
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('PAYPAL_PAYMENT_OK', $object, $user, $langs, $conf);
-            if ($result < 0) { $error++; $errors=$interface->errors; }
-            // Fin appel triggers
-
-            $tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-        	// Send an email
-			if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
-			{
-				$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-				$from=$conf->global->MAILING_EMAIL_FROM;
-				// Define $urlwithroot
-				$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-				// Define link to login card
-				$appli=constant('DOL_APPLICATION_TITLE');
-				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-				{
-				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-				    if (preg_match('/\d\.\d/', $appli))
-				    {
-				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-				    }
-				    else $appli.=" ".DOL_VERSION;
-				}
-				else $appli.=" ".DOL_VERSION;
-
-				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-				$content="";
-				if (! empty($tmptag['MEM']))
-				{
-					$langs->load("members");
-					$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
-					$content.=$langs->trans("PaymentSubscription")."<br>\n";
-					$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-					$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-				}
-				else
-				{
-					$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
-				}
-				$content.="<br>\n";
-				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-				$ishtml=dol_textishtml($content);	// May contain urls
-
-				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-				}
-				else
-				{
-					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-				}
-			}
-        }
-        else
-		{
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('PAYPAL_PAYMENT_KO', $object, $user, $langs, $conf);
-            if ($result < 0) { $error++; $errors=$interface->errors; }
-            // Fin appel triggers
-
-		    //Display a user friendly Error on the page using any of the following error information returned by PayPal
-            $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
-            $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
-            $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
-            $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
-
-            echo $langs->trans('DoExpressCheckoutPaymentAPICallFailed') . "<br>\n";
-            echo $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
-            echo $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
-            echo $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
-            echo $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
-
-            if ($mysoc->email) echo "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
-
-            $tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-           	// Send an email
-			if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
-			{
-				$sendto=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-				$from=$conf->global->MAILING_EMAIL_FROM;
-				// Define $urlwithroot
-				$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-				$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-				//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-				// Define link to login card
-				$appli=constant('DOL_APPLICATION_TITLE');
-				if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-				{
-				    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-				    if (preg_match('/\d\.\d/', $appli))
-				    {
-				        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-				    }
-				    else $appli.=" ".DOL_VERSION;
-				}
-				else $appli.=" ".DOL_VERSION;
-
-				$urlback=$_SERVER["REQUEST_URI"];
-				$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("ValidationOfPaymentFailed");
-				$content="";
-				$content.=$langs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."\n";
-				$content.="\n";
-				$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-                $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
-				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-				$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-				$ishtml=dol_textishtml($content);	// May contain urls
-
-				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-				$result=$mailfile->sendfile();
-				if ($result)
-				{
-					dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
-				}
-				else
-				{
-					dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
-				}
-			}
-        }
-    }
-    else
-    {
-        dol_print_error('', 'Session expired');
-    }
-}
-else
-{
-    // No TOKEN parameter in URL
-    dol_print_error('', 'No TOKEN parameter in URL');
-}
-
-print "\n</div>\n";
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();

+ 0 - 51
htdocs/public/stripe/newpayment.php

@@ -1,51 +0,0 @@
-<?php
-/* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
- * Copyright (C) 2017       Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2017       Ferran Marcet   		<fmarcet@2byte.es>
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Page is called with payment parameters then called with action='dopayment', then called with action='charge' then redirect is done on urlok/jo
- */
-
-/**
- *  \file       htdocs/public/stripe/newpayment.php
- *  \ingroup    Stripe
- *  \brief      Page to do payment with Stripe
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
-
-$newurl = $_SERVER['REQUEST_URI'];
-$newurl = preg_replace('/\/stripe\/newpayment/', '/stripe/newpayment', $newurl);
-header("Location: ".$newurl.(preg_match('/\?/', $newurl)?'&':'?').'paymentmethod=stripe');
-exit;

+ 0 - 160
htdocs/public/stripe/paymentko.php

@@ -1,160 +0,0 @@
-<?php
-/* Copyright (C) 2017	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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/stripe/paymentko.php
- *		\ingroup    core
- *		\brief      File to show page after a failed payment.
- *                  This page is called by payment system with url provided to it competed with parameter FULLTAG=xxx
- *                  More data like token are saved into session. This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
-
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='stripe';
-
-
-/*
- * Actions
- */
-
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
-
-if (! empty($_SESSION['ipaddress']))      // To avoid to make action twice
-{
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $paymentType        = $_SESSION['paymentType'];
-    $FinalPaymentAmt    = $_SESSION['FinalPaymentAmt'];
-    $ipaddress          = $_SESSION['ipaddress'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('STRIPE_PAYMENT_KO', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-    // Send an email
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))  $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    if ($sendemail)
-    {
-        // Get on url call
-    	$sendto=$sendemail;
-    	$from=$conf->global->MAILING_EMAIL_FROM;
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-    	$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content="";
-    	$content.=$langs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."\n";
-    	$content.="\n";
-    	$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n";
-    	$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."\n";
-    	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
-    	$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content);
-
-    	$result=$mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
-    	}
-    }
-
-    unset($_SESSION['ipaddress']);
-}
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-// Show ko message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
-
-$key='ONLINE_PAYMENT_MESSAGE_KO';
-if (! empty($conf->global->$key)) print $conf->global->$key;
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();

+ 0 - 196
htdocs/public/stripe/paymentok.php

@@ -1,196 +0,0 @@
-<?php
-/* Copyright (C) 2017	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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- *     	\file       htdocs/public/stripe/paymentok.php
- *		\ingroup    core
- *		\brief      File to show page after a successful payment
- *                  This page is called by payment system with url provided to it completed with parameter FULLTAG=xxx
- *                  More data like token are saved into session. This token can be used to get more informations.
- */
-
-define("NOLOGIN", 1);		// This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1);	// We accept to go on this page from external web site.
-
-// For MultiCompany module.
-// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retreive from object ref and not from url.
-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
-
-$FULLTAG=GETPOST('FULLTAG');
-if (empty($FULLTAG)) $FULLTAG=GETPOST('fulltag');
-$source=GETPOST('source');
-$ref=GETPOST('ref');
-
-// Security check
-if (empty($conf->stripe->enabled)) accessforbidden('', 0, 0, 1);
-
-
-$ispaymentok = false;
-// If payment is ok
-$PAYMENTSTATUS=$TRANSACTIONID=$TAXAMT=$NOTE='';
-// If payment is ko
-$ErrorCode=$ErrorShortMsg=$ErrorLongMsg=$ErrorSeverityCode='';
-
-
-$object = new stdClass();   // For triggers
-
-$paymentmethod='stripe';
-
-
-/*
- * Actions
- */
-
-
-
-/*
- * View
- */
-
-dol_syslog("Callback url when a payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_stripe');
-
-$tracepost = "";
-foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
-dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_stripe');
-
-$head='';
-if (! empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head='<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
-
-$conf->dol_hide_topmenu=1;
-$conf->dol_hide_leftmenu=1;
-
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
-
-
-
-// Show message
-print '<span id="dolpaymentspan"></span>'."\n";
-print '<div id="dolpaymentdiv" align="center">'."\n";
-
-$ispaymentok = true;    // We call this page if payment is ok
-if ($ispaymentok)
-{
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN)?$_SESSION['onlinetoken']:$PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID)?$_SESSION['payerID']:$PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-    $TRANSACTIONID      = $_SESSION['TRANSACTIONID'];
-
-    // Appel des triggers
-    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    $interface=new Interfaces($db);
-    $result=$interface->run_triggers('STRIPE_PAYMENT_OK', $object, $user, $langs, $conf);
-    if ($result < 0) { $error++; $errors=$interface->errors; }
-    // Fin appel triggers
-
-
-    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-    print $langs->trans("ThisIsTransactionId", $TRANSACTIONID)."<br><br>\n";
-
-	$key='ONLINE_PAYMENT_MESSAGE_OK';
-	if (! empty($conf->global->$key)) print $conf->global->$key;
-
-    $sendemail = '';
-    if (! empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail=$conf->global->ONLINE_PAYMENT_SENDEMAIL;
-
-    $tmptag=dolExplodeIntoArray($fulltag, '.', '=');
-
-	// Send an email
-    if ($sendemail)
-	{
-		$sendto=$sendemail;
-		$from=$conf->global->MAILING_EMAIL_FROM;
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-    	// Define link to login card
-    	$appli=constant('DOL_APPLICATION_TITLE');
-    	if (! empty($conf->global->MAIN_APPLICATION_TITLE))
-    	{
-    	    $appli=$conf->global->MAIN_APPLICATION_TITLE;
-    	    if (preg_match('/\d\.\d/', $appli))
-    	    {
-    	        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-    	    }
-    	    else $appli.=" ".DOL_VERSION;
-    	}
-    	else $appli.=" ".DOL_VERSION;
-
-    	$urlback=$_SERVER["REQUEST_URI"];
-		$topic='['.$appli.'] '.$langs->transnoentitiesnoconv("NewOnlinePaymentReceived");
-		$content="";
-		if (! empty($tmptag['MEM']))
-		{
-			$langs->load("members");
-			$url=$urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
-			$content.=$langs->trans("PaymentSubscription")."<br>\n";
-			$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
-			$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		else
-		{
-			$content.=$langs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
-		}
-		$content.="<br>\n";
-		$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
-		$content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n";
-		$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-		$content.="tag=".$fulltag."\ntoken=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
-
-		$ishtml=dol_textishtml($content);	// May contain urls
-
-		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
-
-		$result=$mailfile->sendfile();
-		if ($result)
-		{
-			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_stripe');
-		}
-		else
-		{
-			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_stripe');
-		}
-	}
-}
-
-
-print "\n</div>\n";
-
-
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
-
-
-llxFooter('', 'public');
-
-$db->close();