Inspection of "Daily Inspection: Use a better name for thirdparti..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (6df4a5)

unknown

created 2024-03-08 16:45 UTC

Status

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

@@ -216,7 +216,7 @@  discard block
 block discarded – undo
 		$maxfilesizearray = getMaxFileSizeArray();
 		$maxmin = $maxfilesizearray['maxmin'];
 		if ($maxmin > 0) {
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref . '_' . $newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -320,11 +320,11 @@  discard block
 block discarded – undo
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
-					$filename = $newfiletmp . '.' . $newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file = $dir . '/' . $filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
 				dol_mkdir($conf->propal->multidir_temp[$object->entity]);
 				if (!is_writable($conf->propal->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->propal->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

Please login to merge, or discard this patch.

htdocs/core/tpl/objectline_create.tpl.php 1 patch

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

@@ -596,18 +596,18 @@
 block discarded – undo
 
 	if (!$date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
-			print 'jQuery("#date_starthour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
+			print 'jQuery("#date_starthour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
 		}
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
-			print 'jQuery("#date_startmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
+			print 'jQuery("#date_startmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
 		}
 	}
 	if (!$date_end) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
-			print 'jQuery("#date_endhour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
+			print 'jQuery("#date_endhour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
 		}
 		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
-			print 'jQuery("#date_endmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
+			print 'jQuery("#date_endmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
 		}
 	}
 	print '</script>';

Please login to merge, or discard this patch.

htdocs/zapier/lib/zapier.lib.php 1 patch

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

@@ -33,11 +33,11 @@
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/zapier/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/zapier/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
-	$head[$h][0] = DOL_URL_ROOT . '/zapier/admin/about.php';
+	$head[$h][0] = DOL_URL_ROOT.'/zapier/admin/about.php';
 	$head[$h][1] = $langs->trans("About");
 	$head[$h][2] = 'about';
 	$h++;

Please login to merge, or discard this patch.

htdocs/bookcal/lib/bookcal.lib.php 1 patch

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

@@ -36,7 +36,7 @@
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/bookcal/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/bookcal/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;

Please login to merge, or discard this patch.

htdocs/bookcal/lib/bookcal_calendar.lib.php 1 patch

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

