Dolibarr / dolibarr

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;
 				}
 

htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

Spacing +6 added lines, -6 removed lines

@@ -186,7 +186,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="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -280,7 +280,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);
@@ -289,11 +289,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;
@@ -302,7 +302,7 @@ 
 				dol_mkdir($conf->expedition->dir_temp);
 				if (!is_writable($conf->expedition->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->expedition->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/core/modules/bom/doc/doc_generic_bom_odt.modules.php

Spacing +6 added lines, -6 removed lines

@@ -180,7 +180,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="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -276,7 +276,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);
@@ -285,11 +285,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;
@@ -298,7 +298,7 @@ 
 				dol_mkdir($conf->bom->dir_temp);
 				if (!is_writable($conf->bom->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->bom->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/core/modules/mrp/doc/doc_generic_mo_odt.modules.php

Spacing +5 added lines, -5 removed lines

@@ -269,7 +269,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);
@@ -278,11 +278,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;
@@ -291,7 +291,7 @@ 
 				dol_mkdir($conf->mrp->dir_temp);
 				if (!is_writable($conf->mrp->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mrp->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/core/modules/commande/doc/doc_generic_order_odt.modules.php

Spacing +6 added lines, -6 removed lines

@@ -187,7 +187,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="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -282,7 +282,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;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -291,11 +291,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;
@@ -304,7 +304,7 @@ 
 				dol_mkdir($conf->commande->dir_temp);
 				if (!is_writable($conf->commande->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->commande->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/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php

Spacing +5 added lines, -5 removed lines

@@ -264,7 +264,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);
@@ -273,11 +273,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;
@@ -286,7 +286,7 @@ 
 				dol_mkdir($conf->fournisseur->commande->dir_temp);
 				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->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/hrm/class/job.class.php

Braces +3 added lines, -1 removed lines

@@ -609,7 +609,9 @@
 	{
 		$Tab = $this->getForUser($fk_user);
 
-		if (empty($Tab)) return '';
+		if (empty($Tab)) {
+			return '';
+		}
 
 		$lastpos = array_shift($Tab);
 

Spacing +4 added lines, -4 removed lines

@@ -102,13 +102,13 @@ 
 	/**
 	 * @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(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Label of object"),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>2,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>2,),
-		'deplacement' => array('type'=>'select', 'required'=> 1,'label'=> 'NeedBusinessTravels', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0),
+		'deplacement' => array('type'=>'select', 'required'=> 1, 'label'=> 'NeedBusinessTravels', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
 		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
@@ -851,7 +851,7 @@ 
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		return '';		// There is no status on job profile for the moment
+		return ''; // There is no status on job profile for the moment
 
 		/*
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
@@ -960,7 +960,7 @@ 
 		if (getDolGlobalString('hrm_JOB_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('hrm_JOB_ADDON') . ".php";
+			$file = getDolGlobalString('hrm_JOB_ADDON').".php";
 			$classname = $conf->global->hrm_JOB_ADDON;
 
 			// Include file with class

htdocs/hrm/compare.php

Braces +46 added lines, -17 removed lines

@@ -51,8 +51,12 @@ 
 $permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
 $permissiontoadd = 0;
 
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 
 /*
@@ -113,7 +117,9 @@ 
 
 $fk_usergroup2 = 0;
 $fk_job = (int) GETPOST('fk_job');
-if ($fk_job <= 0) $fk_usergroup2 = GETPOST('fk_usergroup2');
+if ($fk_job <= 0) {
+	$fk_usergroup2 = GETPOST('fk_usergroup2');
+}
 
 $fk_usergroup1 = GETPOST('fk_usergroup1');
 
@@ -290,11 +296,17 @@ 
 	foreach ($TMergedSkills as $id => &$sk) {
 		$class = 'diffnote';
 
-		if (empty($sk->rate2)) $class .= ' toohappy';
-		elseif (empty($sk->rate1)) $class .= ' toosad';
-		elseif ($sk->rate1 == $sk->rate2) $class .= ' happy';
-		elseif ($sk->rate2 < $sk->rate1) $class .= ' veryhappy';
-		elseif ($sk->rate2 > $sk->rate1) $class .= ' sad';
+		if (empty($sk->rate2)) {
+			$class .= ' toohappy';
+		} elseif (empty($sk->rate1)) {
+			$class .= ' toosad';
+		} elseif ($sk->rate1 == $sk->rate2) {
+			$class .= ' happy';
+		} elseif ($sk->rate2 < $sk->rate1) {
+			$class .= ' veryhappy';
+		} elseif ($sk->rate2 > $sk->rate1) {
+			$class .= ' sad';
+		}
 
 		$out .= '<li fk_skill="' . $id . '" class="' . $class . '" style="text-align:center;">
 	      <span class="' . $class . '">&nbsp;</span>
@@ -329,8 +341,11 @@ 
 			$how_many = ($field === 'rate1') ? $sk->how_many_max1 : $sk->how_many_max2;
 		}
 
-		if ($field === 'rate2' && $fk_job > 0) $trad = $langs->trans('RequiredRank');
-		else $trad = $langs->trans('HighestRank');
+		if ($field === 'rate2' && $fk_job > 0) {
+			$trad = $langs->trans('RequiredRank');
+		} else {
+			$trad = $langs->trans('HighestRank');
+		}
 
 		$out .= '<li fk_skill="' . $id . '" style="text-align:center;">
 	      <p><span class="' . $class . ' classfortooltip" title="' . $trad . '">' . $note . '</span>' . ($how_many > 0 ? '<span class="bubble classfortooltip" title="' . $langs->trans('HowManyUserWithThisMaxNote') . '">' . $how_many . '</span>' : '') . '</p>
@@ -378,7 +393,9 @@ 
 	$Tab = array();
 
 	foreach ($TSkill1 as &$sk) {
-			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
+			if (empty($Tab[$sk->fk_skill])) {
+				$Tab[$sk->fk_skill] = new stdClass;
+			}
 
 			$Tab[$sk->fk_skill]->rate1 = $sk->rankorder;
 			$Tab[$sk->fk_skill]->how_many_max1 = $sk->how_many_max;
@@ -387,7 +404,9 @@ 
 	}
 
 	foreach ($TSkill2 as &$sk) {
-			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
+			if (empty($Tab[$sk->fk_skill])) {
+				$Tab[$sk->fk_skill] = new stdClass;
+			}
 			$Tab[$sk->fk_skill]->rate2 = $sk->rankorder;
 			$Tab[$sk->fk_skill]->label = $sk->label;
 			$Tab[$sk->fk_skill]->description = $sk->description;
@@ -436,12 +455,16 @@ 
 			$user->fetch($obj->rowid);
 
 			$name = $user->getFullName($langs);
-			if (empty($name)) $name = $user->login;
+			if (empty($name)) {
+				$name = $user->login;
+			}
 
 			if (in_array($user->id, $TExcludedId)) {
 				$class .= ' disabled';
 			} else {
-				if (!in_array($user->id, $TUser)) $TUser[] = $user->id;
+				if (!in_array($user->id, $TUser)) {
+					$TUser[] = $user->id;
+				}
 			}
 
 			$desc = '';
@@ -458,7 +481,9 @@ 
 				$desc .= $langs->trans('NoEval');
 			}
 
-			if (!empty($user->array_options['options_DDA'])) $desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+			if (!empty($user->array_options['options_DDA'])) {
+				$desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+			}
 
 			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
 		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, 1) . '
@@ -486,7 +511,9 @@ 
 	global $db;
 
 	//I go back to the user with the highest score in a given group for all the skills assessed in that group
-	if (empty($TUser)) return array();
+	if (empty($TUser)) {
+		return array();
+	}
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
 	$sql.= ' MAX(sr.rankorder) as rankorder';
@@ -541,7 +568,9 @@ 
 {
 	global $db;
 
-	if (empty($fk_job)) return array();
+	if (empty($fk_job)) {
+		return array();
+	}
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill,';
 	$sql.= " MAX(sr.rankorder) as rankorder";

Spacing +50 added lines, -50 removed lines

@@ -33,13 +33,13 @@ 
 
 // Load Dolibarr environment
 require_once '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm.lib.php';
 
 
 // Load translation files required by the page
@@ -146,7 +146,7 @@ 
 						</tr>
 						<tr>
 							<td><?php
-									echo $langs->trans('OrJobToCompare') . '</td><td>';
+									echo $langs->trans('OrJobToCompare').'</td><td>';
 									$j = new Job($db);
 									$jobs = $j->fetchAll();
 									$TJobs = array();
@@ -229,8 +229,8 @@ 
 							$job->fetch($fk_job);
 							$userlist2 = '<ul>
 											  <li>
-												  <h3>' . $job->label . '</h3>
-												  <p>'  . $job->description . '</p>
+												  <h3>' . $job->label.'</h3>
+												  <p>'  . $job->description.'</p>
 											  </li>
 										  </ul>';
 						} else {
@@ -244,10 +244,10 @@ 
 
 						echo '</td>';
 
-						echo '<td id="" style="width:20%" valign="top">' . skillList($TMergedSkills) . '</td>';
-						echo '<td id="" style="width:5%" valign="top">' . rate($TMergedSkills, 'rate1') . '</td>';
-						echo '<td id="" style="width:10%" valign="top">' . diff($TMergedSkills) . '</td>';
-						echo '<td id="" style="width:5%" valign="top">' . rate($TMergedSkills, 'rate2') . '</td>';
+						echo '<td id="" style="width:20%" valign="top">'.skillList($TMergedSkills).'</td>';
+						echo '<td id="" style="width:5%" valign="top">'.rate($TMergedSkills, 'rate1').'</td>';
+						echo '<td id="" style="width:10%" valign="top">'.diff($TMergedSkills).'</td>';
+						echo '<td id="" style="width:5%" valign="top">'.rate($TMergedSkills, 'rate2').'</td>';
 
 						echo '<td id="list-user-right" style="width:30%" valign="top">';
 
@@ -296,8 +296,8 @@ 
 		elseif ($sk->rate2 < $sk->rate1) $class .= ' veryhappy';
 		elseif ($sk->rate2 > $sk->rate1) $class .= ' sad';
 
-		$out .= '<li fk_skill="' . $id . '" class="' . $class . '" style="text-align:center;">
-	      <span class="' . $class . '">&nbsp;</span>
+		$out .= '<li fk_skill="'.$id.'" class="'.$class.'" style="text-align:center;">
+	      <span class="' . $class.'">&nbsp;</span>
 	    </li>';
 	}
 
@@ -332,8 +332,8 @@ 
 		if ($field === 'rate2' && $fk_job > 0) $trad = $langs->trans('RequiredRank');
 		else $trad = $langs->trans('HighestRank');
 
-		$out .= '<li fk_skill="' . $id . '" style="text-align:center;">
-	      <p><span class="' . $class . ' classfortooltip" title="' . $trad . '">' . $note . '</span>' . ($how_many > 0 ? '<span class="bubble classfortooltip" title="' . $langs->trans('HowManyUserWithThisMaxNote') . '">' . $how_many . '</span>' : '') . '</p>
+		$out .= '<li fk_skill="'.$id.'" style="text-align:center;">
+	      <p><span class="' . $class.' classfortooltip" title="'.$trad.'">'.$note.'</span>'.($how_many > 0 ? '<span class="bubble classfortooltip" title="'.$langs->trans('HowManyUserWithThisMaxNote').'">'.$how_many.'</span>' : '').'</p>
 	    </li>';
 	}
 
@@ -354,9 +354,9 @@ 
 	$out = '<ul class="competence">';
 
 	foreach ($TMergedSkills as $id => &$sk) {
-		$out .= '<li fk_skill="' . $id . '">
-	      <h3>' . $sk->label . '</h3>
-	      <p>' . $sk->description . '</p>
+		$out .= '<li fk_skill="'.$id.'">
+	      <h3>' . $sk->label.'</h3>
+	      <p>' . $sk->description.'</p>
 	    </li>';
 	}
 
@@ -411,17 +411,17 @@ 
 
 	$out = '';
 	if ($fk_usergroup > 0) {
-		$list = $namelist . '_excluded_id';
+		$list = $namelist.'_excluded_id';
 
 		$excludedIdsList = GETPOST($list);
 
-		$sql = "SELECT u.rowid FROM " . MAIN_DB_PREFIX . "user u
-		LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
+		$sql = "SELECT u.rowid FROM ".MAIN_DB_PREFIX."user u
+		LEFT JOIN " . MAIN_DB_PREFIX."usergroup_user as ugu ON (u.rowid = ugu.fk_user)
 		WHERE u.statut > 0 AND ugu.entity = ".((int) $conf->entity);
-		$sql .= " AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
+		$sql .= " AND ugu.fk_usergroup=".((int) $fk_usergroup);
 
 		$res = $db->query($sql);
-		$out .= '<ul name="' . $namelist . '">';
+		$out .= '<ul name="'.$namelist.'">';
 
 		$TExcludedId = explode(',', $excludedIdsList);
 
@@ -453,17 +453,17 @@ 
 			$evaluation = $static_eval->getLastEvaluationForUser($user->id);
 
 			if (!empty($evaluation) && !empty($evaluation->date_eval)) {
-				$desc .= $langs->trans('DateLastEval') . ' : ' . dol_print_date($evaluation->date_eval);
+				$desc .= $langs->trans('DateLastEval').' : '.dol_print_date($evaluation->date_eval);
 			} else {
 				$desc .= $langs->trans('NoEval');
 			}
 
-			if (!empty($user->array_options['options_DDA'])) $desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+			if (!empty($user->array_options['options_DDA'])) $desc .= '<br>'.$langs->trans('Anciennete').' : '.dol_print_date(strtotime($user->array_options['options_DDA']));
 
-			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
-		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, 1) . '
-		      <h3>' . $name . '</h3>
-		      <p>' . $desc . '</p>
+			$out .= '<li fk_user="'.$user->id.'" class="'.$class.'">
+		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, 1).'
+		      <h3>' . $name.'</h3>
+		      <p>' . $desc.'</p>
 		    </li>';
 		}
 
@@ -489,12 +489,12 @@ 
 	if (empty($TUser)) return array();
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
-	$sql.= ' MAX(sr.rankorder) as rankorder';
-	$sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
-	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
-	$sql.= " WHERE sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'";
-	$sql.= ' AND sr.fk_object IN ('.$db->sanitize(implode(',', $TUser)).')';
-	$sql.= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence
+	$sql .= ' MAX(sr.rankorder) as rankorder';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
+	$sql .= " WHERE sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'";
+	$sql .= ' AND sr.fk_object IN ('.$db->sanitize(implode(',', $TUser)).')';
+	$sql .= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence
 
 	$resql = $db->query($sql);
 	$Tab = array();
@@ -502,12 +502,12 @@ 
 	if ($resql) {
 		//For each skill, we count the number of times that the max score has been reached within a given group
 		$num = 0;
-		while ($obj = $db->fetch_object($resql) ) {
+		while ($obj = $db->fetch_object($resql)) {
 			$sql1 = "SELECT COUNT(rowid) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank as sr";
-			$sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder);
-			$sql1.=" AND sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'";
-			$sql1.=" AND sr.fk_skill = ".((int) $obj->fk_skill);
-			$sql1.=" AND sr.fk_object IN (".$db->sanitize(implode(',', $TUser)).")";
+			$sql1 .= " WHERE sr.rankorder = ".((int) $obj->rankorder);
+			$sql1 .= " AND sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'";
+			$sql1 .= " AND sr.fk_skill = ".((int) $obj->fk_skill);
+			$sql1 .= " AND sr.fk_object IN (".$db->sanitize(implode(',', $TUser)).")";
 			$resql1 = $db->query($sql1);
 
 			$objMax = $db->fetch_object($resql1);
@@ -544,19 +544,19 @@ 
 	if (empty($fk_job)) return array();
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill,';
-	$sql.= " MAX(sr.rankorder) as rankorder";
-	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill as sk';
-	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank as sr ON (sk.rowid = sr.fk_skill)';
-	$sql.="	WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
-	$sql.=' AND sr.fk_object = '.((int) $fk_job);
-	$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill'; // group par competence*/
+	$sql .= " MAX(sr.rankorder) as rankorder";
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'hrm_skill as sk';
+	$sql .= '	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank as sr ON (sk.rowid = sr.fk_skill)';
+	$sql .= "	WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
+	$sql .= ' AND sr.fk_object = '.((int) $fk_job);
+	$sql .= ' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill'; // group par competence*/
 
 	$resql = $db->query($sql);
 	$Tab = array();
 
 	if ($resql) {
 		$num = 0;
-		while ($obj = $db->fetch_object($resql) ) {
+		while ($obj = $db->fetch_object($resql)) {
 			$Tab[$num] = new stdClass();
 			$Tab[$num]->fk_skill = $obj->fk_skill;
 			$Tab[$num]->label = $obj->label;

htdocs/variants/class/ProductCombination2ValuePair.class.php

Spacing +8 added lines, -8 removed lines

@@ -69,8 +69,8 @@ 
 	 */
 	public function __toString()
 	{
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 		$prodattr = new ProductAttribute($this->db);
 		$prodattrval = new ProductAttributeValue($this->db);
@@ -78,7 +78,7 @@ 
 		$prodattr->fetch($this->fk_prod_attr);
 		$prodattrval->fetch($this->fk_prod_attr_val);
 
-		return $prodattr->label . ': ' . $prodattrval->value;
+		return $prodattr->label.': '.$prodattrval->value;
 	}
 
 	/**
@@ -89,14 +89,14 @@ 
 	 */
 	public function create($user)
 	{
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
-		VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")";
+		VALUES(" . (int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
 
 		$query = $this->db->query($sql);
 
 		if ($query) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val');
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
 
 			return 1;
 		}
@@ -117,7 +117,7 @@ 
         c2v.fk_prod_attr_val,
         c2v.fk_prod_attr,
         c2v.fk_prod_combination
-        FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
+        FROM " . MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
         WHERE c2v.fk_prod_combination = " . (int) $fk_combination;
 
 		$sql .= $this->db->order('c.position', 'asc');
@@ -151,7 +151,7 @@ 
 	 */
 	public function deleteByFkCombination($fk_combination)
 	{
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
 
 		if ($this->db->query($sql)) {
 			return 1;