Author: benj
Date: Thu Jul 7 14:14:44 2016
New Revision: 1722
URL: http://svn.gna.org/viewcvs/gdtc?rev=1722&view=rev
Log:
Fix CB import (date problem + warnings)
Modified:
trunk/gdtc/include/cb_cmcic.php
trunk/gdtc/include/utils.php
Modified: trunk/gdtc/include/cb_cmcic.php
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/cb_cmcic.php?rev=1722&r1=1721&r2=1722&view=diff
==============================================================================
--- trunk/gdtc/include/cb_cmcic.php (original)
+++ trunk/gdtc/include/cb_cmcic.php Thu Jul 7 14:14:44 2016
@@ -606,13 +606,15 @@
fwrite ( $fh, "* Tentative de capture: \n" );
$date = strftime ( "%d/%m/%Y:%H:%M:%S" );
+ $date_commande = sql2date($subscription['payment_received_date']);
+ $date_commande = preg_replace ( '/\+.*/', '', $date_commande );
$pro_rata = $subscription [ 'cbrecur_prorata' ];
$fields = array ('version' => '3.0',
'TPE' => RECUR_TPE_NUMBER,
'date' => urlencode ( $date ),
- 'date_commande' =>
urlencode(sql2date($subscription['payment_received_date'])),
+ 'date_commande' => urlencode ( $date_commande ),
'montant' => $subscription [ 'prelevement_amount' ] . 'EUR',
'montant_a_capturer' => ( $pro_rata . 'EUR' ),
'montant_deja_capture' => '0EUR',
Modified: trunk/gdtc/include/utils.php
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/utils.php?rev=1722&r1=1721&r2=1722&view=diff
==============================================================================
--- trunk/gdtc/include/utils.php (original)
+++ trunk/gdtc/include/utils.php Thu Jul 7 14:14:44 2016
@@ -98,11 +98,13 @@
// $_SERVER [ 'SCRIPT_NAME' ], $matches );
// Frederic Couchet - 19/12/2008 - on utilise l'URI sinon le theme my n'est
pas
// correctement pris en compte
- preg_match ( '/\/([^\/]*)/',
- str_replace("/fr","",$_SERVER [ 'REQUEST_URI' ]), $matches );
-
- $app = $matches [ 1 ];
+ if ( array_key_exists ( 'REQUEST_URI', $_SERVER ) )
+ {
+ preg_match ( '/\/([^\/]*)/',
+ str_replace("/fr","",$_SERVER [ 'REQUEST_URI' ]), $matches );
+ $app = $matches [ 1 ];
}
+ }
$smarty -> assign ( 'app', $app );
$smarty -> assign ( 'theme', DTC_THEME );
@@ -115,8 +117,10 @@
$smarty -> assign ( 'dosubmit', '' );
$smarty -> assign ( 'id', my_id() );
- $smarty -> assign ( 'login', $_SESSION [ 'login' ] );
- if ( $_SESSION [ 'is_admin' ] )
+ if ( $_SESSION && array_key_exists ( 'login', $_SESSION ) ) {
+ $smarty -> assign ( 'login', $_SESSION [ 'login' ] );
+ }
+ if ( $_SESSION && array_key_exists ( 'is_admin', $_SESSION ) )
{
$smarty -> assign ( 'is_admin', 1 );
}
@@ -139,7 +143,8 @@
$smarty -> assign ( 'dtc_public_base_url', DTC_PUBLIC_BASE_URL );
$smarty -> assign ( 'dtc_admin_base_url', DTC_ADMIN_BASE_URL );
$smarty -> assign ( 'dtc_my_base_url', DTC_MY_BASE_URL );
- $smarty -> assign ( 'url', DTC_HOST_NAME . $_SERVER [ 'REQUEST_URI' ] );
+ if ( array_key_exists ( 'REQUEST_URI', $_SERVER ) )
+ $smarty -> assign ( 'url', DTC_HOST_NAME . $_SERVER [ 'REQUEST_URI' ] );
if ( array_key_exists ( 'HTTP_REFERER', $_SERVER ) )
$smarty -> assign ( 'url_referer', $_SERVER [ 'HTTP_REFERER' ] );
$smarty -> assign ( 'dtc_mail_bot', DTC_MAIL_BOT );
@@ -828,7 +833,7 @@
*/
function my_id ( )
{
- if ( ! array_key_exists ( 'login', $_SESSION ) )
+ if ( ! $_SESSION || ! array_key_exists ( 'login', $_SESSION ) )
return Array();
$me = simple_unique_query ( sprintf ( "select actor_id from actor where
nickname = '%s';",
_______________________________________________
Gdtc-commits mailing list
[email protected]
https://mail.gna.org/listinfo/gdtc-commits