@@ -42,13 +42,13 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/bookcal/calendar_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Calendar");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if ($object->status == Calendar::STATUS_VALIDATED) {
-		$head[$h][0] = DOL_URL_ROOT . '/bookcal/booking_list.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/booking_list.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Bookings");
 		$head[$h][2] = 'booking';
 		$h++;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 
 
 	if ($showtabofpagecontact) {
-		$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_contact.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/calendar_contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Contacts");
 		$head[$h][2] = 'contact';
 		$h++;
@@ -71,10 +71,10 @@  discard block
 block discarded – undo
 			if (!empty($object->note_public)) {
 				$nbNote++;
 			}
-			$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_note.php?id=' . $object->id;
+			$head[$h][0] = DOL_URL_ROOT.'/bookcal/calendar_note.php?id='.$object->id;
 			$head[$h][1] = $langs->trans('Notes');
 			if ($nbNote > 0) {
-				$head[$h][1] .= (!getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+				$head[$h][1] .= (!getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 			}
 			$head[$h][2] = 'note';
 			$h++;
@@ -82,22 +82,22 @@  discard block
 block discarded – undo
 	}
 
 	if ($showtabofpagedocument) {
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-		$upload_dir = $conf->bookcal->dir_output . "/calendar/" . 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->bookcal->dir_output."/calendar/".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 . '/bookcal/calendar_document.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/calendar_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++;
 	}
 
 	if ($showtabofpageagenda) {
-		$head[$h][0] = DOL_URL_ROOT . '/bookcal/calendar_agenda.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/calendar_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/bookcal/lib/bookcal_availabilities.lib.php 1 patch

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

@@ -42,13 +42,13 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if ($showtabofpagecontact) {
-		$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_contact.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Contacts");
 		$head[$h][2] = 'contact';
 		$h++;
@@ -63,10 +63,10 @@  discard block
 block discarded – undo
 			if (!empty($object->note_public)) {
 				$nbNote++;
 			}
-			$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_note.php?id=' . $object->id;
+			$head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_note.php?id='.$object->id;
 			$head[$h][1] = $langs->trans('Notes');
 			if ($nbNote > 0) {
-				$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+				$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 			}
 			$head[$h][2] = 'note';
 			$h++;
@@ -74,22 +74,22 @@  discard block
 block discarded – undo
 	}
 
 	if ($showtabofpagedocument) {
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-		$upload_dir = $conf->bookcal->dir_output . "/availabilities/" . 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->bookcal->dir_output."/availabilities/".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 . '/bookcal/availabilities_document.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_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++;
 	}
 
 	if ($showtabofpageagenda) {
-		$head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_agenda.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_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/emailcollector/lib/emailcollector.lib.php 1 patch

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

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/admin/emailcollector_card.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/emailcollector_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("EmailCollector");
 	$head[$h][2] = 'card';
 	$h++;
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
 	}
 
 	$i = 1;
-	$filepath = $path . $filename . '.' . $ext;
+	$filepath = $path.$filename.'.'.$ext;
 
 	while (file_exists($filepath)) {
-		$filepath = $path . $filename . '(' . $i . ').' . $ext;
+		$filepath = $path.$filename.'('.$i.').'.$ext;
 		$i++;
 	}
 	file_put_contents($filepath, $data);

Please login to merge, or discard this patch.

htdocs/partnership/lib/partnership.lib.php 1 patch

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

@@ -39,22 +39,22 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/partnership/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/partnership/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
 
 
-	$head[$h][0] = DOL_URL_ROOT . '/partnership/admin/partnership_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/partnership/admin/partnership_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$nbExtrafields = $extrafields->attributes['partnership']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'partnership_extrafields';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/partnership/admin/website.php';
+	$head[$h][0] = DOL_URL_ROOT.'/partnership/admin/website.php';
 	$head[$h][1] = $langs->trans("BlankSubscriptionForm");
 	$head[$h][2] = 'website';
 	$h++;
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -102,29 +102,29 @@  discard block
 block discarded – undo
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('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->partnership->dir_output . "/partnership/" . 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->partnership->dir_output."/partnership/".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 . '/partnership/partnership_document.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_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 . '/partnership/partnership_agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_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/recruitment/lib/recruitment.lib.php 1 patch

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

@@ -40,35 +40,35 @@
 block discarded – undo
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/setup.php';
 	$head[$h][1] = $langs->trans("JobPositions");
 	$head[$h][2] = 'settings';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/setup_candidatures.php';
+	$head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/setup_candidatures.php';
 	$head[$h][1] = $langs->trans("RecruitmentCandidatures");
 	$head[$h][2] = 'settings_candidatures';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/public_interface.php';
+	$head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/public_interface.php';
 	$head[$h][1] = $langs->trans("PublicUrl");
 	$head[$h][2] = 'publicurl';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/jobposition_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/jobposition_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtrafieldsJobPosition");
 	$nbExtrafields = $extrafields->attributes['recruitment_recruitmentjobposition']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'jobposition_extrafields';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/candidature_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/candidature_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtrafieldsApplication");
 	$nbExtrafields = $extrafields->attributes['recruitment_recruitmentcandidature']['count'];
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'candidature_extrafields';
 	$h++;

Please login to merge, or discard this patch.

		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216	$maxfilesizearray = getMaxFileSizeArray();
217	217	$maxmin = $maxfilesizearray['maxmin'];
218	218	if ($maxmin > 0) {
219		- $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
	219	+ $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
220	220	}
221	221	$texte .= ' <input type="file" name="uploadfile">';
222	222	$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
312	312	$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
313	313
314		- $newfiletmp = $objectref . '_' . $newfiletmp;
	314	+ $newfiletmp = $objectref.'_'.$newfiletmp;
315	315
316	316	// Get extension (ods or odt)
317	317	$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
		@@ -320,11 +320,11 @@ discard block
		block discarded – undo
320	320	if ($format == '1') {
321	321	$format = '%Y%m%d%H%M%S';
322	322	}
323		- $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
	323	+ $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
324	324	} else {
325		- $filename = $newfiletmp . '.' . $newfileformat;
	325	+ $filename = $newfiletmp.'.'.$newfileformat;
326	326	}
327		- $file = $dir . '/' . $filename;
	327	+ $file = $dir.'/'.$filename;
328	328	//print "newdir=".$dir;
329	329	//print "newfile=".$newfile;
330	330	//print "file=".$file;
		@@ -333,7 +333,7 @@ discard block
		block discarded – undo
333	333	dol_mkdir($conf->propal->multidir_temp[$object->entity]);
334	334	if (!is_writable($conf->propal->dir_temp)) {
335	335	$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->propal->dir_temp);
336		- dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
	336	+ dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
337	337	return -1;
338	338	}
339	339

		@@ -596,18 +596,18 @@
		block discarded – undo
596	596
597	597	if (!$date_start) {
598	598	if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
599		- print 'jQuery("#date_starthour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
	599	+ print 'jQuery("#date_starthour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
600	600	}
601	601	if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
602		- print 'jQuery("#date_startmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
	602	+ print 'jQuery("#date_startmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
603	603	}
604	604	}
605	605	if (!$date_end) {
606	606	if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
607		- print 'jQuery("#date_endhour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
	607	+ print 'jQuery("#date_endhour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
608	608	}
609	609	if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
610		- print 'jQuery("#date_endmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
	610	+ print 'jQuery("#date_endmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
