Dolibarr / dolibarr

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

Spacing +31 added lines, -31 removed lines

@@ -24,7 +24,7 @@ 
  *      \brief      File to manage no password generation.
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassword.php';
 
 
 /**
@@ -67,23 +67,23 @@ 
 		$this->id = "Perso";
 		$this->length = $langs->trans("SetupPerso");
 
-		$this->db=$db;
-		$this->conf=$conf;
-		$this->langs=$langs;
-		$this->user=$user;
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->langs = $langs;
+		$this->user = $user;
 
-		if(empty($conf->global->USER_PASSWORD_PATTERN)){
+		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
 			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
 		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 		$this->Min = strtolower($this->Maj);
 		$this->Nb = "0123456789";
 		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
-		$this->Ambi = array("1","I","l","|","O","0");
+		$this->Ambi = array("1", "I", "l", "|", "O", "0");
 
-		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+		$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
 		$this->length2 = $tabConf[0];
 		$this->NbMaj = $tabConf[1];
 		$this->NbNum = $tabConf[2];
@@ -93,13 +93,13 @@ 
 
 		if ($this->WithoutAmbi)
 		{
-			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
-			$this->Min = str_replace($this->Ambi,"",$this->Min);
-			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
-			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
+			$this->Maj = str_replace($this->Ambi, "", $this->Maj);
+			$this->Min = str_replace($this->Ambi, "", $this->Min);
+			$this->Nb  = str_replace($this->Ambi, "", $this->Nb);
+			$this->Spe = str_replace($this->Ambi, "", $this->Spe);
 		}
 
-		$pattern = $this->Min . (! empty($this->NbMaj)?$this->Maj:'') . (! empty($this->NbNum)?$this->Nb:'') . (! empty($this->NbSpe)?$this->Spe:'');
+		$pattern = $this->Min.(!empty($this->NbMaj) ? $this->Maj : '').(!empty($this->NbNum) ? $this->Nb : '').(!empty($this->NbSpe) ? $this->Spe : '');
 		$this->All = str_shuffle($pattern);
 
 		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
@@ -137,20 +137,20 @@ 
 	function getNewGeneratedPassword()
 	{
 		$pass = "";
-		for($i=0; $i<$this->NbMaj; $i++){ // Y
-			$pass .= $this->Maj[mt_rand(0,strlen($this->Maj) - 1)];
+		for ($i = 0; $i < $this->NbMaj; $i++) { // Y
+			$pass .= $this->Maj[mt_rand(0, strlen($this->Maj) - 1)];
 		}
 
-		for($i=0; $i<$this->NbNum; $i++){ // X
-			$pass .= $this->Nb[mt_rand(0,strlen($this->Nb) - 1)];
+		for ($i = 0; $i < $this->NbNum; $i++) { // X
+			$pass .= $this->Nb[mt_rand(0, strlen($this->Nb) - 1)];
 		}
 
-		for($i=0; $i<$this->NbSpe; $i++){ // @
-			$pass .= $this->Spe[mt_rand(0,strlen($this->Spe) - 1)];
+		for ($i = 0; $i < $this->NbSpe; $i++) { // @
+			$pass .= $this->Spe[mt_rand(0, strlen($this->Spe) - 1)];
 		}
 
-		for($i=strlen($pass);$i<$this->length2; $i++){ // y
-			$pass .= $this->All[mt_rand(0,strlen($this->All) -1)];
+		for ($i = strlen($pass); $i < $this->length2; $i++) { // y
+			$pass .= $this->All[mt_rand(0, strlen($this->All) - 1)];
 		}
 
 		$pass = str_shuffle($pass);
@@ -176,19 +176,19 @@ 
 		$num = str_split($this->Nb);
 		$spe = str_split($this->Spe);
 
-		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+		if (count(array_intersect($password_a, $maj)) < $this->NbMaj) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $num)) < $this->NbNum){
+		if (count(array_intersect($password_a, $num)) < $this->NbNum) {
 			return 0;
 		}
 
-		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+		if (count(array_intersect($password_a, $spe)) < $this->NbSpe) {
 			return 0;
 		}
 
-		if(!$this->consecutiveInterationSameCharacter($password)){
+		if (!$this->consecutiveInterationSameCharacter($password)) {
 			return 0;
 		}
 
@@ -201,19 +201,19 @@ 
 	 *		@param		string	$password	Password to check
 	 *      @return     int					0 if KO, >0 if OK
 	 */
