diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 8b53485715f1ec4cb4af17b79b88f948b472eac8..ad95cf74843a45b188b03fc7cb3a82fb3f5b30fb 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1290,6 +1290,7 @@ function img_picto($alt, $picto, $options='', $pictoisfullpath=0) { $picto = $regs[1]; $path = $regs[2]; + if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto.='.png'; // If img file not into standard path, we use alternate path if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto)) $url = DOL_URL_ROOT_ALT; } diff --git a/htdocs/paypal/img/paypal_logo.png b/htdocs/paypal/img/paypal_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2a4fd7c9ad51c3bbb336089638471cd366e24ff9 Binary files /dev/null and b/htdocs/paypal/img/paypal_logo.png differ diff --git a/htdocs/paypal/transaction.php b/htdocs/paypal/transaction.php index eedd9a053a86ccebbbae5ac98c10e840546e09d8..f932adcc7807755343ac476788a3986decc1cf5b 100644 --- a/htdocs/paypal/transaction.php +++ b/htdocs/paypal/transaction.php @@ -133,7 +133,7 @@ if (! empty($nvpStr)) dol_htmloutput_errors('',$errors); -print_barre_liste($langs->trans('PaypalTransaction'), $page, $_SERVER['PHP_SELF']); +print_fiche_titre($langs->trans('PaypalTransaction'), '', 'paypal_logo@paypal'); // Search parameters print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">'; @@ -141,24 +141,18 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<table>'; -print '<tr>'; -print '<td>'.$langs->trans('DateStart').': </td>'; -print '<td><input type="text" id="startDateStr" name="startDateStr" maxlength="20" size="10" value="'.$start_date_str.'" /></td>'; -print '</tr>'; +print '<tr><td>'; +print $langs->trans('DateStart').': '; +print '<input type="text" id="startDateStr" name="startDateStr" maxlength="20" size="10" value="'.$start_date_str.'" /> '; -print '<tr>'; -print '<td>'.$langs->trans('DateEnd').': </td>'; -print '<td><input type="text" id="endDateStr" name="endDateStr" maxlength="20" size="10" value="'.$end_date_str.'" /></td>'; -print '</tr>'; +print $langs->trans('DateEnd').': '; +print '<input type="text" id="endDateStr" name="endDateStr" maxlength="20" size="10" value="'.$end_date_str.'" /> '; -print '<tr>'; -print '<td>'.$langs->trans('TransactionID').': </td>'; -print '<td><input type="text" name="transactionID" /></td>'; -print '</tr>'; +print $langs->trans('TransactionID').': '; +print '<input type="text" name="transactionID" /> '; -print '<tr>'; -print '<td><input type="submit" value="'.$langs->trans('Send').'" /></td>'; -print '</tr>'; +print '<input type="submit" value="'.$langs->trans('Send').'" />'; +print '</td</tr>'; print '</table>'; print '</form>';