611	611	}
612	612	}
613	613	print '</script>';

		@@ -42,13 +42,13 @@ discard block
		block discarded – undo
42	42	$h = 0;
43	43	$head = array();
44	44
45		- $head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_card.php?id=' . $object->id;
	45	+ $head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_card.php?id='.$object->id;
46	46	$head[$h][1] = $langs->trans("Card");
47	47	$head[$h][2] = 'card';
48	48	$h++;
49	49
50	50	if ($showtabofpagecontact) {
51		- $head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_contact.php?id=' . $object->id;
	51	+ $head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_contact.php?id='.$object->id;
52	52	$head[$h][1] = $langs->trans("Contacts");
53	53	$head[$h][2] = 'contact';
54	54	$h++;
		@@ -63,10 +63,10 @@ discard block
		block discarded – undo
63	63	if (!empty($object->note_public)) {
64	64	$nbNote++;
65	65	}
66		- $head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_note.php?id=' . $object->id;
	66	+ $head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_note.php?id='.$object->id;
67	67	$head[$h][1] = $langs->trans('Notes');
68	68	if ($nbNote > 0) {
69		- $head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
	69	+ $head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
70	70	}
71	71	$head[$h][2] = 'note';
72	72	$h++;
		@@ -74,22 +74,22 @@ discard block
		block discarded – undo
74	74	}
75	75
76	76	if ($showtabofpagedocument) {
77		- require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
78		- require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
79		- $upload_dir = $conf->bookcal->dir_output . "/availabilities/" . dol_sanitizeFileName($object->ref);
	77	+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
	78	+ require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
	79	+ $upload_dir = $conf->bookcal->dir_output."/availabilities/".dol_sanitizeFileName($object->ref);
80	80	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta\|_preview.*\.png)$'));
81	81	$nbLinks = Link::count($db, $object->element, $object->id);
82		- $head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_document.php?id=' . $object->id;
	82	+ $head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_document.php?id='.$object->id;