-	function consecutiveInterationSameCharacter($password){
+	function consecutiveInterationSameCharacter($password) {
 		$last = "";
 		$count = 0;
 		$char = str_split($password);
-		foreach($char as $c){
-			if($c != $last){
+		foreach ($char as $c) {
+			if ($c != $last) {
 				$last = $c;
 				$count = 0;
-			}else{
+			} else {
 				$count++;
 			}
 
-			if($count >= $this->NbRepeat) {
+			if ($count >= $this->NbRepeat) {
 				return 0;
 			}
 		}

htdocs/core/class/comment.class.php

Spacing +91 added lines, -91 removed lines

@@ -4,8 +4,8 @@ 
  */
 class Comment extends CommonObject
 {
-	public $element='comment';		//!< Id that identify managed objects
-	public $table_element='comment';	//!< Name of table without prefix where object is stored
+	public $element = 'comment'; //!< Id that identify managed objects
+	public $table_element = 'comment'; //!< Name of table without prefix where object is stored
 
 	var $fk_element;
 	var $element_type;
@@ -43,30 +43,30 @@ 
 	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int 		        	<0 if KO, Id of created object if OK
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
-		$sql.= "description";
-		$sql.= ", datec";
-		$sql.= ", fk_element";
-		$sql.= ", element_type";
-		$sql.= ", fk_user_author";
-		$sql.= ", entity";
-		$sql.= ", import_key";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->description)."'";
-		$sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
-		$sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
-		$sql.= ", '".$this->db->escape($this->element_type)."'";
-		$sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
-		$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
-		$sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
+		$sql .= "description";
+		$sql .= ", datec";
+		$sql .= ", fk_element";
+		$sql .= ", element_type";
+		$sql .= ", fk_user_author";
+		$sql .= ", entity";
+		$sql .= ", import_key";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->description)."'";
+		$sql .= ", ".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", '".(isset($this->fk_element) ? $this->fk_element : "null")."'";
+		$sql .= ", '".$this->db->escape($this->element_type)."'";
+		$sql .= ", '".(isset($this->fk_user_author) ? $this->fk_user_author : "null")."'";
+		$sql .= ", ".(!empty($this->entity) ? $this->entity : '1');
+		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= ")";
 
 		//var_dump($this->db);
 		//echo $sql;
@@ -74,17 +74,17 @@ 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
+				$result = $this->call_trigger('TASK_COMMENT_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -93,13 +93,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -116,25 +116,25 @@ 
 	 *  @param	int		$ref		ref object
 	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
 	 */
-	function fetch($id, $ref='')
+	function fetch($id, $ref = '')
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " c.rowid,";
-		$sql.= " c.description,";
-		$sql.= " c.datec,";
-		$sql.= " c.tms,";
-		$sql.= " c.fk_element,";
-		$sql.= " c.element_type,";
-		$sql.= " c.fk_user_author,";
-		$sql.= " c.entity,";
-		$sql.= " c.import_key";
-		$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-		$sql.= " WHERE c.rowid = ".$id;
+		$sql .= " c.rowid,";
+		$sql .= " c.description,";
+		$sql .= " c.datec,";
+		$sql .= " c.tms,";
+		$sql .= " c.fk_element,";
+		$sql .= " c.element_type,";
+		$sql .= " c.fk_user_author,";
+		$sql .= " c.entity,";
+		$sql .= " c.import_key";
+		$sql .= " FROM ".MAIN_DB_PREFIX."comment as c";
+		$sql .= " WHERE c.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num_rows = $this->db->num_rows($resql);
@@ -143,14 +143,14 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id					= $obj->rowid;
-				$this->description			= $obj->description;
-				$this->element_type			= $obj->element_type;
-				$this->datec				= $this->db->jdate($obj->datec);
-				$this->tms					= $obj->tms;
-				$this->fk_user_author		= $obj->fk_user_author;
+				$this->id = $obj->rowid;
+				$this->description = $obj->description;
+				$this->element_type = $obj->element_type;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $obj->tms;
+				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_element			= $obj->fk_element;
-				$this->entity				= $obj->entity;
+				$this->entity = $obj->entity;
 				$this->import_key			= $obj->import_key;
 			}
 
@@ -161,7 +161,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -174,40 +174,40 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int			         	<=0 if KO, >0 if OK
 	 */
-	function update(User $user, $notrigger=0)
+	function update(User $user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
-		if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
-		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->fk_element)) $this->fk_project = (int) trim($this->fk_element);
+		if (isset($this->fk_user_author)) $this->fk_user_author = (int) trim($this->fk_user_author);
+		if (isset($this->description)) $this->description = trim($this->description);
 
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
-		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-		$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
-		$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
-		$sql.= " element_type='".$this->db->escape($this->element_type)."',";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
-		$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
+		$sql .= " datec=".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " fk_element=".(isset($this->fk_element) ? $this->fk_element : "null").",";
+		$sql .= " element_type='".$this->db->escape($this->element_type)."',";
+		$sql .= " fk_user_author=".(isset($this->fk_user_author) ? $this->fk_user_author : "null").",";
+		$sql .= " entity=".(!empty($this->entity) ? $this->entity : '1').",";
+		$sql .= " import_key=".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
+				$result = $this->call_trigger('TASK_COMMENT_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -216,13 +216,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -239,27 +239,27 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
+				$result = $this->call_trigger('TASK_COMMENT_DELETE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
@@ -268,14 +268,14 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
-		}else{
+			return -1 * $error;
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -291,25 +291,25 @@ 
 	 */
 	public static function fetchAllFor($element_type, $fk_element)
 	{
-		global $db,$conf;
+		global $db, $conf;
 		$TComments = array();
-		if(!empty($element_type) && !empty($fk_element)) {
+		if (!empty($element_type) && !empty($fk_element)) {
 			$sql = "SELECT";
-			$sql.= " c.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-			$sql.= " WHERE c.fk_element = ".$fk_element;
-			$sql.= " AND c.element_type = '".$element_type."'";
-			$sql.= " AND c.entity = ".$conf->entity;
-			$sql.= " ORDER BY c.tms DESC";
+			$sql .= " c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."comment as c";
+			$sql .= " WHERE c.fk_element = ".$fk_element;
+			$sql .= " AND c.element_type = '".$element_type."'";
+			$sql .= " AND c.entity = ".$conf->entity;
+			$sql .= " ORDER BY c.tms DESC";
 
 			dol_syslog("Comment::fetchAllFor", LOG_DEBUG);
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$num_rows = $db->num_rows($resql);
 				if ($num_rows > 0)
 				{
-					while($obj = $db->fetch_object($resql))
+					while ($obj = $db->fetch_object($resql))
 					{
 						$comment = new self($db);
 						$comment->fetch($obj->rowid);

htdocs/modulebuilder/index.php

Spacing +335 added lines, -335 removed lines

@@ -23,7 +23,7 @@ 
  *       \brief      Home page for module builder module
  */
 
-if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');			// Do not check anti SQL+XSS injection attack test
+if (!defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1'); // Do not check anti SQL+XSS injection attack test
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -34,49 +34,49 @@ 
 
 $langs->loadLangs(array("admin", "modulebuilder", "other", "cron"));
 
-$action=GETPOST('action','aZ09');
-$confirm=GETPOST('confirm','alpha');
-$cancel=GETPOST('cancel','alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 
-$module=GETPOST('module','alpha');
-$tab=GETPOST('tab','aZ09');
-$tabobj=GETPOST('tabobj','alpha');
-$propertykey=GETPOST('propertykey','alpha');
-if (empty($module)) $module='initmodule';
-if (empty($tab)) $tab='description';
-if (empty($tabobj)) $tabobj='newobjectifnoobj';
-$file=GETPOST('file','alpha');
+$module = GETPOST('module', 'alpha');
+$tab = GETPOST('tab', 'aZ09');
+$tabobj = GETPOST('tabobj', 'alpha');
+$propertykey = GETPOST('propertykey', 'alpha');
+if (empty($module)) $module = 'initmodule';
+if (empty($tab)) $tab = 'description';
+if (empty($tabobj)) $tabobj = 'newobjectifnoobj';
+$file = GETPOST('file', 'alpha');
 
-$modulename=dol_sanitizeFileName(GETPOST('modulename','alpha'));
-$objectname=dol_sanitizeFileName(GETPOST('objectname','alpha'));
+$modulename = dol_sanitizeFileName(GETPOST('modulename', 'alpha'));
+$objectname = dol_sanitizeFileName(GETPOST('objectname', 'alpha'));
 
 // Security check
 if (empty($conf->modulebuilder->enabled)) accessforbidden('ModuleBuilderNotAllowed');
-if (! $user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
+if (!$user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) accessforbidden('ModuleBuilderNotAllowed');
 
 
 // Dir for custom dirs
-$tmp=explode(',', $dolibarr_main_document_root_alt);
+$tmp = explode(',', $dolibarr_main_document_root_alt);
 $dirins = $tmp[0];
 $dirread = $dirins;
 $forceddirread = 0;
 
 $tmpdir = explode('@', $module);
-if (! empty($tmpdir[1]))
+if (!empty($tmpdir[1]))
 {
-	$module=$tmpdir[0];
-	$dirread=$tmpdir[1];
-	$forceddirread=1;
+	$module = $tmpdir[0];
+	$dirread = $tmpdir[1];
+	$forceddirread = 1;
 }
 
-$FILEFLAG='modulebuilder.txt';
+$FILEFLAG = 'modulebuilder.txt';
 
-$now=dol_now();
+$now = dol_now();
 $newmask = 0;
-if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 if (empty($newmask))	// This should no happen
 {
-    $newmask='0664';
+    $newmask = '0664';
 }
 
 
@@ -92,12 +92,12 @@ 
         setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    if (! $error)
+    if (!$error)
     {
         $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
         $destdir = $dirins.'/'.strtolower($modulename);
 
-        $arrayreplacement=array(
+        $arrayreplacement = array(
             'mymodule'=>strtolower($modulename),
          	'MyModule'=>$modulename
         );
@@ -136,13 +136,13 @@ 
     }
 
     // Edit PHP files
-    if (! $error)
+    if (!$error)
     {
 	    $listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.(php|MD|js|sql|txt|xml|lang)$', '', 'fullname', SORT_ASC, 0, 1);
-	    foreach($listofphpfilestoedit as $phpfileval)
+	    foreach ($listofphpfilestoedit as $phpfileval)
 	    {
 	        //var_dump($phpfileval['fullname']);
-	    	$arrayreplacement=array(
+	    	$arrayreplacement = array(
 	            'mymodule'=>strtolower($modulename),
 	        	'MyModule'=>$modulename,
 	        	'MYMODULE'=>strtoupper($modulename),
@@ -151,11 +151,11 @@ 
 	        	'Mon module'=>$modulename,
 	        	'mon module'=>$modulename,
 	    		'htdocs/modulebuilder/template'=>strtolower($modulename),
-                '---Put here your own copyright and developer email---'=>dol_print_date($now,'%Y').' '.$user->getFullName($langs).($user->email?' <'.$user->email.'>':'')
+                '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 	    	);
 
 
-	        $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+	        $result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
 	        //var_dump($result);
 	        if ($result < 0)
 	        {
@@ -164,10 +164,10 @@ 
 	    }
     }
 
-    if (! $error)
+    if (!$error)
     {
         setEventMessages('ModuleInitialized', null);
-        $module=$modulename;
+        $module = $modulename;
         $modulename = '';
     }
 }
@@ -184,16 +184,16 @@ 
     $destdir = $dirins.'/'.strtolower($module);
 
     // Scan dir class to find if an object with same name already exists.
-    if (! $error)
+    if (!$error)
     {
-    	$dirlist=dol_dir_list($destdir.'/class','files',0,'\.txt$');
-    	$alreadyfound=false;
-    	foreach($dirlist as $key => $val)
+    	$dirlist = dol_dir_list($destdir.'/class', 'files', 0, '\.txt$');
+    	$alreadyfound = false;
+    	foreach ($dirlist as $key => $val)
     	{
-    		$filefound=preg_replace('/\.txt$/','',$val['name']);
+    		$filefound = preg_replace('/\.txt$/', '', $val['name']);
     		if (strtolower($objectname) == strtolower($filefound) && $objectname != $filefound)
     		{
-    			$alreadyfound=true;
+    			$alreadyfound = true;
     			$error++;
     			setEventMessages($langs->trans("AnObjectAlreadyExistWithThisNameAndDiffCase"), null, 'errors');
     			break;
@@ -201,7 +201,7 @@ 
     	}
     }
 
-    if (! $error)
+    if (!$error)
     {
         // Delete some files
         $filetogenerate = array(
@@ -221,7 +221,7 @@ 
             'class/api_myobject.class.php'=>'class/api_'.strtolower($objectname).'.class.php'
         );
 
-        foreach($filetogenerate as $srcfile => $destfile)
+        foreach ($filetogenerate as $srcfile => $destfile)
         {
             $result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile, $newmask, 0);
             if ($result <= 0)
@@ -239,26 +239,26 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             	// Scan for object class files
             	$listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
 
-            	$firstobjectname='';
-            	foreach($listofobject as $fileobj)
+            	$firstobjectname = '';
+            	foreach ($listofobject as $fileobj)
             	{
-            		if (preg_match('/^api_/',$fileobj['name'])) continue;
-            		if (preg_match('/^actions_/',$fileobj['name'])) continue;
+            		if (preg_match('/^api_/', $fileobj['name'])) continue;
+            		if (preg_match('/^actions_/', $fileobj['name'])) continue;
 
-            		$tmpcontent=file_get_contents($fileobj['fullname']);
-            		if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims',$tmpcontent,$reg))
+            		$tmpcontent = file_get_contents($fileobj['fullname']);
+            		if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg))
             		{
             			$objectnameloop = $reg[1];
             			if (empty($firstobjectname)) $firstobjectname = $objectnameloop;
             		}
 
                 	// Regenerate left menu entry in descriptor for $objectname
-                	$stringtoadd="
+                	$stringtoadd = "
 \t\t\$this->menu[\$r++]=array(
                 				'fk_menu'=>'fk_mainmenu=mymodule',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'left',			                // This is a Left menu entry
@@ -290,7 +290,7 @@ 
                 	$stringtoadd = preg_replace('/mymodule/', strtolower($module), $stringtoadd);
                 	$stringtoadd = preg_replace('/myobject/', strtolower($objectnameloop), $stringtoadd);
 
-                	$moduledescriptorfile=$destdir.'/core/modules/mod'.$module.'.class.php';
+                	$moduledescriptorfile = $destdir.'/core/modules/mod'.$module.'.class.php';
 
                 	// TODO Allow a replace with regex using dolReplaceRegexInFile
                 	// TODO Avoid duplicate addition
@@ -298,22 +298,22 @@ 
                 	dolReplaceInFile($moduledescriptorfile, array('END MODULEBUILDER LEFTMENU MYOBJECT */' => '*/'."\n".$stringtoadd."\n\t\t/* END MODULEBUILDER LEFTMENU MYOBJECT */"));
 
 					// Add module descriptor to list of files to replace "MyObject' string with real name of object.
-                	$filetogenerate[]='core/modules/mod'.$module.'.class.php';
+                	$filetogenerate[] = 'core/modules/mod'.$module.'.class.php';
 
                 	// TODO
                 }
         }
     }
 
-    if (! $error)
+    if (!$error)
     {
         // Edit PHP files
-        foreach($filetogenerate as $destfile)
+        foreach ($filetogenerate as $destfile)
         {
             $phpfileval['fullname'] = $destdir.'/'.$destfile;
 
             //var_dump($phpfileval['fullname']);
-            $arrayreplacement=array(
+            $arrayreplacement = array(
                 'mymodule'=>strtolower($module),
                 'MyModule'=>$module,
                 'MYMODULE'=>strtoupper($module),
@@ -326,7 +326,7 @@ 
                 'MyObject'=>$objectname
             );
 
-            $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+            $result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
             //var_dump($result);
             if ($result < 0)
             {
@@ -335,26 +335,26 @@ 
         }
     }
 
-    if (! $error)
+    if (!$error)
     {
         // Edit the class file to write properties
-        $object=rebuildObjectClass($destdir, $module, $objectname, $newmask);
+        $object = rebuildObjectClass($destdir, $module, $objectname, $newmask);
         if (is_numeric($object) && $object < 0) $error++;
     }
-    if (! $error)
+    if (!$error)
     {
         // Edit sql with new properties
-        $result=rebuildObjectSql($destdir, $module, $objectname, $newmask, '', $object);
+        $result = rebuildObjectSql($destdir, $module, $objectname, $newmask, '', $object);
         if ($result < 0) $error++;
     }
 
-    if (! $error)
+    if (!$error)
     {
         setEventMessages($langs->trans('FilesForObjectInitialized', $objectname), null);
     }
 }
 
-if ($dirins && $action == 'addproperty' && !empty($module) && ! empty($tabobj))
+if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj))
 {
     $objectname = $tabobj;
 
@@ -363,35 +363,35 @@ 
     dol_mkdir($destdir);
 
     $addfieldentry = array(
-    	'name'=>GETPOST('propname','aZ09'),'label'=>GETPOST('proplabel','alpha'),'type'=>GETPOST('proptype','alpha'),
-    	'arrayofkeyval'=>GETPOST('proparrayofkeyval','none'),		// Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
-    	'visible'=>GETPOST('propvisible','int'),'enabled'=>GETPOST('propenabled','int'),
-    	'position'=>GETPOST('propposition','int'),'notnull'=>GETPOST('propnotnull','int'),'index'=>GETPOST('propindex','int'),'searchall'=>GETPOST('propsearchall','int'),
-    	'isameasure'=>GETPOST('propisameasure','int'), 'comment'=>GETPOST('propcomment','alpha'),'help'=>GETPOST('prophelp'));
+    	'name'=>GETPOST('propname', 'aZ09'), 'label'=>GETPOST('proplabel', 'alpha'), 'type'=>GETPOST('proptype', 'alpha'),
+    	'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'none'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
+    	'visible'=>GETPOST('propvisible', 'int'), 'enabled'=>GETPOST('propenabled', 'int'),
+    	'position'=>GETPOST('propposition', 'int'), 'notnull'=>GETPOST('propnotnull', 'int'), 'index'=>GETPOST('propindex', 'int'), 'searchall'=>GETPOST('propsearchall', 'int'),
+    	'isameasure'=>GETPOST('propisameasure', 'int'), 'comment'=>GETPOST('propcomment', 'alpha'), 'help'=>GETPOST('prophelp'));
 
-    if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
+    if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
     {
     	$addfieldentry['arrayofkeyval'] = dol_json_decode($addfieldentry['arrayofkeyval'], true);
     }
 
     // Edit the class file to write properties
-    if (! $error)
+    if (!$error)
     {
-    	$object=rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry);
+    	$object = rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry);
 		if (is_numeric($result) && $result <= 0) $error++;
     }
 
     // Edit sql with new properties
-    if (! $error)
+    if (!$error)
     {
-    	$result=rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object);
+    	$result = rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object);
 		if ($result <= 0)
 		{
 			$error++;
 		}
     }
 
-    if (! $error)
+    if (!$error)
     {
     	clearstatcache();
 
@@ -414,20 +414,20 @@ 
 	dol_mkdir($destdir);
 
 	// Edit the class file to write properties
-	if (! $error)
+	if (!$error)
 	{
-		$object=rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, array(), $propertykey);
+		$object = rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, array(), $propertykey);
 		if (is_numeric($object) && $object <= 0) $error++;
 	}
 
 	// Edit sql with new properties
-	if (! $error)
+	if (!$error)
 	{
-		$result=rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object);
+		$result = rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object);
 		if ($result <= 0) $error++;
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		clearstatcache();
 
@@ -449,9 +449,9 @@ 
         setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    if (! $error)
+    if (!$error)
     {
-        $modulelowercase=strtolower($module);
+        $modulelowercase = strtolower($module);
 
         // Dir for module
         $dir = $dirins.'/'.$modulelowercase;
@@ -482,10 +482,10 @@ 
         setEventMessages($langs->trans("SpaceOrSpecialCharAreNotAllowed"), null, 'errors');
     }
 
-    if (! $error)
+    if (!$error)
     {
-        $modulelowercase=strtolower($module);
-        $objectlowercase=strtolower($objectname);
+        $modulelowercase = strtolower($module);
+        $objectlowercase = strtolower($objectname);
 
         // Dir for module
         $dir = $dirins.'/'.$modulelowercase;
@@ -509,10 +509,10 @@ 
         );
 
         $resultko = 0;
-        foreach($filetogenerate as $filetodelete)
+        foreach ($filetogenerate as $filetodelete)
         {
             $resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1);
-            if (! $resulttmp) $resultko++;
+            if (!$resulttmp) $resultko++;
         }
 
         if ($resultko == 0)
@@ -534,23 +534,23 @@ 
 
 if ($dirins && $action == 'generatepackage')
 {
-    $modulelowercase=strtolower($module);
+    $modulelowercase = strtolower($module);
 
     // Dir for module
     $dir = $dirins.'/'.$modulelowercase;
     // Zip file to build
-    $FILENAMEZIP='';
+    $FILENAMEZIP = '';
 
     // Load module
     dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-    $class='mod'.$module;
+    $class = 'mod'.$module;
 
     if (class_exists($class))
     {
         try {
             $moduleobj = new $class($db);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $error++;
             dol_print_error($e->getMessage());
@@ -564,16 +564,16 @@ 
         exit;
     }
 
-    $arrayversion=explode('.',$moduleobj->version,3);
+    $arrayversion = explode('.', $moduleobj->version, 3);
     if (count($arrayversion))
     {
-        $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
+        $FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2] ? ".".$arrayversion[2] : "").".zip";
 
         $dirofmodule = dol_buildpath($modulelowercase, 0).'/bin';
         $outputfilezip = $dirofmodule.'/'.$FILENAMEZIP;
 		if ($dirofmodule)
 		{
-	        if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
+	        if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
 	        $result = dol_compress_dir($dir, $outputfilezip, 'zip');
 		}
 		else
@@ -602,23 +602,23 @@ 
 
 if ($dirins && $action == 'generatedoc')
 {
-	$modulelowercase=strtolower($module);
+	$modulelowercase = strtolower($module);
 
 	// Dir for module
 	$dir = $dirins.'/'.$modulelowercase;
 	// Zip file to build
-	$FILENAMEDOC='';
+	$FILENAMEDOC = '';
 
 	// Load module
 	dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-	$class='mod'.$module;
+	$class = 'mod'.$module;
 
 	if (class_exists($class))
 	{
 		try {
 			$moduleobj = new $class($db);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$error++;
 			dol_print_error($e->getMessage());
@@ -632,16 +632,16 @@ 
 		exit;
 	}
 
-	$arrayversion=explode('.',$moduleobj->version,3);
+	$arrayversion = explode('.', $moduleobj->version, 3);
 	if (count($arrayversion))
 	{
-		$FILENAMEDOC=$modulelowercase.'.html';
+		$FILENAMEDOC = $modulelowercase.'.html';
 
 		$dirofmodule = dol_buildpath($modulelowercase, 0).'/doc';
 		$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
 		if ($dirofmodule)
 		{
-			if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
+			if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
 			//...
 
 			$result = 0;
@@ -678,10 +678,10 @@ 
     if ($relofcustom)
     {
         // Check that relative path ($file) start with name 'custom'
-        if (! preg_match('/^'.$relofcustom.'/', $file)) $file=$relofcustom.'/'.$file;
+        if (!preg_match('/^'.$relofcustom.'/', $file)) $file = $relofcustom.'/'.$file;
 
-        $pathoffile=dol_buildpath($file, 0);
-        $pathoffilebackup=dol_buildpath($file.'.back', 0);
+        $pathoffile = dol_buildpath($file, 0);
+        $pathoffilebackup = dol_buildpath($file.'.back', 0);
 
         // Save old version
         if (dol_is_file($pathoffile))
@@ -689,7 +689,7 @@ 
             dol_copy($pathoffile, $pathoffilebackup, 0, 1);
         }
 
-        $content = GETPOST('editfilecontent','none');
+        $content = GETPOST('editfilecontent', 'none');
 
         // Save file on disk
         if ($content)
@@ -712,24 +712,24 @@ 
 // Enable module
 if ($action == 'set' && $user->admin)
 {
-	$param='';
-	if ($module) $param.='&module='.$module;
-	if ($tab)    $param.='&tab='.$tab;
-	if ($tabobj) $param.='&tabobj='.$tabobj;
+	$param = '';
+	if ($module) $param .= '&module='.$module;
+	if ($tab)    $param .= '&tab='.$tab;
+	if ($tabobj) $param .= '&tabobj='.$tabobj;
 
-	$value = GETPOST('value','alpha');
+	$value = GETPOST('value', 'alpha');
 	$resarray = activateModule($value);
-	if (! empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
+	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
 	else
 	{
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
-			$tmpsql="SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
-			$resqltmp=$db->query($tmpsql);
+			$tmpsql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."user WHERE admin <> 1";
+			$resqltmp = $db->query($tmpsql);
 			if ($resqltmp)
 			{
-				$obj=$db->fetch_object($resqltmp);
+				$obj = $db->fetch_object($resqltmp);
 				//var_dump($obj->nb);exit;
 				if ($obj && $obj->nb > 1)
 				{
@@ -747,13 +747,13 @@ 
 // Disable module
 if ($action == 'reset' && $user->admin)
 {
-	$param='';
-	if ($module) $param.='&module='.$module;
-	if ($tab)    $param.='&tab='.$tab;
-	if ($tabobj) $param.='&tabobj='.$tabobj;
+	$param = '';
+	if ($module) $param .= '&module='.$module;
+	if ($tab)    $param .= '&tab='.$tab;
+	if ($tabobj) $param .= '&tabobj='.$tabobj;
 
-	$value = GETPOST('value','alpha');
-	$result=unActivateModule($value);
+	$value = GETPOST('value', 'alpha');
+	$result = unActivateModule($value);
 	if ($result) setEventMessages($result, null, 'errors');
 	header("Location: ".$_SERVER["PHP_SELF"]."?".$param);
 	exit;
@@ -768,11 +768,11 @@ 
 $formadmin = new FormAdmin($db);
 
 // Set dir where external modules are installed
-if (! dol_is_dir($dirins))
+if (!dol_is_dir($dirins))
 {
     dol_mkdir($dirins);
 }
-$dirins_ok=(dol_is_dir($dirins));
+$dirins_ok = (dol_is_dir($dirins));
 
 llxHeader('', $langs->trans("ModuleBuilder"), '', '', 0, 0,
 	array(
@@ -783,20 +783,20 @@ 
 	), array());
 
 
-$text=$langs->trans("ModuleBuilder");
+$text = $langs->trans("ModuleBuilder");
 
 print load_fiche_titre($text, '', 'title_setup');
 
 // Search modules to edit
-$listofmodules=array();
+$listofmodules = array();
 
-$dirsincustom=dol_dir_list($dirread, 'directories');
+$dirsincustom = dol_dir_list($dirread, 'directories');
 if (is_array($dirsincustom) && count($dirsincustom) > 0) {
 	foreach ($dirsincustom as $dircustomcursor) {
 		$fullname = $dircustomcursor['fullname'];
-		if (dol_is_file($fullname . '/' . $FILEFLAG)) {
+		if (dol_is_file($fullname.'/'.$FILEFLAG)) {
 			// Get real name of module (MyModule instead of mymodule)
-			$descriptorfiles = dol_dir_list($fullname . '/core/modules/', 'files', 0, 'mod.*\.class\.php$');
+			$descriptorfiles = dol_dir_list($fullname.'/core/modules/', 'files', 0, 'mod.*\.class\.php$');
 			$modulenamewithcase = '';
 			foreach ($descriptorfiles as $descriptorcursor) {
 				$modulenamewithcase = preg_replace('/^mod/', '', $descriptorcursor['name']);
@@ -816,36 +816,36 @@ 
 }
 
 // Show description of content
-$newdircustom=$dirins;
-if (empty($newdircustom)) $newdircustom=img_warning();
+$newdircustom = $dirins;
+if (empty($newdircustom)) $newdircustom = img_warning();
 print $langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'<br>';
 print $langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'<br>';
 // If dirread was forced to somewhere else, by using URL
 // htdocs/modulebuilder/index.php?module=Inventory@/home/ldestailleur/git/dolibarr/htdocs/product
 if ($forceddirread) print $langs->trans("DirScanned").' : <strong>'.$dirread.'</strong><br>';
 
-$message='';
-if (! $dirins)
+$message = '';
+if (!$dirins)
 {
-    $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
-    $allowfromweb=-1;
+    $message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+    $allowfromweb = -1;
 }
 else
 {
     if ($dirins_ok)
     {
-        if (! is_writable(dol_osencode($dirins)))
+        if (!is_writable(dol_osencode($dirins)))
         {
             $langs->load("errors");
-            $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
-            $allowfromweb=0;
+            $message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins));
+            $allowfromweb = 0;
         }
     }
     else
     {
 
-        $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
-        $allowfromweb=0;
+        $message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
+        $allowfromweb = 0;
     }
 }
 if ($message)
@@ -858,23 +858,23 @@ 
 
 
 // Load module descriptor
-$error=0;
+$error = 0;
 $moduleobj = null;
 
-if (! empty($module) && $module != 'initmodule' && $module != 'deletemodule')
+if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 {
-	$modulelowercase=strtolower($module);
+	$modulelowercase = strtolower($module);
 
     // Load module
     dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-    $class='mod'.$module;
+    $class = 'mod'.$module;
 
     if (class_exists($class))
     {
         try {
             $moduleobj = new $class($db);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $error++;
             print $e->getMessage();
@@ -893,16 +893,16 @@ 
 
 // Tabs for all modules
 $head = array();
-$h=0;
+$h = 0;
 
 $head[$h][0] = $_SERVER["PHP_SELF"].'?module=initmodule';
 $head[$h][1] = $langs->trans("NewModule");
 $head[$h][2] = 'initmodule';
 $h++;
 
-foreach($listofmodules as $tmpmodule => $tmpmodulewithcase)
+foreach ($listofmodules as $tmpmodule => $tmpmodulewithcase)
 {
-    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase.($forceddirread?'@'.$dirread:'');
+    $head[$h][0] = $_SERVER["PHP_SELF"].'?module='.$tmpmodulewithcase.($forceddirread ? '@'.$dirread : '');
     $head[$h][1] = $tmpmodulewithcase;
     $head[$h][2] = $tmpmodulewithcase;
     $h++;
@@ -914,7 +914,7 @@ 
 $h++;
 
 
-dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic', 0, $infomodulesfound);	// Modules
+dol_fiche_head($head, $module, $langs->trans("Modules"), -1, 'generic', 0, $infomodulesfound); // Modules
 
 if ($module == 'initmodule')
 {
@@ -927,7 +927,7 @@ 
     print $langs->trans("EnterNameOfModuleDesc").'<br><br>';
 
     print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
-    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
+    print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
     print '</form>';
 }
 elseif ($module == 'deletemodule')
@@ -940,99 +940,99 @@ 
     print $langs->trans("EnterNameOfModuleToDeleteDesc").'<br><br>';
 
     print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
-    print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins?'':' disabled="disabled"').'>';
+    print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
     print '</form>';
 }
-elseif (! empty($module))
+elseif (!empty($module))
 {
 	// Tabs for module
-    if (! $error)
+    if (!$error)
     {
         $head2 = array();
-        $h=0;
+        $h = 0;
 
-        $modulelowercase=strtolower($module);
+        $modulelowercase = strtolower($module);
         $const_name = 'MAIN_MODULE_'.strtoupper($module);
 
-        $param='';
-        if ($tab) $param.= '&tab='.$tab;
-        if ($module) $param.='&module='.$module;
-        if ($tabobj) $param.='&tabobj='.$tabobj;
+        $param = '';
+        if ($tab) $param .= '&tab='.$tab;
+        if ($module) $param .= '&module='.$module;
+        if ($tabobj) $param .= '&tabobj='.$tabobj;
 
-        $urltomodulesetup='<a href="'.DOL_URL_ROOT.'/admin/modules.php?search_keyword='.urlencode($module).'">'.$langs->trans('Home').'-'.$langs->trans("Setup").'-'.$langs->trans("Modules").'</a>';
-        $linktoenabledisable='';
-        if (! empty($conf->global->$const_name))	// If module is already activated
+        $urltomodulesetup = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?search_keyword='.urlencode($module).'">'.$langs->trans('Home').'-'.$langs->trans("Setup").'-'.$langs->trans("Modules").'</a>';
+        $linktoenabledisable = '';
+        if (!empty($conf->global->$const_name))	// If module is already activated
         {
-        	$linktoenabledisable.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=reset&value=mod' . $module . $param . '">';
-        	$linktoenabledisable.=img_picto($langs->trans("Activated"),'switch_on');
-        	$linktoenabledisable.='</a>';
+        	$linktoenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=reset&value=mod'.$module.$param.'">';
+        	$linktoenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+        	$linktoenabledisable .= '</a>';
         }
         else
         {
-        	$linktoenabledisable.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod' . $module . $param . '">';
-        	$linktoenabledisable.=img_picto($langs->trans("Disabled"),'switch_off');
-        	$linktoenabledisable.="</a>\n";
+        	$linktoenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod'.$module.$param.'">';
+        	$linktoenabledisable .= img_picto($langs->trans("Disabled"), 'switch_off');
+        	$linktoenabledisable .= "</a>\n";
         }
-        if (! empty($conf->$modulelowercase->enabled))
+        if (!empty($conf->$modulelowercase->enabled))
         {
-        	$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
+        	$modulestatusinfo = img_warning().' '.$langs->trans("ModuleIsLive");
         }
         else
         {
-        	$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive", $urltomodulesetup);
+        	$modulestatusinfo = img_info('').' '.$langs->trans("ModuleIsNotActive", $urltomodulesetup);
         }
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Description");
         $head2[$h][2] = 'description';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=specifications&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=specifications&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Specifications");
         $head2[$h][2] = 'specifications';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=languages&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=languages&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Languages");
         $head2[$h][2] = 'languages';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Objects");
         $head2[$h][2] = 'objects';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Menus");
         $head2[$h][2] = 'menus';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Permissions");
         $head2[$h][2] = 'permissions';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=hooks&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=hooks&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Hooks");
         $head2[$h][2] = 'hooks';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=triggers&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Triggers");
         $head2[$h][2] = 'triggers';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=widgets&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=widgets&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("Widgets");
         $head2[$h][2] = 'widgets';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=cron&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=cron&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("CronList");
         $head2[$h][2] = 'cron';
         $h++;
 
-        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$module.($forceddirread?'@'.$dirread:'');
+        $head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=buildpackage&module='.$module.($forceddirread ? '@'.$dirread : '');
         $head2[$h][1] = $langs->trans("BuildPackage");
         $head2[$h][2] = 'buildpackage';
         $h++;
@@ -1049,20 +1049,20 @@ 
 
             if ($action != 'editfile' || empty($file))
             {
-        		dol_fiche_head($head2, $tab, '', -1, '');	// Description - level 2
+        		dol_fiche_head($head2, $tab, '', -1, ''); // Description - level 2
 
             	print $langs->trans("ModuleBuilderDesc".$tab).'<br><br>';
 
             	print '<span class="fa fa-file"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                 print '<br>';
 
                 print '<span class="fa fa-file"></span> '.$langs->trans("ReadmeFile").' : <strong>'.$pathtofilereadme.'</strong>';
-                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                 print '<br>';
 
                 print '<span class="fa fa-file"></span> '.$langs->trans("ChangeLog").' : <strong>'.$pathtochangelog.'</strong>';
-                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                 print '<br>';
 
                 print '<br>';
@@ -1070,7 +1070,7 @@ 
 
             	print_fiche_titre($langs->trans("DescriptorFile"));
 
-	            if (! empty($moduleobj))
+	            if (!empty($moduleobj))
 	            {
 	            	print '<div class="underbanner clearboth"></div>';
 	            	print '<div class="fichecenter">';
@@ -1160,7 +1160,7 @@ 
             }
         	else
         	{
-        		$fullpathoffile=dol_buildpath($file, 0, 1);	// Description - level 2
+        		$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
         		if ($fullpathoffile)
         		{
@@ -1177,8 +1177,8 @@ 
 
         		dol_fiche_head($head2, $tab, '', -1, '');
 
-        	    $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', '');
-        	    print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+        	    $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%', '');
+        	    print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
 
         	    dol_fiche_end();
 
@@ -1193,7 +1193,7 @@ 
         }
         else
         {
-        	dol_fiche_head($head2, $tab, '', -1, '');	// Level 2
+        	dol_fiche_head($head2, $tab, '', -1, ''); // Level 2
         }
 
 
@@ -1204,13 +1204,13 @@ 
             	print $langs->trans("SpecDefDesc").'<br>';
             	print '<br>';
 
-            	$specs=dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$');
+            	$specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$');
 
 	            foreach ($specs as $spec)
 	            {
 	            	$pathtofile = $modulelowercase.'/doc/'.$spec['relativename'];
-					$format='asciidoc';
-					if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+					$format = 'asciidoc';
+					if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown';
 	            	print '<span class="fa fa-file"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
 	                print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 	                print '<br>';
@@ -1222,7 +1222,7 @@ 
 
                 //print $langs->trans("UseAsciiDocFormat").'<br>';
 
-                $fullpathoffile=dol_buildpath($file, 0);
+                $fullpathoffile = dol_buildpath($file, 0);
 
         	    $content = file_get_contents($fullpathoffile);
 
@@ -1234,8 +1234,8 @@ 
                 print '<input type="hidden" name="tab" value="'.$tab.'">';
                 print '<input type="hidden" name="module" value="'.$module.'">';
 
-                $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+                $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
                 print '<br>';
                 print '<center>';
                 print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1268,7 +1268,7 @@ 
         		print '<br>';
         		print '<br>';
 
-        		$langfiles=dol_dir_list(dol_buildpath($modulelowercase.'/langs', 0), 'files', 1, '\.lang$');
+        		$langfiles = dol_dir_list(dol_buildpath($modulelowercase.'/langs', 0), 'files', 1, '\.lang$');
 
         		foreach ($langfiles as $langfile)
         		{
@@ -1284,7 +1284,7 @@ 
 
         		//print $langs->trans("UseAsciiDocFormat").'<br>';
 
-        		$fullpathoffile=dol_buildpath($file, 0);
+        		$fullpathoffile = dol_buildpath($file, 0);
 
         		$content = file_get_contents($fullpathoffile);
 
@@ -1296,8 +1296,8 @@ 
         		print '<input type="hidden" name="tab" value="'.$tab.'">';
         		print '<input type="hidden" name="module" value="'.$module.'">';
 
-        		$doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'text'));
+        		$doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'text'));
         		print '<br>';
         		print '<center>';
         		print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1312,12 +1312,12 @@ 
         if ($tab == 'objects')
         {
             $head3 = array();
-            $h=0;
+            $h = 0;
 
             // Dir for module
             $dir = $dirread.'/'.$modulelowercase.'/class';
 
-            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread?'@'.$dirread:'').'&tabobj=newobject';
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabobj=newobject';
             $head3[$h][1] = $langs->trans("NewObject");
             $head3[$h][2] = 'newobject';
             $h++;
@@ -1325,27 +1325,27 @@ 
             // Scan for object class files
             $listofobject = dol_dir_list($dir, 'files', 0, '\.class\.php$');
 
-            $firstobjectname='';
-            foreach($listofobject as $fileobj)
+            $firstobjectname = '';
+            foreach ($listofobject as $fileobj)
             {
-            	if (preg_match('/^api_/',$fileobj['name'])) continue;
-            	if (preg_match('/^actions_/',$fileobj['name'])) continue;
+            	if (preg_match('/^api_/', $fileobj['name'])) continue;
+            	if (preg_match('/^actions_/', $fileobj['name'])) continue;
 
-            	$tmpcontent=file_get_contents($fileobj['fullname']);
-            	if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims',$tmpcontent,$reg))
+            	$tmpcontent = file_get_contents($fileobj['fullname']);
+            	if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg))
             	{
 		        	//$objectname = preg_replace('/\.txt$/', '', $fileobj['name']);
             		$objectname = $reg[1];
 	                if (empty($firstobjectname)) $firstobjectname = $objectname;
 
-	            	$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread?'@'.$dirread:'').'&tabobj='.$objectname;
+	            	$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabobj='.$objectname;
     	            $head3[$h][1] = $objectname;
         	        $head3[$h][2] = $objectname;
             	    $h++;
             	}
             }
 
-            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread?'@'.$dirread:'').'&tabobj=deleteobject';
+            $head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabobj=deleteobject';
             $head3[$h][1] = $langs->trans("DangerZone");
             $head3[$h][2] = 'deleteobject';
             $h++;
@@ -1353,11 +1353,11 @@ 
             // If tabobj was not defined, then we check if there is one obj. If yes, we force on it, if no, we will show tab to create new objects.
             if ($tabobj == 'newobjectifnoobj')
             {
-                if ($firstobjectname) $tabobj=$firstobjectname;
+                if ($firstobjectname) $tabobj = $firstobjectname;
                 else $tabobj = 'newobject';
             }
 
-            dol_fiche_head($head3, $tabobj, '', -1, '');	// Level 3
+            dol_fiche_head($head3, $tabobj, '', -1, ''); // Level 3
 
             if ($tabobj == 'newobject')
             {
@@ -1371,7 +1371,7 @@ 
                 print $langs->trans("EnterNameOfObjectDesc").'<br><br>';
 
                 print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
-                print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
                 print '</form>';
             }
             elseif ($tabobj == 'deleteobject')
@@ -1386,7 +1386,7 @@ 
                 print $langs->trans("EnterNameOfObjectToDeleteDesc").'<br><br>';
 
                 print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
-                print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins?'':' disabled="disabled"').'>';
+                print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
                 print '</form>';
             }
             else
@@ -1394,8 +1394,8 @@ 
                 if ($action == 'deleteproperty')
                 {
                     $formconfirm = $form->formconfirm(
-                        $_SERVER["PHP_SELF"].'?propertykey='.urlencode(GETPOST('propertykey','alpha')).'&objectname='.urlencode($objectname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj),
-                        $langs->trans('Delete'), $langs->trans('ConfirmDeleteProperty', GETPOST('propertykey','alpha')), 'confirm_deleteproperty', '', 0, 1
+                        $_SERVER["PHP_SELF"].'?propertykey='.urlencode(GETPOST('propertykey', 'alpha')).'&objectname='.urlencode($objectname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj),
+                        $langs->trans('Delete'), $langs->trans('ConfirmDeleteProperty', GETPOST('propertykey', 'alpha')), 'confirm_deleteproperty', '', 0, 1
                         );
 
                     // Print form confirm
@@ -1434,38 +1434,38 @@ 
                         $realpathtopicto    = dol_buildpath($pathtopicto, 0, 1);
 
                         print '<div class="fichehalfleft">';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass?'':'<strike>').$pathtoclass.($realpathtoclass?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass ? '' : '<strike>').$pathtoclass.($realpathtoclass ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("ApiClassFile").' : <strong>'.($realpathtoapi?'':'<strike>').$pathtoapi.($realpathtoapi?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("ApiClassFile").' : <strong>'.($realpathtoapi ? '' : '<strike>').$pathtoapi.($realpathtoapi ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print ' &nbsp; <a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("TestClassFile").' : <strong>'.($realpathtophpunit?'':'<strike>').$pathtophpunit.($realpathtophpunit?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("TestClassFile").' : <strong>'.($realpathtophpunit ? '' : '<strike>').$pathtophpunit.($realpathtophpunit ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
 
                         print '<br>';
 
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForLib").' : <strong>'.($realpathtolib?'':'<strike>').$pathtolib.($realpathtodocument?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtolib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForLib").' : <strong>'.($realpathtolib ? '' : '<strike>').$pathtolib.($realpathtodocument ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForPicto").' : <strong>'.($realpathtopicto?'':'<strike>').$pathtopicto.($realpathtopicto?'':'</strike>').'</strong>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForPicto").' : <strong>'.($realpathtopicto ? '' : '<strike>').$pathtopicto.($realpathtopicto ? '' : '</strike>').'</strong>';
                         //print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtopicto).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
 
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("SqlFile").' : <strong>'.($realpathtosql?'':'<strike>').$pathtosql.($realpathtosql?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=sql&file='.urlencode($pathtosql).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("SqlFile").' : <strong>'.($realpathtosql ? '' : '<strike>').$pathtosql.($realpathtosql ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=sql&file='.urlencode($pathtosql).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("DropTableIfEmpty").'</a>';
                         //print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("SqlFileExtraFields").' : <strong>'.($realpathtosqlextra?'':'<strike>').$pathtosqlextra.($realpathtosqlextra?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("SqlFileExtraFields").' : <strong>'.($realpathtosqlextra ? '' : '<strike>').$pathtosqlextra.($realpathtosqlextra ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         //print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("SqlFileKey").' : <strong>'.($realpathtosqlkey?'':'<strike>').$pathtosqlkey.($realpathtosqlkey?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=sql&file='.urlencode($pathtosqlkey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("SqlFileKey").' : <strong>'.($realpathtosqlkey ? '' : '<strike>').$pathtosqlkey.($realpathtosqlkey ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=sql&file='.urlencode($pathtosqlkey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         //print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
                         print '<br>';
 
@@ -1476,20 +1476,20 @@ 
                         $urlofcard = dol_buildpath($pathtocard, 1);
 
                         print '<div class="fichehalfleft">';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtosql?'':'<strike>').$pathtolist.($realpathtosql?'':'</strike>').'</a></strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtosql ? '' : '<strike>').$pathtolist.($realpathtosql ? '' : '</strike>').'</a></strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForCreateEditView").' : <strong><a href="'.$urlofcard.'?action=create" target="_test">'.($realpathtocard?'':'<strike>').$pathtocard.($realpathtocard?'':'</strike>').'?action=create</a></strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtocard).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForCreateEditView").' : <strong><a href="'.$urlofcard.'?action=create" target="_test">'.($realpathtocard ? '' : '<strike>').$pathtocard.($realpathtocard ? '' : '</strike>').'?action=create</a></strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtocard).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda?'':'<strike>').$pathtoagenda.($realpathtoagenda?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda ? '' : '<strike>').$pathtoagenda.($realpathtoagenda ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument?'':'<strike>').$pathtodocument.($realpathtodocument?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument ? '' : '<strike>').$pathtodocument.($realpathtodocument ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
-                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote?'':'<strike>').$pathtonote.($realpathtonote?'':'</strike>').'</strong>';
-                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+                        print '<span class="fa fa-file"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote ? '' : '<strike>').$pathtonote.($realpathtonote ? '' : '</strike>').'</strong>';
+                        print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
                         print '<br>';
 
                         print '<br>';
@@ -1511,17 +1511,17 @@ 
                         	try {
                         		$tmpobjet = @new $tabobj($db);
                         	}
-                        	catch(Exception $e)
+                        	catch (Exception $e)
                         	{
                         		dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING);
                         	}
                         }
 
-                        if (! empty($tmpobjet))
+                        if (!empty($tmpobjet))
                         {
 	                        $reflector = new ReflectionClass($tabobj);
-	                        $properties = $reflector->getProperties();          // Can also use get_object_vars
-	                        $propdefault = $reflector->getDefaultProperties();  // Can also use get_object_vars
+	                        $properties = $reflector->getProperties(); // Can also use get_object_vars
+	                        $propdefault = $reflector->getDefaultProperties(); // Can also use get_object_vars
 	                        //$propstat = $reflector->getStaticProperties();
 
 	                        print load_fiche_titre($langs->trans("Properties"), '', '');
@@ -1531,7 +1531,7 @@ 
 	                        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	                        print '<input type="hidden" name="action" value="addproperty">';
 	                        print '<input type="hidden" name="tab" value="objects">';
-	                        print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module.($forceddirread?'@'.$dirread:'')).'">';
+	                        print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module.($forceddirread ? '@'.$dirread : '')).'">';
 	                        print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
 
 		            		print '<div class="div-table-responsive">';
@@ -1559,28 +1559,28 @@ 
 
 	                        $properties = dol_sort_array($tmpobjet->fields, 'position');
 
-	                        if (! empty($properties))
+	                        if (!empty($properties))
 	                        {
 		                        // Line to add a property
 		                        print '<tr>';
-		                        print '<td><input class="text" name="propname" value="'.dol_escape_htmltag(GETPOST('propname','alpha')).'"></td>';
-		                        print '<td><input class="text" name="proplabel" value="'.dol_escape_htmltag(GETPOST('proplabel','alpha')).'"></td>';
-		                        print '<td><input class="text" name="proptype" value="'.dol_escape_htmltag(GETPOST('proptype','alpha')).'"></td>';
-		                        print '<td><input class="text" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval','none')).'"></td>';
-		                        print '<td class="center"><input class="text" size="2" name="propnotnull" value="'.dol_escape_htmltag(GETPOST('propnotnull','alpha')).'"></td>';
+		                        print '<td><input class="text" name="propname" value="'.dol_escape_htmltag(GETPOST('propname', 'alpha')).'"></td>';
+		                        print '<td><input class="text" name="proplabel" value="'.dol_escape_htmltag(GETPOST('proplabel', 'alpha')).'"></td>';
+		                        print '<td><input class="text" name="proptype" value="'.dol_escape_htmltag(GETPOST('proptype', 'alpha')).'"></td>';
+		                        print '<td><input class="text" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval', 'none')).'"></td>';
+		                        print '<td class="center"><input class="text" size="2" name="propnotnull" value="'.dol_escape_htmltag(GETPOST('propnotnull', 'alpha')).'"></td>';
 		                        //print '<td><input class="text" name="propdefault" value=""></td>';
-		                        print '<td class="center"><input class="text" size="2" name="propindex" value="'.dol_escape_htmltag(GETPOST('propindex','alpha')).'"></td>';
-		                        print '<td class="right"><input class="text right" size="2" name="propposition" value="'.dol_escape_htmltag(GETPOST('propposition','alpha')).'"></td>';
-		                        print '<td class="center"><input class="text" size="2" name="propenabled" value="'.dol_escape_htmltag(GETPOST('propenabled','alpha')).'"></td>';
-		                        print '<td class="center"><input class="text" size="2" name="propvisible" value="'.dol_escape_htmltag(GETPOST('propvisible','alpha')).'"></td>';
-		                        print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure','alpha')).'"></td>';
-		                        print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall','alpha')).'"></td>';
-		                        print '<td><input class="text" name="propcomment" value="'.dol_escape_htmltag(GETPOST('propcomment','alpha')).'"></td>';
+		                        print '<td class="center"><input class="text" size="2" name="propindex" value="'.dol_escape_htmltag(GETPOST('propindex', 'alpha')).'"></td>';
+		                        print '<td class="right"><input class="text right" size="2" name="propposition" value="'.dol_escape_htmltag(GETPOST('propposition', 'alpha')).'"></td>';
+		                        print '<td class="center"><input class="text" size="2" name="propenabled" value="'.dol_escape_htmltag(GETPOST('propenabled', 'alpha')).'"></td>';
+		                        print '<td class="center"><input class="text" size="2" name="propvisible" value="'.dol_escape_htmltag(GETPOST('propvisible', 'alpha')).'"></td>';
+		                        print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
+		                        print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>';
+		                        print '<td><input class="text" name="propcomment" value="'.dol_escape_htmltag(GETPOST('propcomment', 'alpha')).'"></td>';
 		                        print '<td align="center">';
 		                        print '<input class="button" type="submit" name="add" value="'.$langs->trans("Add").'">';
 		                        print '</td></tr>';
 
-		                        foreach($properties as $propkey => $propval)
+		                        foreach ($properties as $propkey => $propval)
 		                        {
 		                            /* If from Reflection
 		                            if ($propval->class == $tabobj)
@@ -1596,19 +1596,19 @@ 
 		                                if (in_array($propname, array('fk_element', 'lines'))) continue;
 		                            }*/
 
-		                            $propname=$propkey;
-		                            $proplabel=$propval['label'];
-		                            $proptype=$propval['type'];
-		                            $proparrayofkeyval=$propval['arrayofkeyval'];
-		                            $propnotnull=$propval['notnull'];
-		                            $propsearchall=$propval['searchall'];
+		                            $propname = $propkey;
+		                            $proplabel = $propval['label'];
+		                            $proptype = $propval['type'];
+		                            $proparrayofkeyval = $propval['arrayofkeyval'];
+		                            $propnotnull = $propval['notnull'];
+		                            $propsearchall = $propval['searchall'];
 		                            //$propdefault=$propval['default'];
-		                            $propindex=$propval['index'];
-		                            $propposition=$propval['position'];
-		                            $propenabled=$propval['enabled'];
-		                            $propvisible=$propval['visible'];
-		                            $propisameasure=$propval['isameasure'];
-		                            $propcomment=$propval['comment'];
+		                            $propindex = $propval['index'];
+		                            $propposition = $propval['position'];
+		                            $propenabled = $propval['enabled'];
+		                            $propvisible = $propval['visible'];
+		                            $propisameasure = $propval['isameasure'];
+		                            $propcomment = $propval['comment'];
 
 		                            print '<tr class="oddeven">';
 
@@ -1634,22 +1634,22 @@ 
 		                            print $propdefault;
 		                            print '</td>';*/
 		                            print '<td class="center">';
-		                            print $propindex?'X':'';
+		                            print $propindex ? 'X' : '';
 		                            print '</td>';
 		                            print '<td align="right">';
 		                            print $propposition;
 		                            print '</td>';
 		                            print '<td class="center">';
-		                            print $propenabled?$propenabled:'';
+		                            print $propenabled ? $propenabled : '';
 		                            print '</td>';
 		                            print '<td class="center">';
-		                            print $propvisible?$propvisible:'';
+		                            print $propvisible ? $propvisible : '';
 		                            print '</td>';
 		                            print '<td class="center">';
-		                            print $propisameasure?$propisameasure:'';
+		                            print $propisameasure ? $propisameasure : '';
 		                            print '</td>';
 		                            print '<td class="center">';
-		                            print $propsearchall?'X':'';
+		                            print $propsearchall ? 'X' : '';
 		                            print '</td>';
 		                            print '<td>';
 		                            print $propcomment;
@@ -1675,7 +1675,7 @@ 
 	                     	print '<tr><td><span class="warning">'.$langs->trans('Failed to init the object with the new.').'</warning></td></tr>';
 	                    }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
                         print $e->getMessage();
                     }
@@ -1684,11 +1684,11 @@ 
                 {
                 	if (empty($forceddirread))
                 	{
-                		$fullpathoffile=dol_buildpath($file, 0);
+                		$fullpathoffile = dol_buildpath($file, 0);
                 	}
                 	else
                 	{
-                		$fullpathoffile=$dirread.'/'.$file;
+                		$fullpathoffile = $dirread.'/'.$file;
                 	}
 
                     $content = file_get_contents($fullpathoffile);
@@ -1700,10 +1700,10 @@ 
                     print '<input type="hidden" name="file" value="'.dol_escape_htmltag($file).'">';
                     print '<input type="hidden" name="tab" value="'.$tab.'">';
             		print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
-                    print '<input type="hidden" name="module" value="'.$module.($forceddirread?'@'.$dirread:'').'">';
+                    print '<input type="hidden" name="module" value="'.$module.($forceddirread ? '@'.$dirread : '').'">';
 
-                    $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-                    print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+                    $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+                    print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
                     print '<br>';
                     print '<center>';
                     print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1715,7 +1715,7 @@ 
                 }
             }
 
-            dol_fiche_end();	// Level 3
+            dol_fiche_end(); // Level 3
         }
 
         if ($tab == 'menus')
@@ -1817,7 +1817,7 @@ 
         	}
         	else
         	{
-        		$fullpathoffile=dol_buildpath($file, 0);
+        		$fullpathoffile = dol_buildpath($file, 0);
 
         		$content = file_get_contents($fullpathoffile);
 
@@ -1829,8 +1829,8 @@ 
         		print '<input type="hidden" name="tab" value="'.$tab.'">';
         		print '<input type="hidden" name="module" value="'.$module.'">';
 
-        		$doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+        		$doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
         		print '<br>';
         		print '<center>';
         		print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1942,7 +1942,7 @@ 
         	}
         	else
         	{
-        		$fullpathoffile=dol_buildpath($file, 0);
+        		$fullpathoffile = dol_buildpath($file, 0);
 
         		$content = file_get_contents($fullpathoffile);
 
@@ -1954,8 +1954,8 @@ 
         		print '<input type="hidden" name="tab" value="'.$tab.'">';
         		print '<input type="hidden" name="module" value="'.$module.'">';
 
-        		$doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+        		$doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
         		print '<br>';
         		print '<center>';
         		print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1986,7 +1986,7 @@ 
 			}
 			else
 			{
-        	    $fullpathoffile=dol_buildpath($file, 0);
+        	    $fullpathoffile = dol_buildpath($file, 0);
 
         	    $content = file_get_contents($fullpathoffile);
 
@@ -1998,8 +1998,8 @@ 
 			    print '<input type="hidden" name="tab" value="'.$tab.'">';
 			    print '<input type="hidden" name="module" value="'.$module.'">';
 
-			    $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+			    $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
                 print '<br>';
                 print '<center>';
                 print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -2023,7 +2023,7 @@ 
 				print $langs->trans("TriggerDefDesc").'<br>';
 				print '<br>';
 
-				if (! empty($triggers))
+				if (!empty($triggers))
 				{
 	    			foreach ($triggers as $trigger)
 	    			{
@@ -2041,7 +2041,7 @@ 
 			}
 			else
 			{
-        	    $fullpathoffile=dol_buildpath($file, 0);
+        	    $fullpathoffile = dol_buildpath($file, 0);
 
         	    $content = file_get_contents($fullpathoffile);
 
@@ -2053,8 +2053,8 @@ 
 			    print '<input type="hidden" name="tab" value="'.$tab.'">';
 			    print '<input type="hidden" name="module" value="'.$module.'">';
 
-			    $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+			    $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
                 print '<br>';
                 print '<center>';
                 print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -2074,7 +2074,7 @@ 
 
 			if ($action != 'editfile' || empty($file))
 			{
-				if (! empty($widget))
+				if (!empty($widget))
 				{
 	    			foreach ($widgets as $widget)
 	    			{
@@ -2092,7 +2092,7 @@ 
 			}
 			else
 			{
-        	    $fullpathoffile=dol_buildpath($file, 0);
+        	    $fullpathoffile = dol_buildpath($file, 0);
 
         	    $content = file_get_contents($fullpathoffile);
 
@@ -2104,8 +2104,8 @@ 
 			    print '<input type="hidden" name="tab" value="'.$tab.'">';
 			    print '<input type="hidden" name="module" value="'.$module.'">';
 
-			    $doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+			    $doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+                print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
                 print '<br>';
                 print '<center>';
                 print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -2146,11 +2146,11 @@ 
         		print '<table class="noborder">';
 
         		print '<tr class="liste_titre">';
-        		print_liste_field_titre("CronLabel",$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
-        		print_liste_field_titre("CronTask",'','',"",$param,'',$sortfield,$sortorder);
-        		print_liste_field_titre("CronFrequency",'',"","",$param,'',$sortfield,$sortorder);
-        		print_liste_field_titre("StatusAtInstall",$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
-        		print_liste_field_titre("Comment",$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
+        		print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder);
+        		print_liste_field_titre("CronTask", '', '', "", $param, '', $sortfield, $sortorder);
+        		print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);
+        		print_liste_field_titre("StatusAtInstall", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder);
+        		print_liste_field_titre("Comment", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder);
         		print "</tr>\n";
 
         		if (count($cronjobs))
@@ -2164,31 +2164,31 @@ 
 	        			print '</td>';
 
 	        			print '<td>';
-	        			if ($cron['jobtype']=='method')
+	        			if ($cron['jobtype'] == 'method')
 	        			{
-	        				$text=$langs->trans("CronClass");
-	        				$texttoshow=$langs->trans('CronModule').': '.$module.'<br>';
-	        				$texttoshow.=$langs->trans('CronClass').': '. $cron['class'].'<br>';
-	        				$texttoshow.=$langs->trans('CronObject').': '. $cron['objectname'].'<br>';
-	        				$texttoshow.=$langs->trans('CronMethod').': '. $cron['method'];
-	        				$texttoshow.='<br>'.$langs->trans('CronArgs').': '. $cron['parameters'];
-	        				$texttoshow.='<br>'.$langs->trans('Comment').': '. $langs->trans($cron['comment']);
+	        				$text = $langs->trans("CronClass");
+	        				$texttoshow = $langs->trans('CronModule').': '.$module.'<br>';
+	        				$texttoshow .= $langs->trans('CronClass').': '.$cron['class'].'<br>';
+	        				$texttoshow .= $langs->trans('CronObject').': '.$cron['objectname'].'<br>';
+	        				$texttoshow .= $langs->trans('CronMethod').': '.$cron['method'];
+	        				$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$cron['parameters'];
+	        				$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($cron['comment']);
 	        			}
-	        			elseif ($cron['jobtype']=='command')
+	        			elseif ($cron['jobtype'] == 'command')
 	        			{
-	        				$text=$langs->trans('CronCommand');
-	        				$texttoshow=$langs->trans('CronCommand').': '.dol_trunc($cron['command']);
-	        				$texttoshow.='<br>'.$langs->trans('CronArgs').': '. $cron['parameters'];
-	        				$texttoshow.='<br>'.$langs->trans('Comment').': '. $langs->trans($cron['comment']);
+	        				$text = $langs->trans('CronCommand');
+	        				$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($cron['command']);
+	        				$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$cron['parameters'];
+	        				$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($cron['comment']);
 	        			}
 	        			print $form->textwithpicto($text, $texttoshow, 1);
 	        			print '</td>';
 
 	        			print '<td>';
-	        			if($cron['unitfrequency'] == "60") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Minutes');
-	        			if($cron['unitfrequency'] == "3600") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Hours');
-	        			if($cron['unitfrequency'] == "86400") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Days');
-	        			if($cron['unitfrequency'] == "604800") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Weeks');
+	        			if ($cron['unitfrequency'] == "60") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Minutes');
+	        			if ($cron['unitfrequency'] == "3600") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Hours');
+	        			if ($cron['unitfrequency'] == "86400") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Days');
+	        			if ($cron['unitfrequency'] == "604800") print $langs->trans('CronEach')." ".($cron['frequency'])." ".$langs->trans('Weeks');
 	        			print '</td>';
 
 	        			print '<td>';
@@ -2196,7 +2196,7 @@ 
 	        			print '</td>';
 
 	        			print '<td>';
-	        			if (!empty($cron['comment'])) {print $cron['comment'];}
+	        			if (!empty($cron['comment'])) {print $cron['comment']; }
 	        			print '</td>';
 
 	        			print '</tr>';
@@ -2214,7 +2214,7 @@ 
         	}
         	else
         	{
-        		$fullpathoffile=dol_buildpath($file, 0);
+        		$fullpathoffile = dol_buildpath($file, 0);
 
         		$content = file_get_contents($fullpathoffile);
 
@@ -2226,8 +2226,8 @@ 
         		print '<input type="hidden" name="tab" value="'.$tab.'">';
         		print '<input type="hidden" name="module" value="'.$module.'">';
 
-        		$doleditor=new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
-        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format','aZ09')?GETPOST('format','aZ09'):'html'));
+        		$doleditor = new DolEditor('editfilecontent', $content, '', '300', 'Full', 'In', true, false, 'ace', 0, '99%');
+        		print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
         		print '<br>';
         		print '<center>';
         		print '<input type="submit" class="button buttonforacesave" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -2241,27 +2241,27 @@ 
 
         if ($tab == 'buildpackage')
         {
-            if (! class_exists('ZipArchive') && ! defined('ODTPHP_PATHTOPCLZIP'))
+            if (!class_exists('ZipArchive') && !defined('ODTPHP_PATHTOPCLZIP'))
             {
                 print img_warning().' '.$langs->trans("ErrNoZipEngine");
                 print '<br>';
             }
 
-            $modulelowercase=strtolower($module);
+            $modulelowercase = strtolower($module);
 
             // Zip file to build
-            $FILENAMEZIP='';
+            $FILENAMEZIP = '';
 
             // Load module
             dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-            $class='mod'.$module;
+            $class = 'mod'.$module;
 
             if (class_exists($class))
             {
                 try {
                     $moduleobj = new $class($db);
                 }
-                catch(Exception $e)
+                catch (Exception $e)
                 {
                     $error++;
                     dol_print_error($e->getMessage());
@@ -2275,20 +2275,20 @@ 
                 exit;
             }
 
-            $arrayversion=explode('.',$moduleobj->version,3);
+            $arrayversion = explode('.', $moduleobj->version, 3);
             if (count($arrayversion))
             {
-                $FILENAMEZIP="module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2]?".".$arrayversion[2]:"").".zip";
+                $FILENAMEZIP = "module_".$modulelowercase.'-'.$arrayversion[0].'.'.$arrayversion[1].($arrayversion[2] ? ".".$arrayversion[2] : "").".zip";
                 $outputfilezip = dol_buildpath($modulelowercase, 0).'/bin/'.$FILENAMEZIP;
 
-                $FILENAMEDOC=$modulelowercase.'.html';
+                $FILENAMEDOC = $modulelowercase.'.html';
                 $outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC;
             }
 
             print '<br>';
 
-            print '<span class="fa fa-file"></span> '. $langs->trans("PathToModulePackage") . ' : ';
-            if (! dol_is_file($outputfilezip)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
+            print '<span class="fa fa-file"></span> '.$langs->trans("PathToModulePackage").' : ';
+            if (!dol_is_file($outputfilezip)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
             else {
             	$relativepath = $modulelowercase.'/bin/'.$FILENAMEZIP;
                 print '<strong><a href="'.DOL_URL_ROOT.'/document.php?modulepart=packages&file='.urlencode($relativepath).'">'.$outputfilezip.'</a></strong>';
@@ -2307,8 +2307,8 @@ 
 
         	print '<br><br><br>';
 
-            print '<span class="fa fa-file"></span> '. $langs->trans("PathToModuleDocumentation") . ' : ';
-            if (! dol_is_file($outputfiledoc)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
+            print '<span class="fa fa-file"></span> '.$langs->trans("PathToModuleDocumentation").' : ';
+            if (!dol_is_file($outputfiledoc)) print '<strong>'.$langs->trans("FileNotYetGenerated").'</strong>';
             else {
                 print '<strong>'.$outputfiledoc.'</strong>';
                 print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')';