@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $search_date_startendday = GETPOSTINT('search_date_startendday'); |
| 118 | 118 | $search_date_startendmonth = GETPOSTINT('search_date_startendmonth'); |
| 119 | 119 | $search_date_startendyear = GETPOSTINT('search_date_startendyear'); |
| 120 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 120 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
| 121 | 121 | $search_date_startend = dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear); |
| 122 | 122 | |
| 123 | 123 | $search_date_endday = GETPOSTINT('search_date_endday'); |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | $search_date_endendday = GETPOSTINT('search_date_endendday'); |
| 127 | 127 | $search_date_endendmonth = GETPOSTINT('search_date_endendmonth'); |
| 128 | 128 | $search_date_endendyear = GETPOSTINT('search_date_endendyear'); |
| 129 | -$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
| 129 | +$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver |
|
| 130 | 130 | $search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear); |
| 131 | 131 | |
| 132 | -$optioncss = GETPOST('optioncss', 'alpha'); |
|
| 132 | +$optioncss = GETPOST('optioncss', 'alpha'); |
|
| 133 | 133 | |
| 134 | 134 | if ($search_status == '') { |
| 135 | 135 | $search_status = -1; |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | } |
| 589 | 589 | |
| 590 | 590 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 591 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 591 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 592 | 592 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 593 | 593 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 594 | 594 | |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | -$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 99 | +$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php |
|
| 100 | 100 | |
| 101 | 101 | |
| 102 | 102 | /* |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | $dataseries = dol_sort_array($dataseries, 1, 'desc'); |
| 142 | 142 | |
| 143 | 143 | // Merge all entries after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic). |
| 144 | -$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 144 | +$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 145 | 145 | $i = 0; |
| 146 | 146 | if (count($dataseries) > ($KEEPNFIRST + 1)) { |
| 147 | 147 | foreach ($dataseries as $key => $val) { |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | $usestripeterminals = getDolGlobalString('STRIPE_LOCATION'); |
| 62 | -if (! $usestripeterminals) { |
|
| 62 | +if (!$usestripeterminals) { |
|
| 63 | 63 | accessforbidden('Feature to use Stripe terminals not enabled'); |
| 64 | 64 | } |
| 65 | 65 | |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | "confirmation_method" => $mode, |
| 489 | 489 | "amount" => $stripeamount, |
| 490 | 490 | "currency" => $currency_code, |
| 491 | - "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
| 491 | + "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
| 492 | 492 | /* |
| 493 | 493 | 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php', |
| 494 | 494 | 'automatic_payment_methods' => array( |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | ); |
| 504 | 504 | if ($descriptor) { |
| 505 | 505 | $dataforintent["statement_descriptor_suffix"] = $descriptor; // For card payment, 22 chars that appears on bank receipt (prefix into stripe setup + this suffix) |
| 506 | - $dataforintent["statement_descriptor"] = $descriptor; // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix |
|
| 506 | + $dataforintent["statement_descriptor"] = $descriptor; // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix |
|
| 507 | 507 | } |
| 508 | 508 | if (!is_null($customer)) { |
| 509 | 509 | $dataforintent["customer"] = $customer; |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | |
| 713 | 713 | $dataforintent = array( |
| 714 | 714 | "confirm" => $confirmnow, // Do not confirm immediately during creation of intent |
| 715 | - "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
| 715 | + "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
| 716 | 716 | /* |
| 717 | 717 | 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php', |
| 718 | 718 | 'automatic_payment_methods' => array( |
@@ -1128,7 +1128,7 @@ discard block |
||
| 1128 | 1128 | } catch (Exception $e) { |
| 1129 | 1129 | $sepa = null; |
| 1130 | 1130 | $this->error = 'Stripe error: ' . $e->getMessage() . '. Check the BAN information.'; |
| 1131 | - dol_syslog($this->error, LOG_WARNING); // Error from Stripe, so a warning on Dolibarr |
|
| 1131 | + dol_syslog($this->error, LOG_WARNING); // Error from Stripe, so a warning on Dolibarr |
|
| 1132 | 1132 | } |
| 1133 | 1133 | } |
| 1134 | 1134 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | '', |
| 91 | 91 | array( |
| 92 | 92 | 'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'), |
| 93 | - 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
| 94 | - 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
| 93 | + 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
| 94 | + 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
| 95 | 95 | 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
| 96 | 96 | 'entity' => array('name' => 'entity', 'type' => 'xsd:string') |
| 97 | 97 | ) |
@@ -120,12 +120,12 @@ discard block |
||
| 120 | 120 | 'amount' => array('name' => 'amount', 'type' => 'xsd:double'), |
| 121 | 121 | 'num_payment' => array('name' => 'num_payment', 'type' => 'xsd:string'), |
| 122 | 122 | 'thirdparty_id' => array('name' => 'thirdparty_id', 'type' => 'xsd:int'), |
| 123 | - 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
| 124 | - 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
| 125 | - 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
| 126 | - 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
| 127 | - 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
| 128 | - 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
| 123 | + 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
| 124 | + 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
| 125 | + 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
| 126 | + 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
| 127 | + 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
| 128 | + 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
| 129 | 129 | ) |
| 130 | 130 | ); |
| 131 | 131 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $now = dol_now(); |
| 166 | 166 | |
| 167 | 167 | dol_syslog("Function: createPayment login=" . $authentication['login'] . " id=" . $payment->id . |
| 168 | - ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
| 168 | + ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
| 169 | 169 | |
| 170 | 170 | if ($authentication['entity']) { |
| 171 | 171 | $conf->entity = $authentication['entity']; |
@@ -64,8 +64,7 @@ |
||
| 64 | 64 | $dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php |
| 65 | 65 | |
| 66 | 66 | $tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? |
| 67 | - (empty($dolibarr_main_cookie_cryptkey) ? '' : |
|
| 68 | - $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; |
|
| 67 | + (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; |
|
| 69 | 68 | // Unique id of instance |
| 70 | 69 | |
| 71 | 70 | // The recommended value (may be not defined for old versions) |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | 'maxTopMenu' => & $maxTopMenu |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | -$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
| 116 | +$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
| 117 | 117 | if ($reshook < 0) { |
| 118 | 118 | $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 119 | 119 | } |
@@ -49,7 +49,9 @@ |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // Not sure this is required |
| 52 | -if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
| 52 | +if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) { |
|
| 53 | + unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
| 54 | +} |
|
| 53 | 55 | |
| 54 | 56 | if (GETPOST('noredirect')) { |
| 55 | 57 | return; |