83	83	$head[$h][1] = $langs->trans('Documents');
84	84	if (($nbFiles + $nbLinks) > 0) {
85		- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
	85	+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
86	86	}
87	87	$head[$h][2] = 'document';
88	88	$h++;
89	89	}
90	90
91	91	if ($showtabofpageagenda) {
92		- $head[$h][0] = DOL_URL_ROOT . '/bookcal/availabilities_agenda.php?id=' . $object->id;
	92	+ $head[$h][0] = DOL_URL_ROOT.'/bookcal/availabilities_agenda.php?id='.$object->id;
93	93	$head[$h][1] = $langs->trans("Events");
94	94	$head[$h][2] = 'agenda';
95	95	$h++;

		@@ -39,22 +39,22 @@ discard block
		block discarded – undo
39	39	$h = 0;
40	40	$head = array();
41	41
42		- $head[$h][0] = DOL_URL_ROOT . '/partnership/admin/setup.php';
	42	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/admin/setup.php';
43	43	$head[$h][1] = $langs->trans("Settings");
44	44	$head[$h][2] = 'settings';
45	45	$h++;
46	46
47	47
48		- $head[$h][0] = DOL_URL_ROOT . '/partnership/admin/partnership_extrafields.php';
	48	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/admin/partnership_extrafields.php';
49	49	$head[$h][1] = $langs->trans("ExtraFields");
50	50	$nbExtrafields = $extrafields->attributes['partnership']['count'];
51	51	if ($nbExtrafields > 0) {
52		- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
	52	+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
53	53	}
54	54	$head[$h][2] = 'partnership_extrafields';
55	55	$h++;
56	56
57		- $head[$h][0] = DOL_URL_ROOT . '/partnership/admin/website.php';
	57	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/admin/website.php';
58	58	$head[$h][1] = $langs->trans("BlankSubscriptionForm");
59	59	$head[$h][2] = 'website';
60	60	$h++;
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	$h = 0;
90	90	$head = array();
91	91
92		- $head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_card.php?id=' . $object->id;
	92	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_card.php?id='.$object->id;
93	93	$head[$h][1] = $langs->trans("Card");
94	94	$head[$h][2] = 'card';
95	95	$h++;
		@@ -102,29 +102,29 @@ discard block
		block discarded – undo
102	102	if (!empty($object->note_public)) {
103	103	$nbNote++;
104	104	}
105		- $head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_note.php?id=' . $object->id;
	105	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_note.php?id='.$object->id;
106	106	$head[$h][1] = $langs->trans('Notes');
107	107	if ($nbNote > 0) {
108		- $head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
	108	+ $head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
109	109	}
110	110	$head[$h][2] = 'note';
111	111	$h++;
112	112	}
113	113
114		- require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
115		- require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
116		- $upload_dir = $conf->partnership->dir_output . "/partnership/" . dol_sanitizeFileName($object->ref);
	114	+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
	115	+ require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
	116	+ $upload_dir = $conf->partnership->dir_output."/partnership/".dol_sanitizeFileName($object->ref);
117	117	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta\|_preview.*\.png)$'));
118	118	$nbLinks = Link::count($db, $object->element, $object->id);
119		- $head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_document.php?id=' . $object->id;
	119	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_document.php?id='.$object->id;
120	120	$head[$h][1] = $langs->trans('Documents');
121	121	if (($nbFiles + $nbLinks) > 0) {
122		- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
	122	+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
123	123	}
124	124	$head[$h][2] = 'document';
125	125	$h++;
126	126
127		- $head[$h][0] = DOL_URL_ROOT . '/partnership/partnership_agenda.php?id=' . $object->id;
	127	+ $head[$h][0] = DOL_URL_ROOT.'/partnership/partnership_agenda.php?id='.$object->id;
128	128	$head[$h][1] = $langs->trans("Events");
129	129	$head[$h][2] = 'agenda';
130	130	$h++;

		@@ -40,35 +40,35 @@
		block discarded – undo
40	40	$h = 0;
41	41	$head = array();
42	42
43		- $head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/setup.php';
	43	+ $head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/setup.php';
44	44	$head[$h][1] = $langs->trans("JobPositions");
45	45	$head[$h][2] = 'settings';
46	46	$h++;
47	47
48		- $head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/setup_candidatures.php';
	48	+ $head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/setup_candidatures.php';
