Dolibarr / dolibarr

htdocs/asset/class/assetdepreciationoptions.class.php

Spacing +21 added lines, -21 removed lines

@@ -80,7 +80,7 @@ 
 			'table'	=> 'asset_depreciation_options_economic',
 			'fields' => array(
 				'depreciation_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDepreciationType', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'AssetDepreciationOptionDepreciationTypeLinear', 1 => 'AssetDepreciationOptionDepreciationTypeDegressive', 2 => 'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate' => 1,),
-				'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'validate' => 1,'enabled_field' => 'economic:depreciation_type:1'),
+				'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'validate' => 1, 'enabled_field' => 'economic:depreciation_type:1'),
 				'duration' => array('type' => 'integer', 'label' => 'AssetDepreciationOptionDuration', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'validate' => 1,),
 				'duration_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDurationType', 'enabled' => 1, 'position' => 40, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'AssetDepreciationOptionDurationTypeAnnual', 1 => 'AssetDepreciationOptionDurationTypeMonthly'/*, 2=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate' => 1,),
 				'rate' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionRate', 'enabled' => 1, 'position' => 50, 'visible' => 3, 'default' => '0', 'isameasure' => 1, 'validate' => 1, 'computed' => '$object->asset_depreciation_options->getRate("economic")',),
@@ -96,7 +96,7 @@ 
 			'enabled_field' => 'economic:accelerated_depreciation_option:1',
 			'fields' => array(
 				'depreciation_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDepreciationType', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'AssetDepreciationOptionDepreciationTypeLinear', 1 => 'AssetDepreciationOptionDepreciationTypeDegressive', 2 => 'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate' => 1,),
-				'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'validate' => 1,'enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
+				'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'validate' => 1, 'enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
 				'duration' => array('type' => 'integer', 'label' => 'AssetDepreciationOptionDuration', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => 1, 'validate' => 1,),
 				'duration_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDurationType', 'enabled' => 1, 'position' => 40, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array(0 => 'AssetDepreciationOptionDurationTypeAnnual', 1 => 'AssetDepreciationOptionDurationTypeMonthly'/*, 2=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate' => 1,),
 				'rate' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionRate', 'enabled' => 1, 'position' => 50, 'visible' => 3, 'default' => '0', 'isameasure' => 1, 'validate' => 1, 'computed' => '$object->asset_depreciation_options->getRate("accelerated_depreciation")',),
@@ -238,9 +238,9 @@ 
 					continue;
 				}
 
-				$html_name = $mode_key . '_' . $field_key;
+				$html_name = $mode_key.'_'.$field_key;
 				if ($field_info['type'] == 'duration') {
-					if (GETPOST($html_name . 'hour') == '' && GETPOST($html_name . 'min') == '') {
+					if (GETPOST($html_name.'hour') == '' && GETPOST($html_name.'min') == '') {
 						continue; // The field was not submitted to be saved
 					}
 				} else {
@@ -262,11 +262,11 @@ 
 				if (in_array($field_info['type'], array('text', 'html'))) {
 					$value = GETPOST($html_name, 'restricthtml');
 				} elseif ($field_info['type'] == 'date') {
-					$value = dol_mktime(0, 0, 0, GETPOSTINT($html_name . 'month'), GETPOSTINT($html_name . 'day'), GETPOSTINT($html_name . 'year'), 'gmt'); // for date without hour, we use gmt
+					$value = dol_mktime(0, 0, 0, GETPOSTINT($html_name.'month'), GETPOSTINT($html_name.'day'), GETPOSTINT($html_name.'year'), 'gmt'); // for date without hour, we use gmt
 				} elseif ($field_info['type'] == 'datetime') {
-					$value = dol_mktime(GETPOSTINT($html_name . 'hour'), GETPOSTINT($html_name . 'min'), GETPOSTINT($html_name . 'sec'), GETPOSTINT($html_name . 'month'), GETPOSTINT($html_name . 'day'), GETPOSTINT($html_name . 'year'), 'tzuserrel');
+					$value = dol_mktime(GETPOSTINT($html_name.'hour'), GETPOSTINT($html_name.'min'), GETPOSTINT($html_name.'sec'), GETPOSTINT($html_name.'month'), GETPOSTINT($html_name.'day'), GETPOSTINT($html_name.'year'), 'tzuserrel');
 				} elseif ($field_info['type'] == 'duration') {
-					$value = 60 * 60 * GETPOSTINT($html_name . 'hour') + 60 * GETPOSTINT($html_name . 'min');
+					$value = 60 * 60 * GETPOSTINT($html_name.'hour') + 60 * GETPOSTINT($html_name.'min');
 				} elseif (preg_match('/^(integer|price|real|double)/', $field_info['type'])) {
 					$value = price2num(GETPOST($html_name, 'alphanohtml')); // To fix decimal separator according to lang setup
 				} elseif ($field_info['type'] == 'boolean') {
@@ -274,7 +274,7 @@ 
 				} elseif ($field_info['type'] == 'reference') {
 					// todo to check
 					$tmparraykey = array(); //array_keys($object->param_list);
-					$value = $tmparraykey[GETPOST($html_name)] . ',' . GETPOST($html_name . '2');
+					$value = $tmparraykey[GETPOST($html_name)].','.GETPOST($html_name.'2');
 				} else {
 					if ($field_key == 'lang') {
 						$value = GETPOST($html_name, 'aZ09') ? GETPOST($html_name, 'aZ09') : "";
@@ -340,7 +340,7 @@ 
 	public function fetchDeprecationOptions($asset_id = 0, $asset_model_id = 0)
 	{
 		global $langs, $hookmanager;
-		dol_syslog(__METHOD__ . " asset_id=$asset_id, asset_model_id=$asset_model_id");
+		dol_syslog(__METHOD__." asset_id=$asset_id, asset_model_id=$asset_model_id");
 
 		$error = 0;
 		$this->errors = array();
@@ -363,7 +363,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . " Error check parameters: " . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__." Error check parameters: ".$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -372,9 +372,9 @@ 
 		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
 			$this->setInfosForMode($mode_key, $class_type);
 
-			$result = $this->fetchCommon(0, '', " AND " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id));
+			$result = $this->fetchCommon(0, '', " AND ".($asset_id > 0 ? " fk_asset = ".(int) $asset_id : " fk_asset_model = ".(int) $asset_model_id));
 			if ($result < 0) {
-				$this->errors = array_merge(array($langs->trans('AssetErrorFetchDepreciationOptionsForMode', $mode_key) . ':'), $this->errors);
+				$this->errors = array_merge(array($langs->trans('AssetErrorFetchDepreciationOptionsForMode', $mode_key).':'), $this->errors);
 				$error++;
 			} elseif ($result > 0) {
 				foreach ($this->fields as $field_key => $field_info) {
@@ -396,7 +396,7 @@ 
 		}
 
 		if ($error) {
-			dol_syslog(__METHOD__ . " Error fetch accountancy codes: " . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__." Error fetch accountancy codes: ".$this->errorsToString(), LOG_ERR);
 			return -1;
 		} else {
 			$this->deprecation_options = $deprecation_options;
@@ -413,7 +413,7 @@ 
 	public function getGeneralDepreciationInfoForMode($mode)
 	{
 		global $hookmanager;
-		dol_syslog(__METHOD__ . " mode=$mode");
+		dol_syslog(__METHOD__." mode=$mode");
 
 		$this->errors = array();
 
@@ -451,7 +451,7 @@ 
 	public function updateDeprecationOptions($user, $asset_id = 0, $asset_model_id = 0, $notrigger = 0)
 	{
 		global $langs, $hookmanager;
-		dol_syslog(__METHOD__ . " user_id=".$user->id.", asset_id=".$asset_id.", asset_model_id=".$asset_model_id.", notrigger=".$notrigger);
+		dol_syslog(__METHOD__." user_id=".$user->id.", asset_id=".$asset_id.", asset_model_id=".$asset_model_id.", notrigger=".$notrigger);
 
 		$error = 0;
 		$this->errors = array();
@@ -473,7 +473,7 @@ 
 			$error++;
 		}
 		if ($error) {
-			dol_syslog(__METHOD__ . " Error check parameters: " . $this->errorsToString(), LOG_ERR);
+			dol_syslog(__METHOD__." Error check parameters: ".$this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
@@ -491,11 +491,11 @@ 
 
 		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
 			// Delete old accountancy codes
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
-			$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$mode_info['table'];
+			$sql .= " WHERE ".($asset_id > 0 ? " fk_asset = ".(int) $asset_id : " fk_asset_model = ".(int) $asset_model_id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->errors[] = $langs->trans('AssetErrorDeleteDepreciationOptionsForMode', $mode_key) . ': ' . $this->db->lasterror();
+				$this->errors[] = $langs->trans('AssetErrorDeleteDepreciationOptionsForMode', $mode_key).': '.$this->db->lasterror();
 				$error++;
 			}
 
@@ -511,7 +511,7 @@ 
 
 				$result = $this->createCommon($user, 1);
 				if ($result < 0) {
-					$this->errors = array_merge(array($langs->trans('AssetErrorInsertDepreciationOptionsForMode', $mode_key) . ':'), $this->errors);
+					$this->errors = array_merge(array($langs->trans('AssetErrorInsertDepreciationOptionsForMode', $mode_key).':'), $this->errors);
 					$error++;
 				}
 			}
@@ -519,7 +519,7 @@ 
 
 		if (!$error && $this->fk_asset > 0) {
 			// Calculation of depreciation lines (reversal and future)
-			require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 			$asset = new Asset($this->db);
 			$result = $asset->fetch($this->fk_asset);
 			if ($result > 0) {

htdocs/core/modules/societe/mod_codecompta_digitaria.php

Spacing +10 added lines, -10 removed lines

@@ -112,10 +112,10 @@ 
 		$texte .= '<input type="hidden" name="param4" value="COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER">';
 		$texte .= '<input type="hidden" name="param5" value="COMPANY_DIGITARIA_CLEAN_WORDS">';
 		$texte .= '<table class="nobordernopadding centpercent">';
-		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="' . getDolGlobalString('COMPANY_DIGITARIA_MASK_SUPPLIER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
-		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="' . getDolGlobalString('COMPANY_DIGITARIA_MASK_CUSTOMER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
-		$s3 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value3" value="' . getDolGlobalString('COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
-		$s4 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value4" value="' . getDolGlobalString('COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
+		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.getDolGlobalString('COMPANY_DIGITARIA_MASK_SUPPLIER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
+		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.getDolGlobalString('COMPANY_DIGITARIA_MASK_CUSTOMER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
+		$s3 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value3" value="'.getDolGlobalString('COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
+		$s4 = $form->textwithpicto('<input type="text" class="flat" size="2" name="value4" value="'.getDolGlobalString('COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
 		$texte .= '<tr><td>';
 		// trans remove html entities
 		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}', '{s4}')."<br>\n";
@@ -128,7 +128,7 @@ 
 		}
 		// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
 		if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')) {
-			$texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = ' . getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')."<br>\n";
+			$texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')."<br>\n";
 		}
 		// If value is not unique (if COMPANY_DIGITARIA_UNIQUE_CODE is set to 0), we show this
 		if (!getDolGlobalString('COMPANY_DIGITARIA_UNIQUE_CODE', '1')) {
@@ -232,7 +232,7 @@ 
 			}
 			// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
 			if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')) {	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
-				$codetouse = preg_replace('/' . getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
+				$codetouse = preg_replace('/'.getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
 			}
 
 			$this->code = $prefix.strtoupper(substr($codetouse, 0, (int) $width));
@@ -305,11 +305,11 @@ 
 		}
 
 		if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe_perentity";
-			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
+			$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe_perentity";
+			$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 		} else {
-			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe";
-			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
+			$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
+			$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 		}
 		$sql .= " AND entity IN (".getEntity('societe').")";
 

htdocs/core/modules/societe/mod_codecompta_aquarium.php

Spacing +5 added lines, -5 removed lines

@@ -99,8 +99,8 @@ 
 		$texte .= '<input type="hidden" name="param1" value="COMPANY_AQUARIUM_MASK_SUPPLIER">';
 		$texte .= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
-		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="' . getDolGlobalString('COMPANY_AQUARIUM_MASK_SUPPLIER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
-		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="' . getDolGlobalString('COMPANY_AQUARIUM_MASK_CUSTOMER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
+		$s1 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.getDolGlobalString('COMPANY_AQUARIUM_MASK_SUPPLIER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
+		$s2 = $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.getDolGlobalString('COMPANY_AQUARIUM_MASK_CUSTOMER').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name);
 		$texte .= '<tr><td>';
 		// trans remove html entities
 		$texte .= $langs->trans("ModuleCompanyCodeCustomer".$this->name, '{s2}')."<br>\n";
@@ -112,11 +112,11 @@ 
 		}
 		//if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
 		if (getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')) {
-			$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = ' . getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')."<br>\n";
+			$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')."<br>\n";
 		}
 
 		if (getDolGlobalString('COMPANY_AQUARIUM_NO_PREFIX')) {
-			$texte .= $langs->trans('COMPANY_AQUARIUM_NO_PREFIX').' = ' . getDolGlobalString('COMPANY_AQUARIUM_NO_PREFIX')."<br>\n";
+			$texte .= $langs->trans('COMPANY_AQUARIUM_NO_PREFIX').' = '.getDolGlobalString('COMPANY_AQUARIUM_NO_PREFIX')."<br>\n";
 		}
 		$texte .= '</td>';
 		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition smallpaddingimp" name="modify" value="'.$langs->trans("Modify").'"></td>';
@@ -187,7 +187,7 @@ 
 		}
 		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
 		if (getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')) {	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
-			$codetouse = preg_replace('/' . getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
+			$codetouse = preg_replace('/'.getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
 		}
 
 		$codetouse = $prefix.strtoupper($codetouse);

htdocs/core/modules/cheque/mod_chequereceipt_thyme.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskchequereceipts" value="' . getDolGlobalString('CHEQUERECEIPTS_THYME_MASK').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskchequereceipts" value="'.getDolGlobalString('CHEQUERECEIPTS_THYME_MASK').'">', $tooltip, 1, 'help', 'valignmiddle', 0, 3, $this->name).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp;<input type="submit" class="button button-edit reposition smallpaddingimp" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -97,8 +97,8 @@ 
 	{
 		global $db, $langs;
 
-		require_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$remise = new RemiseCheque($db);
 		$remise->initAsSpecimen();

htdocs/blockedlog/class/blockedlog.class.php

Spacing +7 added lines, -7 removed lines

@@ -462,7 +462,7 @@ 
 			'linkedObjectsIds',
 			'linkedObjects',
 			'fk_delivery_address',
-			'projet',          // There is already ->fk_project
+			'projet', // There is already ->fk_project
 			'restrictiononfksoc',
 			'specimen',
 		);
@@ -807,10 +807,10 @@ 
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) {
-				$this->id 				= $obj->rowid;
-				$this->entity 			= $obj->entity;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
 
-				$this->date_creation 	= $this->db->jdate($obj->date_creation);
+				$this->date_creation = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->tms);
 
 				$this->amounts			= (float) $obj->amounts;
@@ -828,7 +828,7 @@ 
 				$this->object_version = $obj->object_version;
 
 				$this->signature		= $obj->signature;
-				$this->signature_line 	= $obj->signature_line;
+				$this->signature_line = $obj->signature_line;
 				$this->certified		= ($obj->certified == 1);
 
 				return 1;
@@ -948,7 +948,7 @@ 
 
 		$previoushash = $this->getPreviousHash(1, 0); // This get last record and lock database until insert is done and transaction closed
 
-		$keyforsignature = $this->buildKeyForSignature();	// All the information for the has (meta data + data saved)
+		$keyforsignature = $this->buildKeyForSignature(); // All the information for the has (meta data + data saved)
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 
@@ -1115,7 +1115,7 @@ 
 		if (empty($previoussignature)) {
 			$sql = "SELECT rowid, signature FROM ".MAIN_DB_PREFIX."blockedlog";
 			if ($beforeid) {
-				$sql.= $this->db->hintindex('entity_rowid', 1);
+				$sql .= $this->db->hintindex('entity_rowid', 1);
 			}
 			$sql .= " WHERE entity = ".((int) $conf->entity);
 			if ($beforeid) {

htdocs/public/payment/paymentok.php

Spacing +53 added lines, -53 removed lines

@@ -150,9 +150,9 @@ 
 $paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
 $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
 if (getDolGlobalString($paramcreditorlong)) {
-	$creditor = getDolGlobalString($paramcreditorlong);	// use label long of the seller to show
+	$creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
 } elseif (getDolGlobalString($paramcreditor)) {
-	$creditor = getDolGlobalString($paramcreditor);		// use label short of the seller to show
+	$creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
 }
 
 
@@ -207,7 +207,7 @@ 
 
 $head = '';
 if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -267,7 +267,7 @@ 
 	}
 	if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
 		print '<div class="backimagepublicpayment">';
-		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="' . getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
+		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
 		print '</div>';
 	}
 
@@ -282,11 +282,11 @@ 
 		// Get on url call
 		$onlinetoken        = $PAYPALTOKEN;
 		$fulltag            = $FULLTAG;
-		$payerID 			= !empty($PAYPALPAYERID) ? $PAYPALPAYERID : '';
+		$payerID = !empty($PAYPALPAYERID) ? $PAYPALPAYERID : '';
 		// Set by newpayment.php
 		$currencyCodeType   = $_SESSION['currencyCodeType'];
 		$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-		$paymentType        = $_SESSION['PaymentType'];			// Value can be 'Mark', 'Sole', 'Sale' for example
+		$paymentType        = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example
 		// From env
 		$ipaddress          = $_SESSION['ipaddress'];
 
@@ -388,10 +388,10 @@ 
 	$ipaddress = $_SESSION['ipaddress'];
 }
 if (empty($TRANSACTIONID)) {
-	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' :$_SESSION['TRANSACTIONID'];	// pi_... or ch_...
+	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_...
 	if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
 		// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
-		$TRANSACTIONID   = GETPOST('payment_intent', 'alphanohtml');
+		$TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
 	}
 }
 if (empty($FinalPaymentAmt)) {
@@ -493,7 +493,7 @@ 
 				if (empty($adht->caneditamount)) {	// If we didn't allow members to choose their membership amount (if the amount is allowed in edit mode, no need to check)
 					if ($object->status == $object::STATUS_DRAFT) {		// If the member is not yet validated, we check that the amount is the same as expected.
 						$typeid = $object->typeid;
-						$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
+						$amountbytype = $adht->amountByType(1); // Load the array of amount per type
 
 						// Set amount for the subscription:
 						// - First check the amount of the member type.
@@ -523,7 +523,7 @@ 
 				if (getDolGlobalInt('MEMBER_MIN_AMOUNT')) {
 					if ($FinalPaymentAmt < getDolGlobalInt('MEMBER_MIN_AMOUNT')) {
 						$error++;
-						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed (' . getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
+						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed ('.getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
 						dol_syslog("Failed to validate member (amount propagated from payment page is lower than allowed minimum): ".$errmsg, LOG_ERR, 0, '_payment');
@@ -539,7 +539,7 @@ 
 					dol_syslog("Failed to validate member (bad currency check): ".$errmsg, LOG_ERR, 0, '_payment');
 				}
 
-				if (! $error) {
+				if (!$error) {
 					// We validate the member (no effect if it is already validated)
 					$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 					if ($result < 0 || empty($object->datevalid)) {
@@ -706,7 +706,7 @@ 
 						$thirdparty = new Societe($db);
 						$thirdparty->fetch($thirdparty_id);
 
-						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';	// This also set $stripearrayofkeysbyenv
+						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv
 						$stripe = new Stripe($db);
 						//$stripeacc = $stripe->getStripeAccount($service);		Already defined previously
 
@@ -721,7 +721,7 @@ 
 
 								if (preg_match('/^pi_/', $TRANSACTIONID)) {
 									// This may throw an error if not found.
-									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID);	// payment_intent (pi_...)
+									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...)
 								} else {
 									// This throw an error if not found
 									$chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...)
@@ -780,7 +780,7 @@ 
 				// Create external user
 				if (getDolGlobalString('ADHERENT_CREATE_EXTERNAL_USER_LOGIN')) {
 					$nuser = new User($db);
-					$tmpuser = dol_clone($object, 0);		// $object is type Adherent
+					$tmpuser = dol_clone($object, 0); // $object is type Adherent
 
 					// Check if a user login already exists for this member or not
 					$found = 0;
@@ -945,7 +945,7 @@ 
 				$paiement->paiementid   = $paymentTypeId;
 				$paiement->num_payment = '';
 				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
-				$paiement->ext_payment_id = $TRANSACTIONID;		// TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
+				$paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
 				//$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer->id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key'];	// TODO LDR It would be better if we could store this. Do we have customer->id and publishable_key ?
 				$paiement->ext_payment_site = $service;
 
@@ -1017,7 +1017,7 @@ 
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
-		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$object = new Commande($db);
 		$result = $object->fetch((int) $tmptag['ORD']);
 		if ($result) {
@@ -1052,14 +1052,14 @@ 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (isModEnabled('invoice')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromOrder($object, $user);
 					if ($result > 0) {
 						$object->classifyBilled($user);
 						$invoice->validate($user);
 						// Creation of payment line
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 						$paiement = new Paiement($db);
 						$paiement->datepaye = $now;
 						if ($currencyCodeType == $conf->currency) {
@@ -1073,14 +1073,14 @@ 
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-						$paiement->ext_payment_id = $TRANSACTIONID;		// pi_... for Stripe, ...
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 						if (!$error) {
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
 							if ($paiement_id < 0) {
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
@@ -1117,7 +1117,7 @@ 
 								}
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 								if ($result < 0) {
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 									$ispostactionok = -1;
 									$error++;
 								} else {
@@ -1125,7 +1125,7 @@ 
 									$ispostactionok = 1;
 								}
 							} else {
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 								$ispostactionok = -1;
 								$error++;
 							}
@@ -1137,11 +1137,11 @@ 
 							$db->rollback();
 						}
 					} else {
-						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+						$postactionmessages[] = 'Failed to create invoice form order '.$tmptag['ORD'].'.';
 						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of order '.$tmptag['ORD'].'. May be payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -1149,7 +1149,7 @@ 
 				$ispostactionok = -1;
 			}
 		} else {
-			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
+			$postactionmessages[] = 'Order paid '.$tmptag['ORD'].' was not found';
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
@@ -1206,7 +1206,7 @@ 
 				$paiement->datep = $now;
 				$paiement->paymenttype = $paymentTypeId;
 				$paiement->num_payment = '';
-				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+				$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
 				$paiement->ext_payment_id = $TRANSACTIONID;
 				$paiement->ext_payment_site = $service;
 
@@ -1423,7 +1423,7 @@ 
 						$db->rollback();
 					}
 
-					if (! $error) {
+					if (!$error) {
 						// Sending mail
 						$thirdparty = new Societe($db);
 						$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
@@ -1441,7 +1441,7 @@ 
 							// Get email content from template
 							$arraydefaultmessage = null;
 
-							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT');	// Email to send for Event organization registration
+							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'); // Email to send for Event organization registration
 
 							if (!empty($idoftemplatetouse)) {
 								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1643,18 +1643,18 @@ 
 						} else {
 							$booth->status = ConferenceOrBooth::STATUS_SUGGESTED;
 							$resultboothupdate = $booth->update($user);
-							if ($resultboothupdate<0) {
+							if ($resultboothupdate < 0) {
 								// Finding the thirdparty by getting the invoice
 								$invoice = new Facture($db);
 								$resultinvoice = $invoice->fetch($ref);
-								if ($resultinvoice<0) {
+								if ($resultinvoice < 0) {
 									$postactionmessages[] = 'Could not find the associated invoice.';
 									$ispostactionok = -1;
 									$error++;
 								} else {
 									$thirdparty = new Societe($db);
 									$resultthirdparty = $thirdparty->fetch($invoice->socid);
-									if ($resultthirdparty<0) {
+									if ($resultthirdparty < 0) {
 										$error++;
 										setEventMessages(null, $thirdparty->errors, "errors");
 									} else {
@@ -1670,7 +1670,7 @@ 
 										// Get email content from template
 										$arraydefaultmessage = null;
 
-										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH');	// Email sent after registration for a Booth
+										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'); // Email sent after registration for a Booth
 
 										if (!empty($idoftemplatetouse)) {
 											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1726,7 +1726,7 @@ 
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
-		include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 		$object = new Contrat($db);
 		$result = $object->fetch((int) $tmptag['CON']);
 		if ($result) {
@@ -1764,14 +1764,14 @@ 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (isModEnabled('invoice')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
 					if ($result > 0) {
 						// $object->classifyBilled($user);
 						$invoice->validate($user);
 						// Creation of payment line
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 						$paiement = new Paiement($db);
 						$paiement->datepaye = $now;
 						if ($currencyCodeType == $conf->currency) {
@@ -1785,14 +1785,14 @@ 
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-						$paiement->ext_payment_id = $TRANSACTIONID;		// pi_... for Stripe, ...
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 						if (!$error) {
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
 							if ($paiement_id < 0) {
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
@@ -1829,7 +1829,7 @@ 
 								}
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 								if ($result < 0) {
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 									$ispostactionok = -1;
 									$error++;
 								} else {
@@ -1837,7 +1837,7 @@ 
 									$ispostactionok = 1;
 								}
 							} else {
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 								$ispostactionok = -1;
 								$error++;
 							}
@@ -1849,15 +1849,15 @@ 
 							$db->rollback();
 						}
 					} else {
-						$msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
+						$msg = 'Failed to create invoice form contract '.$tmptag['CON'];
 						if (!empty($cols)) {
-							$msg .= ' and col '. $cols .'.';
+							$msg .= ' and col '.$cols.'.';
 						}
 						$postactionmessages[] = $msg;
 						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of contract '.$tmptag['CON'].'. Maybe payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -1865,9 +1865,9 @@ 
 				$ispostactionok = -1;
 			}
 		} else {
-			$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
+			$msg = 'Contract paid '.$tmptag['CON'].' was not found';
 			if (!empty($cols)) {
-				$msg .= ' for col '.$tmptag['COL'] .'.';
+				$msg .= ' for col '.$tmptag['COL'].'.';
 			}
 			$postactionmessages[] = $msg;
 			$ispostactionok = -1;
@@ -1883,8 +1883,8 @@ 
 	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
 	// Set by newpayment.php
 	$currencyCodeType   = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType'];
-	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '': $_SESSION["FinalPaymentAmt"];
-	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType'];	// Seems used by paypal only
+	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"];
+	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only
 
 	if (is_object($object) && method_exists($object, 'call_trigger')) {
 		// Call trigger
@@ -2125,16 +2125,16 @@ 
 		// Redirect to a success page
 		// Paymentok page must be created for the specific website
 		if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
-			$ext_urlok = $ws_virtuelhost . '/paymentok.php?fulltag='.$FULLTAG;
+			$ext_urlok = $ws_virtuelhost.'/paymentok.php?fulltag='.$FULLTAG;
 		} else {
 			$ext_urlok = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentok&fulltag='.$FULLTAG;
 		}
-		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok) ."';</script>";
+		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok)."';</script>";
 	} else {
 		// Redirect to an error page
 		// Paymentko page must be created for the specific website
 		if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
-			$ext_urlko = $ws_virtuelhost . '/paymentko.php?fulltag='.$FULLTAG;
+			$ext_urlko = $ws_virtuelhost.'/paymentko.php?fulltag='.$FULLTAG;
 		} else {
 			$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
 		}