Dolibarr / dolibarr

htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php

Spacing +6 added lines, -6 removed lines

@@ -172,7 +172,7 @@ 
 		$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="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -265,7 +265,7 @@ 
 				$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);
@@ -274,16 +274,16 @@ 
 					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;
 
 				dol_mkdir($conf->product->dir_temp);
 				if (!is_writable($conf->product->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

htdocs/expensereport/list.php

Spacing +14 added lines, -14 removed lines

@@ -82,10 +82,10 @@ 
 
 
 // Load variable for pagination
-$limit 		= GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
-$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -104,30 +104,30 @@ 
 
 $search_ref			= GETPOST('search_ref', 'alpha');
 $search_user		= GETPOST('search_user', 'intcomma');
-$search_amount_ht	= GETPOST('search_amount_ht', 'alpha');
+$search_amount_ht = GETPOST('search_amount_ht', 'alpha');
 $search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
 $search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
-$search_status		= (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
+$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 
-$search_date_startday		= GETPOSTINT('search_date_startday');
+$search_date_startday = GETPOSTINT('search_date_startday');
 $search_date_startmonth		= GETPOSTINT('search_date_startmonth');
-$search_date_startyear		= GETPOSTINT('search_date_startyear');
+$search_date_startyear = GETPOSTINT('search_date_startyear');
 $search_date_startendday	= GETPOSTINT('search_date_startendday');
-$search_date_startendmonth	= GETPOSTINT('search_date_startendmonth');
-$search_date_startendyear	= GETPOSTINT('search_date_startendyear');
-$search_date_start			= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_startendmonth = GETPOSTINT('search_date_startendmonth');
+$search_date_startendyear = GETPOSTINT('search_date_startendyear');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_startend		= dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear);
 
 $search_date_endday			= GETPOSTINT('search_date_endday');
 $search_date_endmonth		= GETPOSTINT('search_date_endmonth');
 $search_date_endyear		= GETPOSTINT('search_date_endyear');
-$search_date_endendday		= GETPOSTINT('search_date_endendday');
+$search_date_endendday = GETPOSTINT('search_date_endendday');
 $search_date_endendmonth	= GETPOSTINT('search_date_endendmonth');
 $search_date_endendyear		= GETPOSTINT('search_date_endendyear');
-$search_date_end			= dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);	// Use tzserver
-$search_date_endend			= dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
+$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver
+$search_date_endend = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
 
-$optioncss    = GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 if ($search_status == '') {
 	$search_status = -1;
@@ -582,7 +582,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

htdocs/adherents/list.php

Spacing +21 added lines, -21 removed lines

@@ -43,48 +43,48 @@ 
 
 
 // Get parameters
-$action 	= GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOSTINT('show_files');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
-$toselect 	= GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss 	= GETPOST('optioncss', 'aZ');
-$mode 		= GETPOST('mode', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 // Search fields
 $search 			= GETPOST("search", 'alpha');
 $search_id = GETPOST('search_id', 'int');
-$search_ref 		= GETPOST("search_ref", 'alpha');
+$search_ref = GETPOST("search_ref", 'alpha');
 $search_lastname 	= GETPOST("search_lastname", 'alpha');
-$search_firstname 	= GETPOST("search_firstname", 'alpha');
+$search_firstname = GETPOST("search_firstname", 'alpha');
 $search_gender 		= GETPOST("search_gender", 'alpha');
 $search_civility 	= GETPOST("search_civility", 'alpha');
 $search_company 	= GETPOST('search_company', 'alphanohtml');
-$search_login 		= GETPOST("search_login", 'alpha');
+$search_login = GETPOST("search_login", 'alpha');
 $search_address 	= GETPOST("search_address", 'alpha');
-$search_zip 		= GETPOST("search_zip", 'alpha');
-$search_town 		= GETPOST("search_town", 'alpha');
-$search_state 		= GETPOST("search_state", 'alpha');  // county / departement / federal state
-$search_country 	= GETPOST("search_country", 'alpha');
+$search_zip = GETPOST("search_zip", 'alpha');
+$search_town = GETPOST("search_town", 'alpha');
+$search_state 		= GETPOST("search_state", 'alpha'); // county / departement / federal state
+$search_country = GETPOST("search_country", 'alpha');
 $search_phone 		= GETPOST("search_phone", 'alpha');
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
-$search_type 		= GETPOST("search_type", 'alpha');
+$search_type = GETPOST("search_type", 'alpha');
 $search_email 		= GETPOST("search_email", 'alpha');
 $search_categ 		= GETPOST("search_categ", 'intcomma');
-$search_morphy 		= GETPOST("search_morphy", 'alpha');
-$search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
+$search_morphy = GETPOST("search_morphy", 'alpha');
+$search_import_key = trim(GETPOST("search_import_key", 'alpha'));
 
-$socid 		= GETPOSTINT('socid');
+$socid = GETPOSTINT('socid');
 if (GETPOSTINT('catid') && empty($search_categ)) {
 	$search_categ = GETPOSTINT('catid');
 }
 
 $search_filter 		= GETPOST("search_filter", 'alpha');
-$search_status 		= GETPOST("search_status", 'intcomma');  // status
+$search_status 		= GETPOST("search_status", 'intcomma'); // status
 $search_datec_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datec_start_month'), GETPOSTINT('search_datec_start_day'), GETPOSTINT('search_datec_start_year'));
 $search_datec_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datec_end_month'), GETPOSTINT('search_datec_end_day'), GETPOSTINT('search_datec_end_year'));
 $search_datem_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datem_start_month'), GETPOSTINT('search_datem_start_day'), GETPOSTINT('search_datem_start_year'));
@@ -209,7 +209,7 @@ 
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 //var_dump($arrayfields);exit;
 
 // Security check
@@ -437,7 +437,7 @@ 
 $sqlfields = $sql; // $sql fields to remove for count total
 
 // SQL Alias adherent
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead of d
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead of d
 if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
 }
@@ -462,7 +462,7 @@ 
 			if ($searchCategoryContactOperator == 0) {
 				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryContact);
 			}
 		}
 	}
@@ -629,7 +629,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -825,7 +825,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

htdocs/comm/mailing/cibles.php

Spacing +6 added lines, -6 removed lines

@@ -392,7 +392,7 @@ 
 			}
 		}
 		if (empty($nbemail)) {
-			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
+			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere')); //.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 		}
 		if ($text) {
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -476,7 +476,7 @@ 
 		}
 		print '</div>';
 		print '<div class="tagtd">&nbsp;</div>';
-		print '</div>';	// End tr
+		print '</div>'; // End tr
 
 		clearstatcache();
 
@@ -547,12 +547,12 @@ 
 					}
 					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
 					print '</div>';
-					print '<div class="tagtd valignmiddle">';	//  style="height: 4em"
+					print '<div class="tagtd valignmiddle">'; //  style="height: 4em"
 					print $obj->getDesc();
 					print '</div>';
 
 					try {
-						$obj->evenunsubscribe = $object->evenunsubscribe;	// Set flag to include/exclude email that has opt-out.
+						$obj->evenunsubscribe = $object->evenunsubscribe; // Set flag to include/exclude email that has opt-out.
 
 						$nbofrecipient = $obj->getNbOfRecipients('');
 					} catch (Exception $e) {
@@ -605,7 +605,7 @@ 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-		print '</div>';	// End table
+		print '</div>'; // End table
 		print '</div>';
 
 		print '<br>';
@@ -897,7 +897,7 @@ 
 				print '<td class="center nowraponall">';
 				if ($obj->status != $object::STATUS_DRAFT) {		// If status of target line is not draft
 					// Date sent
-					print $obj->date_envoi;		// @TODO Must store date in date format
+					print $obj->date_envoi; // @TODO Must store date in date format
 				}
 				print '</td>';