Dolibarr / dolibarr

htdocs/core/class/utils.class.php

Spacing +9 added lines, -9 removed lines

@@ -101,14 +101,14 @@ 
 			if ($choice == 'allfiles') {
 				// Delete all files (except install.lock, do not follow symbolic links)
 				if ($dolibarr_main_data_root) {
-					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);	// No need to use recursive, we will delete directory
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1); // No need to use recursive, we will delete directory
 				}
 			}
 
 			if ($choice == 'allfilesold') {
 				// Delete all files (except install.lock, do not follow symbolic links)
 				if ($dolibarr_main_data_root) {
-					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold);	// No need to use recursive, we will delete directory
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold); // No need to use recursive, we will delete directory
 				}
 			}
 
@@ -1303,14 +1303,14 @@ 
 		}
 		if ($tmpfiles && is_array($tmpfiles)) {
 			foreach ($tmpfiles as $key => $val) {
-				if ($key  == 'fullname') {
+				if ($key == 'fullname') {
 					$filepath = array($val);
 					$filesize = dol_filesize($val);
 				}
-				if ($key  == 'type') {
+				if ($key == 'type') {
 					$mimetype = array($val);
 				}
-				if ($key  == 'relativename') {
+				if ($key == 'relativename') {
 					$filename = array($val);
 				}
 			}
@@ -1319,7 +1319,7 @@ 
 		if ($filepath) {
 			if ($filesize > $sizelimit) {
 				$message .= '<br>'.$langs->trans("BackupIsTooLargeSend");
-				$documenturl =  $dolibarr_main_url_root.'/document.php?modulepart=systemtools&atachement=1&file=backup/'.urlencode($filename[0]);
+				$documenturl = $dolibarr_main_url_root.'/document.php?modulepart=systemtools&atachement=1&file=backup/'.urlencode($filename[0]);
 				$message .= '<br><a href='.$documenturl.'>Lien de téléchargement</a>';
 				$filepath = '';
 				$mimetype = '';
@@ -1331,7 +1331,7 @@ 
 		}
 
 		if (!$error) {
-			include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
 			if ($mailfile->error) {
 				$error++;
@@ -1390,7 +1390,7 @@ 
 		}
 
 		$cron_job = new Cronjob($db);
-		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, '', 1);	// Fetch jobs that are currently running
+		$cron_job->fetchAll('DESC', 't.rowid', 100, 0, 1, '', 1); // Fetch jobs that are currently running
 
 		// Iterate over all jobs in processing (this can't be this job since his state is set to 0 before)
 		foreach ($cron_job->lines as $job_line) {
@@ -1408,7 +1408,7 @@ 
 			}
 
 			// Calling posix_kill with the 0 kill signal will return true if the process is running, false otherwise.
-			if (! posix_kill($job->pid, 0)) {
+			if (!posix_kill($job->pid, 0)) {
 				// Clean processing and pid values
 				$job->processing = 0;
 				$job->pid = null;

htdocs/hrm/class/skill.class.php

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
@@ -227,7 +227,7 @@ 
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$resultcreate = $this->createCommon($user, $notrigger);
 
@@ -255,24 +255,24 @@ 
 
 		$error = 0;
 
-		require_once __DIR__ . '/skilldet.class.php';
+		require_once __DIR__.'/skilldet.class.php';
 
 		$this->db->begin();
 
 		// Create level of skills
-		for ($i; $i <= $MaxNumberSkill ; $i++) {
+		for ($i; $i <= $MaxNumberSkill; $i++) {
 			$skilldet = new Skilldet($this->db);
-			$skilldet->description = $defaultSkillDesc . " " . $i;
+			$skilldet->description = $defaultSkillDesc." ".$i;
 			$skilldet->rankorder = $i;
 			$skilldet->fk_skill = $this->id;
 
-			$result =  $skilldet->create($user);
+			$result = $skilldet->create($user);
 			if ($result <= 0) {
 				$error++;
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 
 			setEventMessage($langs->trans('SkillCreated'), $i);
@@ -406,7 +406,7 @@ 
 	public function fetchLines()
 	{
 		$this->lines = array();
-		require_once __DIR__ . '/skilldet.class.php';
+		require_once __DIR__.'/skilldet.class.php';
 		$skilldet = new Skilldet($this->db);
 		$this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), '');
 

htdocs/loan/class/paymentloan.class.php

Spacing +2 added lines, -2 removed lines

@@ -345,7 +345,7 @@ 
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " fk_bank=".(isset($this->fk_bank) ? ((int) $this->fk_bank) : "null").",";
 		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? ((int) $this->fk_user_creat) : "null").",";
-		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ?((int) $this->fk_user_modif) : "null");
+		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? ((int) $this->fk_user_modif) : "null");
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -655,7 +655,7 @@ 
 		$result .= $linkend;
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/core/modules/security/generate/modGeneratePassPerso.class.php

Spacing +2 added lines, -2 removed lines

@@ -194,7 +194,7 @@ 
 			return $pass;
 		}
 
-		return $this->getNewGeneratedPassword();	// warning, may generate infinite loop if conditions are not possible
+		return $this->getNewGeneratedPassword(); // warning, may generate infinite loop if conditions are not possible
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	{
 		global $langs;
 
-		$this->initAll();	// For the case this method is called alone
+		$this->initAll(); // For the case this method is called alone
 
 		$password_a = preg_split('//u', $password, null, PREG_SPLIT_NO_EMPTY);
 		$maj = preg_split('//u', $this->Maj, null, PREG_SPLIT_NO_EMPTY);

htdocs/accountancy/class/accountancycategory.class.php

Spacing +2 added lines, -2 removed lines

@@ -627,7 +627,7 @@ 
 		if (is_array($cpt)) {
 			$listofaccount = '';
 			foreach ($cpt as $cptcursor) {
-				if (! is_null($cptcursor)) {
+				if (!is_null($cptcursor)) {
 					if ($listofaccount) {
 						$listofaccount .= ",";
 					}
@@ -776,7 +776,7 @@ 
 
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-		$sql .= " WHERE c.active = " . (int) $active;
+		$sql .= " WHERE c.active = ".(int) $active;
 		$sql .= " AND c.entity = ".$conf->entity;
 		if ($categorytype >= 0) {
 			$sql .= " AND c.category_type = 1";

htdocs/website/class/websitepage.class.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public $fk_website;
 
-	public $fk_page;		// If translation of another page
+	public $fk_page; // If translation of another page
 
 	public $pageurl;
 	public $aliasalt;
@@ -118,8 +118,8 @@ 
 	 */
 	public $fk_object;
 
-	const STATUS_DRAFT = 0;			// offline
-	const STATUS_VALIDATED = 1;		// online
+	const STATUS_DRAFT = 0; // offline
+	const STATUS_VALIDATED = 1; // online
 
 
 	/**

htdocs/mrp/tpl/linkedobjectblock.tpl.php

Spacing +9 added lines, -9 removed lines

@@ -53,25 +53,25 @@ 
 
 			$trclass = 'oddeven';
 
-			echo '<tr class="' . $trclass . '" >';
-			echo '<td class="linkedcol-element tdoverflowmax100">' . $langs->trans("ManufacturingOrder");
+			echo '<tr class="'.$trclass.'" >';
+			echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("ManufacturingOrder");
 			if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-				print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
+				print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 			}
 			echo '</td>';
-			echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>';
+			echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
 
 			echo '<td class="linkedcol-ref center">';
 			//  $result = $product_static->fetch($objectlink->fk_product);
 			print '</td>';
-			echo '<td class="linkedcol-date center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
+			echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
 			echo '<td class="linkedcol-amount right">-</td>';
-			echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>';
+			echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
 			echo '<td class="linkedcol-action right">';
 
 			// we want to make the link via element_element for delete action
-			$sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
-			$sql .= " WHERE  fk_source = " . (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) . "'";
+			$sql = " Select rowid from ".MAIN_DB_PREFIX."element_element";
+			$sql .= " WHERE  fk_source = ".(int) $object->id." and fk_target = '".dol_escape_htmltag($key)."'";
 
 			$resql = $db->query($sql);
 			$k = 0;
@@ -79,7 +79,7 @@ 
 				$obj = $db->fetch_object($resql);
 				if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid;
 			}
-			echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>';
+			echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$k.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
 			echo '</td>';
 			echo "</tr>\n";
 		}

htdocs/fourn/commande/list.php

Spacing +11 added lines, -11 removed lines

@@ -64,7 +64,7 @@ 
 $search_date_order_endday = GETPOST('search_date_order_endday', 'int');
 $search_date_order_endmonth = GETPOST('search_date_order_endmonth', 'int');
 $search_date_order_endyear = GETPOST('search_date_order_endyear', 'int');
-$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear);	// Use tzserver
+$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear); // Use tzserver
 $search_date_order_end = dol_mktime(23, 59, 59, $search_date_order_endmonth, $search_date_order_endday, $search_date_order_endyear);
 
 $search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
@@ -73,7 +73,7 @@ 
 $search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
 $search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
 $search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
-$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
+$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
 
 $search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
@@ -82,7 +82,7 @@ 
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 
 $search_date_approve_startday = GETPOST('search_date_approve_startday', 'int');
@@ -91,7 +91,7 @@ 
 $search_date_approve_endday = GETPOST('search_date_approve_endday', 'int');
 $search_date_approve_endmonth = GETPOST('search_date_approve_endmonth', 'int');
 $search_date_approve_endyear = GETPOST('search_date_approve_endyear', 'int');
-$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear);	// Use tzserver
+$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver
 $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -370,7 +370,7 @@ 
 
 		$db->begin();
 
-		$default_ref_supplier=dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		$default_ref_supplier = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
 		foreach ($orders as $id_order) {
 			$cmd = new CommandeFournisseur($db);
@@ -389,7 +389,7 @@ 
 				$objecttmp->fk_project = $cmd->fk_project;
 				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
 				$objecttmp->ref_supplier = !empty($cmd->ref_supplier) ? $cmd->ref_supplier : $default_ref_supplier;
-				$default_ref_supplier+=1;
+				$default_ref_supplier += 1;
 
 				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 				if (empty($datefacture)) {
@@ -885,9 +885,9 @@ 
 if ($search_user > 0) {
 	$sql .= " AND EXISTS (";
 	$sql .= " SELECT ec.rowid ";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec";
-	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact";
-	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = " . ((int) $search_user);
+	$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact";
+	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = ".((int) $search_user);
 	$sql .= " AND tc.element = 'order_supplier' AND tc.source = 'internal'";
 	$sql .= ")";
 }
@@ -931,7 +931,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -1203,7 +1203,7 @@ 
 
 	$topicmail = "SendOrderRef";
 	$modelmail = "order_supplier_send";
-	$objecttmp = new CommandeFournisseur($db);	// in case $object is not the good object
+	$objecttmp = new CommandeFournisseur($db); // in case $object is not the good object
 	$trackid = 'sord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 

htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php

Spacing +6 added lines, -6 removed lines

@@ -179,7 +179,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="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -273,7 +273,7 @@ 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref . '_' . $newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -282,11 +282,11 @@ 
 					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;
@@ -295,7 +295,7 @@ 
 				dol_mkdir($conf->reception->dir_temp);
 				if (!is_writable($conf->reception->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}