Inspection of "Daily Inspection: Merge branch 'develop' of git@gi..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (3700b0)

unknown

created 2023-10-04 16:56 UTC

Status

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 }
 
 if (!is_object($formadmin)) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 	$formadmin = new FormAdmin($db);
 }
 
@@ -69,19 +69,19 @@  discard block
 block discarded – undo
 				'mode_key' => $info[0],
 				'field_key' => $info[1],
 				'value' => $info[2],
-				'target' => 'block_' . $mode_key,
+				'target' => 'block_'.$mode_key,
 			);
 		}
 
 		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
-		$prefix_html_name = $mode_key . '_';
+		$prefix_html_name = $mode_key.'_';
 
-		print '<div id="block_' . $mode_key . '">';
+		print '<div id="block_'.$mode_key.'">';
 		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+		print '<table class="border centpercent tableforfield">'."\n";
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
 			// Discard if extrafield is a hidden field on form
@@ -102,14 +102,14 @@  discard block
 block discarded – undo
 				print '<table class="border centpercent tableforfield">';
 			}
 
-			$html_name = $prefix_html_name . $field_key;
+			$html_name = $prefix_html_name.$field_key;
 			if (!empty($field_info['enabled_field'])) {
 				$info = explode(':', $field_info['enabled_field']);
 				$enabled_field_info[] = array(
 					'mode_key' => $info[0],
 					'field_key' => $info[1],
 					'value' => $info[2],
-					'target' => 'field_' . $html_name,
+					'target' => 'field_'.$html_name,
 				);
 			}
 
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
 				$more_class .= ' tdtop';
 			}
 
-			print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td';
-			print ' class="titlefieldcreate' . $more_class . '">';
+			print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td';
+			print ' class="titlefieldcreate'.$more_class.'">';
 			if (!empty($field_info['help'])) {
 				print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
 			} else {

Please login to merge, or discard this patch.

htdocs/asset/tpl/depreciation_view.tpl.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+		print '<table class="border centpercent tableforfield">'."\n";
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
 			if (!empty($field_info['enabled_field'])) {
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
 				print '<table class="border centpercent tableforfield">';
 			}
 
-			$key = $mode_key . '_' . $field_key;
+			$key = $mode_key.'_'.$field_key;
 			$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
 
-			print '<tr class="field_' . $key . '"><td';
-			print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
+			print '<tr class="field_'.$key.'"><td';
+			print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key;
 			if ($field_info['type'] == 'text' || $field_info['type'] == 'html') {
 				print ' tdtop';
 			}
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
 				}
 			}
 			print '</td>';