49	49	$head[$h][1] = $langs->trans("RecruitmentCandidatures");
50	50	$head[$h][2] = 'settings_candidatures';
51	51	$h++;
52	52
53		- $head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/public_interface.php';
	53	+ $head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/public_interface.php';
54	54	$head[$h][1] = $langs->trans("PublicUrl");
55	55	$head[$h][2] = 'publicurl';
56	56	$h++;
57	57
58		- $head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/jobposition_extrafields.php';
	58	+ $head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/jobposition_extrafields.php';
59	59	$head[$h][1] = $langs->trans("ExtrafieldsJobPosition");
60	60	$nbExtrafields = $extrafields->attributes['recruitment_recruitmentjobposition']['count'];
61	61	if ($nbExtrafields > 0) {
62		- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
	62	+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
63	63	}
64	64	$head[$h][2] = 'jobposition_extrafields';
65	65	$h++;
66	66
67		- $head[$h][0] = DOL_URL_ROOT . '/recruitment/admin/candidature_extrafields.php';
	67	+ $head[$h][0] = DOL_URL_ROOT.'/recruitment/admin/candidature_extrafields.php';
68	68	$head[$h][1] = $langs->trans("ExtrafieldsApplication");
69	69	$nbExtrafields = $extrafields->attributes['recruitment_recruitmentcandidature']['count'];
70	70	if ($nbExtrafields > 0) {
71		- $head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
	71	+ $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
72	72	}
73	73	$head[$h][2] = 'candidature_extrafields';
74	74	$h++;

		@@ -33,11 +33,11 @@
		block discarded – undo
33	33	$h = 0;
34	34	$head = array();
35	35
36		- $head[$h][0] = DOL_URL_ROOT . '/zapier/admin/setup.php';
	36	+ $head[$h][0] = DOL_URL_ROOT.'/zapier/admin/setup.php';
37	37	$head[$h][1] = $langs->trans("Settings");
38	38	$head[$h][2] = 'settings';
39	39	$h++;
40		- $head[$h][0] = DOL_URL_ROOT . '/zapier/admin/about.php';
	40	+ $head[$h][0] = DOL_URL_ROOT.'/zapier/admin/about.php';
41	41	$head[$h][1] = $langs->trans("About");
42	42	$head[$h][2] = 'about';
43	43	$h++;

		@@ -36,7 +36,7 @@
		block discarded – undo
36	36	$h = 0;
37	37	$head = array();
38	38
39		- $head[$h][0] = DOL_URL_ROOT . '/bookcal/admin/setup.php';
	39	+ $head[$h][0] = DOL_URL_ROOT.'/bookcal/admin/setup.php';
40	40	$head[$h][1] = $langs->trans("Settings");
41	41	$head[$h][2] = 'settings';
42	42	$h++;

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	$h = 0;
39	39	$head = array();
40	40
41		- $head[$h][0] = DOL_URL_ROOT . '/admin/emailcollector_card.php?id='.$object->id;
	41	+ $head[$h][0] = DOL_URL_ROOT.'/admin/emailcollector_card.php?id='.$object->id;
42	42	$head[$h][1] = $langs->trans("EmailCollector");
43	43	$head[$h][2] = 'card';
44	44	$h++;
		@@ -180,10 +180,10 @@ discard block
		block discarded – undo
180	180	}
181	181
182	182	$i = 1;
183		- $filepath = $path . $filename . '.' . $ext;
	183	+ $filepath = $path.$filename.'.'.$ext;
184	184
185	185	while (file_exists($filepath)) {
186		- $filepath = $path . $filename . '(' . $i . ').' . $ext;
	186	+ $filepath = $path.$filename.'('.$i.').'.$ext;
187	187	$i++;
188	188	}
189	189	file_put_contents($filepath, $data);

Dolibarr / dolibarr

Branch — develop (6df4a5)

Status

Category

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

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

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

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

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

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

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

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

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