-			print '<td class="valuefield fieldname_' . $key;
+			print '<td class="valuefield fieldname_'.$key;
 			if ($field_info['type'] == 'text') {
 				print ' wordbreak';
 			}
 			if (!empty($field_info['cssview'])) {
-				print ' ' . $field_info['cssview'];
+				print ' '.$field_info['cssview'];
 			}
 			print '">';
 			if (in_array($field_info['type'], array('text', 'html'))) {
@@ -126,15 +126,15 @@  discard block
 block discarded – undo
 			}
 			if ($field_key == 'lang') {
 				$langs->load("languages");
-				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				$labellang = ($value ? $langs->trans('Language_'.$value) : '');
 				print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
 				print $labellang;
 			} else {
 				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
-					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 					print showValueWithClipboardCPButton($out, 0, $out);
 				} else {
-					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 				}
 			}
 			if (in_array($field_info['type'], array('text', 'html'))) {

Please login to merge, or discard this patch.

htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -133,7 +133,7 @@
 block discarded – undo
 		$this->db = $db;
 		$this->name = "standard";
 		$this->description = $langs->trans('DocumentModelStandardPDF');
-		$this->update_main_doc_field = 0;	// Save the name of generated file as the main doc when generating a doc with this template
+		$this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';

Please login to merge, or discard this patch.

htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -217,8 +217,8 @@  discard block
 block discarded – undo
 					if ($contactid > 0) {
 						$contact = new Contact($this->db);
 						$res = $contact->fetch($contactid);
-						if (! in_array($contact, $linked_contacts)) {
-							$error_msg = $langs->trans('Error'). ': ';
+						if (!in_array($contact, $linked_contacts)) {
+							$error_msg = $langs->trans('Error').': ';
 							$error_msg .= $langs->transnoentities('TicketWrongContact');
 							setEventMessages($error_msg, [], 'errors');
 							$ok = 0;
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
 					$sendto = '';
 					if ($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
 						$sendto = $contact->email;
-					} elseif ( !empty($linked_contacts) && ($contactid == -2 || (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
+					} elseif (!empty($linked_contacts) && ($contactid == -2 || (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
 						// if sending to all contacts or sending to contacts while mass closing
 						$temp_emails = [];
 						foreach ($linked_contacts as $contact) {
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
 				}
 
 				if ($qualified) {
-					$message_customer .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+					$message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 				}
 			}
 		}

Please login to merge, or discard this patch.

htdocs/core/lib/asset.lib.php 1 patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -80,32 +80,32 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if (empty($object->not_depreciated)) {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/depreciation_options.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDepreciationOptions");
 		$head[$h][2] = 'depreciation_options';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/accountancy_codes.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
 	$head[$h][2] = 'accountancy_codes';
 	$h++;
 
 	if (empty($object->not_depreciated)) {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/depreciation.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDepreciation");
 		$head[$h][2] = 'depreciation';
 		$h++;
 	}
 
 	if (isset($object->disposal_date) && $object->disposal_date !== "") {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/disposal.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDisposal");
 		$head[$h][2] = 'disposal';
 		$h++;
@@ -119,29 +119,29 @@  discard block
 block discarded – undo
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-	$upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->asset->dir_output."/asset/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
@@ -176,17 +176,17 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/depreciation_options.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/depreciation_options.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetDepreciationOptions");
 	$head[$h][2] = 'depreciation_options';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/accountancy_codes.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/accountancy_codes.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
 	$head[$h][2] = 'accountancy_codes';
 	$h++;
@@ -199,16 +199,16 @@  discard block
 block discarded – undo
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/model/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;

Please login to merge, or discard this patch.

htdocs/api/index.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
-call_user_func(function () {
+call_user_func(function() {
 	$loader = Luracast\Restler\AutoLoader::instance();
 	spl_autoload_register($loader);
 	return $loader;
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
 // If MAIN_API_DEBUG is set to 1, we save logs into file "dolibarr_api.log"
 if (!empty($conf->global->MAIN_API_DEBUG)) {
 	$r = $api->r;
-	$r->onCall(function () use ($r) {
+	$r->onCall(function() use ($r) {
 		// Don't log Luracast Restler Explorer recources calls
 		//if (!preg_match('/^explorer/', $r->url)) {
 		//	'method'  => $api->r->requestMethod,
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if (! $endpointisallowed) {
+		if (!$endpointisallowed) {
 			dol_syslog('The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES', LOG_WARNING);
 			print 'The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES';
 			header('HTTP/1.1 501 API is forbidden by API_ENDPOINT_RULES');

Please login to merge, or discard this patch.

htdocs/asset/tpl/depreciation_options_view.tpl.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+		print '<table class="border centpercent tableforfield">'."\n";
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
 			if (!empty($field_info['enabled_field'])) {
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
 				print '<table class="border centpercent tableforfield">';
 			}
 
-			$key = $mode_key . '_' . $field_key;
+			$key = $mode_key.'_'.$field_key;
 			$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
 
-			print '<tr class="field_' . $key . '"><td';
-			print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
+			print '<tr class="field_'.$key.'"><td';
+			print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key;
 			if ($field_info['type'] == 'text' || $field_info['type'] == 'html') {
 				print ' tdtop';
 			}
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
 				}
 			}
 			print '</td>';
-			print '<td class="valuefield fieldname_' . $key;
+			print '<td class="valuefield fieldname_'.$key;
 			if ($field_info['type'] == 'text') {
 				print ' wordbreak';
 			}
 			if (!empty($field_info['cssview'])) {
-				print ' ' . $field_info['cssview'];
+				print ' '.$field_info['cssview'];
 			}
 			print '">';
 			if (in_array($field_info['type'], array('text', 'html'))) {
@@ -126,15 +126,15 @@  discard block
 block discarded – undo
 			}
 			if ($field_key == 'lang') {
 				$langs->load("languages");
-				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				$labellang = ($value ? $langs->trans('Language_'.$value) : '');
 				print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
 				print $labellang;
 			} else {
 				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
-					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 					print showValueWithClipboardCPButton($out, 0, $out);
 				} else {
-					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 				}
 			}
 			if (in_array($field_info['type'], array('text', 'html'))) {

Please login to merge, or discard this patch.

htdocs/accountancy/class/accountancyimport.class.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 				$amount = $credit;
 			}
 
-			return "'" . $this->db->escape(abs($amount)) . "'";
+			return "'".$this->db->escape(abs($amount))."'";
 		}
 
 		return "''";
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
 				$sens = 'C';
 			}
 
-			return "'" . $this->db->escape($sens) . "'";
+			return "'".$this->db->escape($sens)."'";
 		}
 
 		return "''";

Please login to merge, or discard this patch.

htdocs/admin/propal.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
 		setEventMessages($langs->trans('Error'), null, 'errors');
 	} else {
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-		header("Location: " . $_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit();
 	}
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
 		setEventMessages($langs->trans('Error'), null, 'errors');
 	} else {
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-		header("Location: " . $_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit();
 	}
 }

Please login to merge, or discard this patch.

		@@ -217,8 +217,8 @@ discard block
		block discarded – undo
217	217	if ($contactid > 0) {
218	218	$contact = new Contact($this->db);
219	219	$res = $contact->fetch($contactid);
220		- if (! in_array($contact, $linked_contacts)) {
221		- $error_msg = $langs->trans('Error'). ': ';
	220	+ if (!in_array($contact, $linked_contacts)) {
	221	+ $error_msg = $langs->trans('Error').': ';
222	222	$error_msg .= $langs->transnoentities('TicketWrongContact');
223	223	setEventMessages($error_msg, [], 'errors');
224	224	$ok = 0;
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	$sendto = '';
230	230	if ($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
231	231	$sendto = $contact->email;
232		- } elseif ( !empty($linked_contacts) && ($contactid == -2 \|\| (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
	232	+ } elseif (!empty($linked_contacts) && ($contactid == -2 \|\| (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
233	233	// if sending to all contacts or sending to contacts while mass closing
234	234	$temp_emails = [];
235	235	foreach ($linked_contacts as $contact) {
		@@ -367,7 +367,7 @@ discard block
		block discarded – undo
367	367	}
368	368
369	369	if ($qualified) {
370		- $message_customer .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
	370	+ $message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
371	371	}
372	372	}
373	373	}

		@@ -80,32 +80,32 @@ discard block
		block discarded – undo
80	80	$h = 0;
81	81	$head = array();
82	82
83		- $head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id;
	83	+ $head[$h][0] = DOL_URL_ROOT.'/asset/card.php?id='.$object->id;
84	84	$head[$h][1] = $langs->trans("Card");
85	85	$head[$h][2] = 'card';
86	86	$h++;
87	87
88	88	if (empty($object->not_depreciated)) {
89		- $head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id;
	89	+ $head[$h][0] = DOL_URL_ROOT.'/asset/depreciation_options.php?id='.$object->id;
90	90	$head[$h][1] = $langs->trans("AssetDepreciationOptions");
91	91	$head[$h][2] = 'depreciation_options';
92	92	$h++;
93	93	}
94	94
95		- $head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id;
	95	+ $head[$h][0] = DOL_URL_ROOT.'/asset/accountancy_codes.php?id='.$object->id;
96	96	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
97	97	$head[$h][2] = 'accountancy_codes';
98	98	$h++;
99	99
100	100	if (empty($object->not_depreciated)) {
101		- $head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id;
	101	+ $head[$h][0] = DOL_URL_ROOT.'/asset/depreciation.php?id='.$object->id;
102	102	$head[$h][1] = $langs->trans("AssetDepreciation");
103	103	$head[$h][2] = 'depreciation';
104	104	$h++;
105	105	}
106	106
107	107	if (isset($object->disposal_date) && $object->disposal_date !== "") {
108		- $head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id;
	108	+ $head[$h][0] = DOL_URL_ROOT.'/asset/disposal.php?id='.$object->id;
109	109	$head[$h][1] = $langs->trans("AssetDisposal");
110	110	$head[$h][2] = 'disposal';
111	111	$h++;
		@@ -119,29 +119,29 @@ discard block
		block discarded – undo
119	119	if (!empty($object->note_public)) {
120	120	$nbNote++;
121	121	}
122		- $head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id;
	122	+ $head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
123	123	$head[$h][1] = $langs->trans('Notes');
124	124	if ($nbNote > 0) {
125		- $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
	125	+ $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
126	126	}
127	127	$head[$h][2] = 'note';
128	128	$h++;
129	129	}
130	130
131		- require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
132		- require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
133		- $upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref);
	131	+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
	132	+ require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
	133	+ $upload_dir = $conf->asset->dir_output."/asset/".dol_sanitizeFileName($object->ref);
134	134	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta\|_preview.*\.png)$'));
135	135	$nbLinks = Link::count($db, $object->element, $object->id);
136		- $head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id;
	136	+ $head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
137	137	$head[$h][1] = $langs->trans('Documents');
138	138	if (($nbFiles + $nbLinks) > 0) {
139		- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
	139	+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
140	140	}
141	141	$head[$h][2] = 'document';
142	142	$h++;
143	143
144		- $head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id;
	144	+ $head[$h][0] = DOL_URL_ROOT.'/asset/agenda.php?id='.$object->id;
145	145	$head[$h][1] = $langs->trans("Events");
146	146	$head[$h][2] = 'agenda';
147	147	$h++;
		@@ -176,17 +176,17 @@ discard block
		block discarded – undo
176	176	$h = 0;
177	177	$head = array();
178	178
179		- $head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id;
	179	+ $head[$h][0] = DOL_URL_ROOT.'/asset/model/card.php?id='.$object->id;
180	180	$head[$h][1] = $langs->trans("Card");
181	181	$head[$h][2] = 'card';
182	182	$h++;
183	183
184		- $head[$h][0] = DOL_URL_ROOT . '/asset/model/depreciation_options.php?id=' . $object->id;
	184	+ $head[$h][0] = DOL_URL_ROOT.'/asset/model/depreciation_options.php?id='.$object->id;
185	185	$head[$h][1] = $langs->trans("AssetDepreciationOptions");
186	186	$head[$h][2] = 'depreciation_options';
187	187	$h++;
188	188
189		- $head[$h][0] = DOL_URL_ROOT . '/asset/model/accountancy_codes.php?id=' . $object->id;
	189	+ $head[$h][0] = DOL_URL_ROOT.'/asset/model/accountancy_codes.php?id='.$object->id;
190	190	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
191	191	$head[$h][2] = 'accountancy_codes';
192	192	$h++;
		@@ -199,16 +199,16 @@ discard block
		block discarded – undo
199	199	if (!empty($object->note_public)) {
200	200	$nbNote++;
201	201	}
202		- $head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id;
	202	+ $head[$h][0] = DOL_URL_ROOT.'/asset/model/note.php?id='.$object->id;
203	203	$head[$h][1] = $langs->trans('Notes');
204	204	if ($nbNote > 0) {
205		- $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
	205	+ $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
206	206	}
207	207	$head[$h][2] = 'note';
208	208	$h++;
209	209	}
210	210
211		- $head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id;
	211	+ $head[$h][0] = DOL_URL_ROOT.'/asset/model/agenda.php?id='.$object->id;
212	212	$head[$h][1] = $langs->trans("Events");
213	213	$head[$h][2] = 'agenda';
214	214	$h++;

		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87
88	88	require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
89	89
90		-call_user_func(function () {
	90	+call_user_func(function() {
91	91	$loader = Luracast\Restler\AutoLoader::instance();
92	92	spl_autoload_register($loader);
93	93	return $loader;
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	// If MAIN_API_DEBUG is set to 1, we save logs into file "dolibarr_api.log"
162	162	if (!empty($conf->global->MAIN_API_DEBUG)) {
163	163	$r = $api->r;
164		- $r->onCall(function () use ($r) {
	164	+ $r->onCall(function() use ($r) {
165	165	// Don't log Luracast Restler Explorer recources calls
166	166	//if (!preg_match('/^explorer/', $r->url)) {
167	167	// 'method' => $api->r->requestMethod,
		@@ -344,7 +344,7 @@ discard block
		block discarded – undo
344	344	}
345	345	}
346	346
347		- if (! $endpointisallowed) {
	347	+ if (!$endpointisallowed) {
348	348	dol_syslog('The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES', LOG_WARNING);
349	349	print 'The API with endpoint /'.$classfile.' is forbidden by config API_ENDPOINT_RULES';
350	350	header('HTTP/1.1 501 API is forbidden by API_ENDPOINT_RULES');

		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106	$amount = $credit;
107	107	}
108	108
109		- return "'" . $this->db->escape(abs($amount)) . "'";
	109	+ return "'".$this->db->escape(abs($amount))."'";
110	110	}
111	111
112	112	return "''";
		@@ -134,7 +134,7 @@ discard block
		block discarded – undo
134	134	$sens = 'C';
135	135	}
136	136
137		- return "'" . $this->db->escape($sens) . "'";
	137	+ return "'".$this->db->escape($sens)."'";
138	138	}
139	139
140	140	return "''";

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	}
36	36
37	37	if (!is_object($formadmin)) {
38		- require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
	38	+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
39	39	$formadmin = new FormAdmin($db);
40	40	}
41	41
		@@ -69,19 +69,19 @@ discard block
		block discarded – undo
69	69	'mode_key' => $info[0],
70	70	'field_key' => $info[1],
71	71	'value' => $info[2],
72		- 'target' => 'block_' . $mode_key,
	72	+ 'target' => 'block_'.$mode_key,
73	73	);
74	74	}
75	75
76	76	$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
77		- $prefix_html_name = $mode_key . '_';
	77	+ $prefix_html_name = $mode_key.'_';
78	78
79		- print '<div id="block_' . $mode_key . '">';
	79	+ print '<div id="block_'.$mode_key.'">';
80	80	print load_fiche_titre($langs->trans($mode_info['label']), '', '');
81	81	print '<div class="fichecenter">';
82	82	print '<div class="fichehalfleft">';
83	83	print '<div class="underbanner clearboth"></div>';
84		- print '<table class="border centpercent tableforfield">' . "\n";
	84	+ print '<table class="border centpercent tableforfield">'."\n";
85	85	$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
86	86	foreach ($mode_info['fields'] as $field_key => $field_info) {
87	87	// Discard if extrafield is a hidden field on form
		@@ -102,14 +102,14 @@ discard block
		block discarded – undo
102	102	print '<table class="border centpercent tableforfield">';
103	103	}
104	104
105		- $html_name = $prefix_html_name . $field_key;
	105	+ $html_name = $prefix_html_name.$field_key;
106	106	if (!empty($field_info['enabled_field'])) {
107	107	$info = explode(':', $field_info['enabled_field']);
108	108	$enabled_field_info[] = array(
109	109	'mode_key' => $info[0],
110	110	'field_key' => $info[1],
111	111	'value' => $info[2],
112		- 'target' => 'field_' . $html_name,
	112	+ 'target' => 'field_'.$html_name,
113	113	);
114	114	}
115	115
		@@ -121,8 +121,8 @@ discard block
		block discarded – undo
121	121	$more_class .= ' tdtop';
122	122	}
123	123
124		- print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td';
125		- print ' class="titlefieldcreate' . $more_class . '">';
	124	+ print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td';
	125	+ print ' class="titlefieldcreate'.$more_class.'">';
126	126	if (!empty($field_info['help'])) {
127	127	print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
128	128	} else {

		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	print '<div class="fichecenter">';
68	68	print '<div class="fichehalfleft">';
69	69	print '<div class="underbanner clearboth"></div>';
70		- print '<table class="border centpercent tableforfield">' . "\n";
	70	+ print '<table class="border centpercent tableforfield">'."\n";
71	71	$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
72	72	foreach ($mode_info['fields'] as $field_key => $field_info) {
73	73	if (!empty($field_info['enabled_field'])) {
		@@ -94,11 +94,11 @@ discard block
		block discarded – undo
94	94	print '<table class="border centpercent tableforfield">';
95	95	}
96	96
97		- $key = $mode_key . '_' . $field_key;
	97	+ $key = $mode_key.'_'.$field_key;
98	98	$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
99	99
100		- print '<tr class="field_' . $key . '"><td';
101		- print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
	100	+ print '<tr class="field_'.$key.'"><td';
	101	+ print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key;
102	102	if ($field_info['type'] == 'text' \|\| $field_info['type'] == 'html') {
103	103	print ' tdtop';
104	104	}
		@@ -113,12 +113,12 @@ discard block
		block discarded – undo
113	113	}
114	114	}
115	115	print '</td>';
116		- print '<td class="valuefield fieldname_' . $key;
	116	+ print '<td class="valuefield fieldname_'.$key;
117	117	if ($field_info['type'] == 'text') {
118	118	print ' wordbreak';
119	119	}
120	120	if (!empty($field_info['cssview'])) {
121		- print ' ' . $field_info['cssview'];
	121	+ print ' '.$field_info['cssview'];
122	122	}
123	123	print '">';
124	124	if (in_array($field_info['type'], array('text', 'html'))) {
		@@ -126,15 +126,15 @@ discard block
		block discarded – undo
126	126	}
127	127	if ($field_key == 'lang') {
128	128	$langs->load("languages");
129		- $labellang = ($value ? $langs->trans('Language_' . $value) : '');
	129	+ $labellang = ($value ? $langs->trans('Language_'.$value) : '');
130	130	print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
131	131	print $labellang;
132	132	} else {
133	133	if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
134		- $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
	134	+ $out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
135	135	print showValueWithClipboardCPButton($out, 0, $out);
136	136	} else {
137		- print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
	137	+ print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
138	138	}
139	139	}
140	140	if (in_array($field_info['type'], array('text', 'html'))) {

		@@ -133,7 +133,7 @@
		block discarded – undo
133	133	$this->db = $db;
134	134	$this->name = "standard";
135	135	$this->description = $langs->trans('DocumentModelStandardPDF');
136		- $this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template
	136	+ $this->update_main_doc_field = 0; // Save the name of generated file as the main doc when generating a doc with this template
137	137
138	138	// Page size for A4 format
139	139	$this->type = 'pdf';

		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43
44	44	$action = GETPOST('action', 'aZ09');
45	45	$value = GETPOST('value', 'alpha');
46		-$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
	46	+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
47	47
48	48	$label = GETPOST('label', 'alpha');
49	49	$scandir = GETPOST('scan_dir', 'alpha');
		@@ -211,7 +211,7 @@ discard block
		block discarded – undo
211	211	setEventMessages($langs->trans('Error'), null, 'errors');
212	212	} else {
213	213	setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
214		- header("Location: " . $_SERVER["PHP_SELF"]);
	214	+ header("Location: ".$_SERVER["PHP_SELF"]);
215	215	exit();
216	216	}
217	217	} elseif (preg_match('/del_(.*)/', $action, $reg)) {
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	setEventMessages($langs->trans('Error'), null, 'errors');
227	227	} else {
228	228	setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
229		- header("Location: " . $_SERVER["PHP_SELF"]);
	229	+ header("Location: ".$_SERVER["PHP_SELF"]);
230	230	exit();
231	231	}
232	232	}

Dolibarr / dolibarr

Branch — develop (3700b0)

Status

Category

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch