alxarafe / alixar

dolibarr/htdocs/core/filemanagerdol/connectors/php/util.php

Indentation +117 added lines, -117 removed lines

@@ -31,8 +31,8 @@ 
  */
 function RemoveFromStart($sourceString, $charToRemove)
 {
-	$sPattern = '|^' . $charToRemove . '+|' ;
-	return preg_replace($sPattern, '', $sourceString);
+    $sPattern = '|^' . $charToRemove . '+|' ;
+    return preg_replace($sPattern, '', $sourceString);
 }
 
 /**
@@ -44,8 +44,8 @@ 
  */
 function RemoveFromEnd($sourceString, $charToRemove)
 {
-	$sPattern = '|' . $charToRemove . '+$|' ;
-	return preg_replace($sPattern, '', $sourceString);
+    $sPattern = '|' . $charToRemove . '+$|' ;
+    return preg_replace($sPattern, '', $sourceString);
 }
 
 /**
@@ -56,24 +56,24 @@ 
  */
 function FindBadUtf8($string)
 {
-	$regex = '([\x00-\x7F]'.
-	'|[\xC2-\xDF][\x80-\xBF]'.
-	'|\xE0[\xA0-\xBF][\x80-\xBF]'.
-	'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
-	'|\xED[\x80-\x9F][\x80-\xBF]'.
-	'|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
-	'|[\xF1-\xF3][\x80-\xBF]{3}'.
-	'|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
-	'|(.{1}))';
-
-	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if ( isset($matches[2])) {
-			return true;
-		}
-		$string = substr($string, strlen($matches[0]));
-	}
-
-	return false;
+    $regex = '([\x00-\x7F]'.
+    '|[\xC2-\xDF][\x80-\xBF]'.
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
+    '|\xED[\x80-\x9F][\x80-\xBF]'.
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
+    '|(.{1}))';
+
+    while (preg_match('/'.$regex.'/S', $string, $matches)) {
+        if ( isset($matches[2])) {
+            return true;
+        }
+        $string = substr($string, strlen($matches[0]));
+    }
+
+    return false;
 }
 
 /**
@@ -84,23 +84,23 @@ 
  */
 function ConvertToXmlAttribute( $value )
 {
-	if ( defined('PHP_OS') )
-	{
-		$os = PHP_OS ;
-	}
-	else
-	{
-		$os = php_uname();
-	}
-
-	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
-	{
-		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
-	{
-		return (htmlspecialchars($value));
-	}
+    if ( defined('PHP_OS') )
+    {
+        $os = PHP_OS ;
+    }
+    else
+    {
+        $os = php_uname();
+    }
+
+    if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
+    {
+        return (utf8_encode(htmlspecialchars($value)));
+    }
+    else
+    {
+        return (htmlspecialchars($value));
+    }
 }
 
 /**
@@ -112,16 +112,16 @@ 
  */
 function IsHtmlExtension( $ext, $formExtensions )
 {
-	if (!$formExtensions || !is_array($formExtensions) )
-	{
-		return false ;
-	}
-	$lcaseHtmlExtensions = array();
-	foreach ( $formExtensions as $key => $val )
-	{
-		$lcaseHtmlExtensions[$key] = strtolower($val);
-	}
-	return in_array($ext, $lcaseHtmlExtensions);
+    if (!$formExtensions || !is_array($formExtensions) )
+    {
+        return false ;
+    }
+    $lcaseHtmlExtensions = array();
+    foreach ( $formExtensions as $key => $val )
+    {
+        $lcaseHtmlExtensions[$key] = strtolower($val);
+    }
+    return in_array($ext, $lcaseHtmlExtensions);
 }
 
 /**
@@ -134,63 +134,63 @@ 
  */
 function DetectHtml( $filePath )
 {
-	$fp = @fopen($filePath, 'rb');
-
-	//open_basedir restriction, see #1906
-	if ( $fp === false || !flock($fp, LOCK_SH) )
-	{
-		return -1 ;
-	}
-
-	$chunk = fread($fp, 1024);
-	flock($fp, LOCK_UN);
-	fclose($fp);
-
-	$chunk = strtolower($chunk);
-
-	if (!$chunk)
-	{
-		return false ;
-	}
-
-	$chunk = trim($chunk);
-
-	if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
-	{
-		return true;
-	}
-
-	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
-
-	foreach( $tags as $tag )
-	{
-		if( false !== strpos($chunk, $tag) )
-		{
-			return true ;
-		}
-	}
-
-	//type = javascript
-	if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	//href = javascript
-	//src = javascript
-	//data = javascript
-	if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	//url(javascript
-	if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
-	{
-		return true ;
-	}
-
-	return false ;
+    $fp = @fopen($filePath, 'rb');
+
+    //open_basedir restriction, see #1906
+    if ( $fp === false || !flock($fp, LOCK_SH) )
+    {
+        return -1 ;
+    }
+
+    $chunk = fread($fp, 1024);
+    flock($fp, LOCK_UN);
+    fclose($fp);
+
+    $chunk = strtolower($chunk);
+
+    if (!$chunk)
+    {
+        return false ;
+    }
+
+    $chunk = trim($chunk);
+
+    if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+    {
+        return true;
+    }
+
+    $tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+
+    foreach( $tags as $tag )
+    {
+        if( false !== strpos($chunk, $tag) )
+        {
+            return true ;
+        }
+    }
+
+    //type = javascript
+    if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    //href = javascript
+    //src = javascript
+    //data = javascript
+    if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    //url(javascript
+    if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+    {
+        return true ;
+    }
+
+    return false ;
 }
 
 /**
@@ -204,11 +204,11 @@ 
  */
 function IsImageValid( $filePath, $extension )
 {
-	if (!@is_readable($filePath)) {
-		return -1;
-	}
+    if (!@is_readable($filePath)) {
+        return -1;
+    }
 
-	$imageCheckExtensions = array(
+    $imageCheckExtensions = array(
         'gif',
         'jpeg',
         'jpg',
@@ -228,14 +228,14 @@ 
         'wbmp'
     );
 
-	if (!in_array($extension, $imageCheckExtensions) ) {
-		return true;
-	}
+    if (!in_array($extension, $imageCheckExtensions) ) {
+        return true;
+    }
 
-	if (@getimagesize($filePath) === false) {
-		return false ;
-	}
+    if (@getimagesize($filePath) === false) {
+        return false ;
+    }
 
-	return true;
+    return true;
 }
 

Spacing +29 added lines, -29 removed lines

@@ -31,7 +31,7 @@ 
  */
 function RemoveFromStart($sourceString, $charToRemove)
 {
-	$sPattern = '|^' . $charToRemove . '+|' ;
+	$sPattern = '|^'.$charToRemove.'+|';
 	return preg_replace($sPattern, '', $sourceString);
 }
 
@@ -44,7 +44,7 @@ 
  */
 function RemoveFromEnd($sourceString, $charToRemove)
 {
-	$sPattern = '|' . $charToRemove . '+$|' ;
+	$sPattern = '|'.$charToRemove.'+$|';
 	return preg_replace($sPattern, '', $sourceString);
 }
 
@@ -67,7 +67,7 @@ 
 	'|(.{1}))';
 
 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if ( isset($matches[2])) {
+		if (isset($matches[2])) {
 			return true;
 		}
 		$string = substr($string, strlen($matches[0]));
@@ -82,11 +82,11 @@ 
  * @param 	string		$value		Value
  * @return	string
  */
-function ConvertToXmlAttribute( $value )
+function ConvertToXmlAttribute($value)
 {
-	if ( defined('PHP_OS') )
+	if (defined('PHP_OS'))
 	{
-		$os = PHP_OS ;
+		$os = PHP_OS;
 	}
 	else
 	{
@@ -110,14 +110,14 @@ 
  * @param 	array 		$formExtensions		Array of extensions
  * @return 	boolean
  */
-function IsHtmlExtension( $ext, $formExtensions )
+function IsHtmlExtension($ext, $formExtensions)
 {
-	if (!$formExtensions || !is_array($formExtensions) )
+	if (!$formExtensions || !is_array($formExtensions))
 	{
-		return false ;
+		return false;
 	}
 	$lcaseHtmlExtensions = array();
-	foreach ( $formExtensions as $key => $val )
+	foreach ($formExtensions as $key => $val)
 	{
 		$lcaseHtmlExtensions[$key] = strtolower($val);
 	}
@@ -132,14 +132,14 @@ 
  * @param string $filePath absolute path to file
  * @return boolean
  */
-function DetectHtml( $filePath )
+function DetectHtml($filePath)
 {
 	$fp = @fopen($filePath, 'rb');
 
 	//open_basedir restriction, see #1906
-	if ( $fp === false || !flock($fp, LOCK_SH) )
+	if ($fp === false || !flock($fp, LOCK_SH))
 	{
-		return -1 ;
+		return -1;
 	}
 
 	$chunk = fread($fp, 1024);
@@ -150,47 +150,47 @@ 
 
 	if (!$chunk)
 	{
-		return false ;
+		return false;
 	}
 
 	$chunk = trim($chunk);
 
-	if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk))
 	{
 		return true;
 	}
 
-	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+	$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
 
-	foreach( $tags as $tag )
+	foreach ($tags as $tag)
 	{
-		if( false !== strpos($chunk, $tag) )
+		if (false !== strpos($chunk, $tag))
 		{
-			return true ;
+			return true;
 		}
 	}
 
 	//type = javascript
-	if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
 	//href = javascript
 	//src = javascript
 	//data = javascript
-	if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
 	//url(javascript
-	if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
-	return false ;
+	return false;
 }
 
 /**
@@ -202,7 +202,7 @@ 
  * @param 	string 	$extension 		File extension
  * @return 	boolean					True or false
  */
-function IsImageValid( $filePath, $extension )
+function IsImageValid($filePath, $extension)
 {
 	if (!@is_readable($filePath)) {
 		return -1;
@@ -228,12 +228,12 @@ 
         'wbmp'
     );
 
-	if (!in_array($extension, $imageCheckExtensions) ) {
+	if (!in_array($extension, $imageCheckExtensions)) {
 		return true;
 	}
 
 	if (@getimagesize($filePath) === false) {
-		return false ;
+		return false;
 	}
 
 	return true;

Braces +2 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
 	if ( defined('PHP_OS') )
 	{
 		$os = PHP_OS ;
-	}
-	else
+	} else
 	{
 		$os = php_uname();
 	}
@@ -96,8 +95,7 @@ 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
+	} else
 	{
 		return (htmlspecialchars($value));
 	}

dolibarr/htdocs/core/lib/usergroups.lib.php

Indentation +704 added lines, -704 removed lines

@@ -33,162 +33,162 @@ 
  */
 function user_prepare_head($object)
 {
-	global $langs, $conf, $user, $db;
-
-	$langs->load("users");
-
-	$canreadperms=true;
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-	{
-		$canreadperms=($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
-	}
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("UserCard");
-	$head[$h][2] = 'user';
-	$h++;
-
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
-		$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("LDAPCard");
-		$head[$h][2] = 'ldap';
-		$h++;
-	}
-
-	if ($canreadperms)
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Rights"). ' <span class="badge">'.($object->nb_rights).'</span>';
-		$head[$h][2] = 'rights';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("UserGUISetup");
-	$head[$h][2] = 'guisetup';
-	$h++;
-
-	if (! empty($conf->agenda->enabled))
-	{
-		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-		$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
-
-		$i=1;
-		$nbagenda = 0;
-		while ($i <= $MAXAGENDA)
-		{
-			$key=$i;
-			$name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
-			$src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
-			$offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
-			$color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
-			$i++;
-
-			if (! empty($object->conf->$name)) $nbagenda++;
-		}
-
-		$head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
-		$head[$h][2] = 'extsites';
-		$h++;
-	}
-
-	if (! empty($conf->clicktodial->enabled))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ClickToDial");
-		$head[$h][2] = 'clicktodial';
-		$h++;
-	}
-
-	// Notifications
-	if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
-	{
-		$nbNote = 0;
-		$sql = "SELECT COUNT(n.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-		$sql.= " WHERE fk_user = ".$object->id;
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$num = $db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-				$nbNote=$obj->nb;
-				$i++;
-			}
-		}
-		else {
-			dol_print_error($db);
-		}
-
-		$head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Notifications");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$h][2] = 'notify';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
-
-	if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-		|| (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read))
-		|| (! empty($conf->expensereport->enabled) && ! empty($user->rights->expensereport->lire) && $user->id == $object->id)
-		|| (! empty($conf->holiday->enabled) && ! empty($user->rights->holiday->read) && $user->id == $object->id )
-		)
-	{
-		// Bank
-		$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("HRAndBank");
-		$head[$h][2] = 'bank';
-		$h++;
-	}
-
-	// Such info on users is visible only by internal user
-	if (empty($user->societe_id))
-	{
-		// Notes
-		$nbNote = 0;
-		if(!empty($object->note)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$h][2] = 'note';
-		$h++;
-
-		// Attached files
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-		$upload_dir = $conf->user->dir_output . "/" . $object->id;
-		$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-		$nbLinks=Link::count($db, $object->element, $object->id);
-		$head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
-		$head[$h][1] = $langs->trans("Documents");
-		if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-		$head[$h][2] = 'document';
-		$h++;
-
-		$head[$h][0] = DOL_URL_ROOT.'/user/info.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Info");
-		$head[$h][2] = 'info';
-		$h++;
-	}
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
-
-	return $head;
+    global $langs, $conf, $user, $db;
+
+    $langs->load("users");
+
+    $canreadperms=true;
+    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+    {
+        $canreadperms=($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
+    }
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("UserCard");
+    $head[$h][2] = 'user';
+    $h++;
+
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
+        $head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("LDAPCard");
+        $head[$h][2] = 'ldap';
+        $h++;
+    }
+
+    if ($canreadperms)
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Rights"). ' <span class="badge">'.($object->nb_rights).'</span>';
+        $head[$h][2] = 'rights';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("UserGUISetup");
+    $head[$h][2] = 'guisetup';
+    $h++;
+
+    if (! empty($conf->agenda->enabled))
+    {
+        if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+        $MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+
+        $i=1;
+        $nbagenda = 0;
+        while ($i <= $MAXAGENDA)
+        {
+            $key=$i;
+            $name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
+            $src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
+            $offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
+            $color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
+            $i++;
+
+            if (! empty($object->conf->$name)) $nbagenda++;
+        }
+
+        $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("ExtSites").($nbagenda ? ' <span class="badge">'.$nbagenda.'</span>' : '');
+        $head[$h][2] = 'extsites';
+        $h++;
+    }
+
+    if (! empty($conf->clicktodial->enabled))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("ClickToDial");
+        $head[$h][2] = 'clicktodial';
+        $h++;
+    }
+
+    // Notifications
+    if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
+    {
+        $nbNote = 0;
+        $sql = "SELECT COUNT(n.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+        $sql.= " WHERE fk_user = ".$object->id;
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                $nbNote=$obj->nb;
+                $i++;
+            }
+        }
+        else {
+            dol_print_error($db);
+        }
+
+        $head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Notifications");
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'notify';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
+
+    if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+        || (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read))
+        || (! empty($conf->expensereport->enabled) && ! empty($user->rights->expensereport->lire) && $user->id == $object->id)
+        || (! empty($conf->holiday->enabled) && ! empty($user->rights->holiday->read) && $user->id == $object->id )
+        )
+    {
+        // Bank
+        $head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("HRAndBank");
+        $head[$h][2] = 'bank';
+        $h++;
+    }
+
+    // Such info on users is visible only by internal user
+    if (empty($user->societe_id))
+    {
+        // Notes
+        $nbNote = 0;
+        if(!empty($object->note)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Note");
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
+
+        // Attached files
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+        $upload_dir = $conf->user->dir_output . "/" . $object->id;
+        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+        $nbLinks=Link::count($db, $object->element, $object->id);
+        $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
+        $head[$h][1] = $langs->trans("Documents");
+        if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+        $head[$h][2] = 'document';
+        $h++;
+
+        $head[$h][0] = DOL_URL_ROOT.'/user/info.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Info");
+        $head[$h][2] = 'info';
+        $h++;
+    }
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
+
+    return $head;
 }
 
 /**
@@ -199,49 +199,49 @@ 
  */
 function group_prepare_head($object)
 {
-	global $langs, $conf, $user;
-
-	$canreadperms=true;
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-	{
-		$canreadperms=($user->admin || $user->rights->user->group_advance->readperms);
-	}
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("GroupCard");
-	$head[$h][2] = 'group';
-	$h++;
-
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
-		$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("LDAPCard");
-		$head[$h][2] = 'ldap';
-		$h++;
-	}
-
-	if ($canreadperms)
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("GroupRights"). ' <span class="badge">'.($object->nb_rights).'</span>';
-		$head[$h][2] = 'rights';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'group');
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
-
-	return $head;
+    global $langs, $conf, $user;
+
+    $canreadperms=true;
+    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+    {
+        $canreadperms=($user->admin || $user->rights->user->group_advance->readperms);
+    }
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("GroupCard");
+    $head[$h][2] = 'group';
+    $h++;
+
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
+        $head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("LDAPCard");
+        $head[$h][2] = 'ldap';
+        $h++;
+    }
+
+    if ($canreadperms)
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("GroupRights"). ' <span class="badge">'.($object->nb_rights).'</span>';
+        $head[$h][2] = 'rights';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'group');
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
+
+    return $head;
 }
 
 /**
@@ -251,40 +251,40 @@ 
  */
 function user_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$langs->load("users");
-	$h=0;
+    $langs->load("users");
+    $h=0;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
-	$head[$h][1] = $langs->trans("Parameters");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'card';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/usergroup.php';
-	$head[$h][1] = $langs->trans("Group");
-	$head[$h][2] = 'usergroupcard';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/usergroup.php';
+    $head[$h][1] = $langs->trans("Group");
+    $head[$h][2] = 'usergroupcard';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/user/admin/group_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups");
-	$head[$h][2] = 'attributes_group';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/user/admin/group_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups");
+    $head[$h][2] = 'attributes_group';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -297,138 +297,138 @@ 
  */
 function show_theme($fuser,$edit=0,$foruserprofile=false)
 {
-	global $conf,$langs,$db,$form;
-	global $bc;
-
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-
-	$formother = new FormOther($db);
-
-	$dirthemes=array('/theme');
-	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
-	{
-		foreach($conf->modules_parts['theme'] as $reldir)
-		{
-			$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
-		}
-	}
-	$dirthemes=array_unique($dirthemes);
-	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
-
-	$selected_theme='';
-	if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
-	else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
-
-	$hoverdisabled='';
-	if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-	else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
-
-	$checkeddisabled='';
-	if (empty($foruserprofile)) $checkeddisabled=(isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
-	else $checkeddisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0'):'');
-
-	$colspan=2;
-	if ($foruserprofile) $colspan=4;
-
-	$thumbsbyrow=6;
-	print '<table class="noborder" width="100%">';
-
-	// Title
-	if ($foruserprofile)
-	{
-		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
-		print '<th colspan="2">&nbsp;</th>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td>'.$langs->trans("DefaultSkin").'</td>';
-		print '<td>'.$conf->global->MAIN_THEME.'</td>';
-		print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-		print '<td>&nbsp;</td>';
-		print '</tr>';
-	}
-	else
-	{
-		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
-		print '<th align="right">';
-		$url='https://www.dolistore.com/lang-en/4-skins';
-		if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
-		//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
-		print '<a href="'.$url.'" target="_blank">';
-		print $langs->trans('DownloadMoreSkins');
-		print '</a>';
-		print '</th></tr>';
-
-		print '<tr>';
-		print '<td>'.$langs->trans("ThemeDir").'</td>';
-		print '<td>';
-		foreach($dirthemes as $dirtheme)
-		{
-			echo '"'.$dirtheme.'" ';
-		}
-		print '</td>';
-		print '</tr>';
-	}
-
-	print '<tr><td colspan="'.$colspan.'">';
-
-	print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
-
-	$i=0;
-	foreach($dirthemes as $dir)
-	{
-		//print $dirroot.$dir;exit;
-		$dirtheme=dol_buildpath($dir,0);	// This include loop on $conf->file->dol_document_root
-		$urltheme=dol_buildpath($dir,1);
-
-		if (is_dir($dirtheme))
-		{
-			$handle=opendir($dirtheme);
-			if (is_resource($handle))
-			{
-				while (($subdir = readdir($handle))!==false)
-				{
-					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
-					{
-						// Disable not stable themes (dir ends with _exp or _dev)
-						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
-						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
-
-						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-						$file=$dirtheme."/".$subdir."/thumb.png";
-						$url=$urltheme."/".$subdir."/thumb.png";
-						if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-						print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-						if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-						else $title=$langs->trans("ShowPreview");
-						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
-						print '</a><br>';
-						if ($subdir == $selected_theme)
-						{
-							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-						}
-						else
-						{
-							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
-						}
-						print '</div>';
-
-						$i++;
-					}
-				}
-			}
-		}
-	}
-
-	print '</div></td></tr></table>';
-
-	print '</td></tr>';
-
-	// TopMenuDisableImages
-	if ($foruserprofile)
-	{
-		/*
+    global $conf,$langs,$db,$form;
+    global $bc;
+
+    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+
+    $formother = new FormOther($db);
+
+    $dirthemes=array('/theme');
+    if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+    {
+        foreach($conf->modules_parts['theme'] as $reldir)
+        {
+            $dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
+        }
+    }
+    $dirthemes=array_unique($dirthemes);
+    // Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
+
+    $selected_theme='';
+    if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
+    else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+
+    $hoverdisabled='';
+    if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+    else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+
+    $checkeddisabled='';
+    if (empty($foruserprofile)) $checkeddisabled=(isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
+    else $checkeddisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0'):'');
+
+    $colspan=2;
+    if ($foruserprofile) $colspan=4;
+
+    $thumbsbyrow=6;
+    print '<table class="noborder" width="100%">';
+
+    // Title
+    if ($foruserprofile)
+    {
+        print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("Parameter").'</th><th>'.$langs->trans("DefaultValue").'</th>';
+        print '<th colspan="2">&nbsp;</th>';
+        print '</tr>';
+
+        print '<tr>';
+        print '<td>'.$langs->trans("DefaultSkin").'</td>';
+        print '<td>'.$conf->global->MAIN_THEME.'</td>';
+        print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+        print '<td>&nbsp;</td>';
+        print '</tr>';
+    }
+    else
+    {
+        print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
+        print '<th align="right">';
+        $url='https://www.dolistore.com/lang-en/4-skins';
+        if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
+        //if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
+        print '<a href="'.$url.'" target="_blank">';
+        print $langs->trans('DownloadMoreSkins');
+        print '</a>';
+        print '</th></tr>';
+
+        print '<tr>';
+        print '<td>'.$langs->trans("ThemeDir").'</td>';
+        print '<td>';
+        foreach($dirthemes as $dirtheme)
+        {
+            echo '"'.$dirtheme.'" ';
+        }
+        print '</td>';
+        print '</tr>';
+    }
+
+    print '<tr><td colspan="'.$colspan.'">';
+
+    print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
+
+    $i=0;
+    foreach($dirthemes as $dir)
+    {
+        //print $dirroot.$dir;exit;
+        $dirtheme=dol_buildpath($dir,0);	// This include loop on $conf->file->dol_document_root
+        $urltheme=dol_buildpath($dir,1);
+
+        if (is_dir($dirtheme))
+        {
+            $handle=opendir($dirtheme);
+            if (is_resource($handle))
+            {
+                while (($subdir = readdir($handle))!==false)
+                {
+                    if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+                            && substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
+                    {
+                        // Disable not stable themes (dir ends with _exp or _dev)
+                        if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
+                        if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
+
+                        print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+                        $file=$dirtheme."/".$subdir."/thumb.png";
+                        $url=$urltheme."/".$subdir."/thumb.png";
+                        if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+                        print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+                        if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
+                        else $title=$langs->trans("ShowPreview");
+                        print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+                        print '</a><br>';
+                        if ($subdir == $selected_theme)
+                        {
+                            print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+                        }
+                        else
+                        {
+                            print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
+                        }
+                        print '</div>';
+
+                        $i++;
+                    }
+                }
+            }
+        }
+    }
+
+    print '</div></td></tr></table>';
+
+    print '</td></tr>';
+
+    // TopMenuDisableImages
+    if ($foruserprofile)
+    {
+        /*
          print '<tr class="oddeven">';
          print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
          print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
@@ -448,31 +448,31 @@ 
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-	}
-	else
-	{
-		$default=$langs->trans('No');
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-		}
-		else
-		{
-			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// Background color THEME_ELDY_BACKBODY
-	if ($foruserprofile)
-	{
-		/*
+    }
+    else
+    {
+        $default=$langs->trans('No');
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+        }
+        else
+        {
+            print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // Background color THEME_ELDY_BACKBODY
+    if ($foruserprofile)
+    {
+        /*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
@@ -492,33 +492,33 @@ 
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("BackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		//var_dump($conf->global->THEME_ELDY_BACKBODY);
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
-		}
-	   	else
-	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-	   	}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>ffffff</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// TopMenuBackgroundColor
-	if ($foruserprofile)
-	{
-		/*
+    }
+    else
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("BackgroundColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        //var_dump($conf->global->THEME_ELDY_BACKBODY);
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
+        }
+            else
+            {
+                $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
+            if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+            else print $langs->trans("Default");
+            }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>ffffff</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // TopMenuBackgroundColor
+    if ($foruserprofile)
+    {
+        /*
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
@@ -538,35 +538,35 @@ 
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
-	{
-		$default='5a6482';
-		if ($conf->theme == 'md') $default='5a3278';
-
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
-		}
-	   	else
-	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-	   	}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// LeftMenuBackgroundColor
-	if ($foruserprofile)
-	{
-		/*
+    }
+    else
+    {
+        $default='5a6482';
+        if ($conf->theme == 'md') $default='5a3278';
+
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+        }
+            else
+            {
+                $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+            if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+            else print $langs->trans("Default");
+            }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // LeftMenuBackgroundColor
+    if ($foruserprofile)
+    {
+        /*
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_VERMENU_BACK1:$langs->trans("Default")).'</td>';
@@ -586,174 +586,174 @@ 
 		 }
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
-	}
-	else
-	{
-		$default='f0f0f0';
-		if ($conf->theme == 'md') $default='ffffff';
-
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
-		}
-		else
-		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// TextTitleColor for title of Pages
-	if ($foruserprofile)
-	{
-
-
-	}
-	else
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("TextTitleColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
-		}
-		else
-		{
-			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #643c14">643c14</span></strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-
-		print '</tr>';
-	}
-
-	// BackgroundTableTitleColor
-	if ($foruserprofile)
-	{
-
-
-	}
-	else
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
-		}
-	   	else
-	   	{
-	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
-	   	}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-
-		print '</tr>';
-	}
-
-	// TextTitleColor
-	if ($foruserprofile)
-	{
-
-
-	}
-	else
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE,array()),''),'THEME_ELDY_TEXTTITLE','formcolor',1).' ';
-		}
-		else
-		{
-			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000000">000000</span></strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-
-		print '</tr>';
-	}
-
-	// BackgroundTableLineOddColor
-	if ($foruserprofile)
-	{
-
-	}
-	else
-	{
-		$default='ffffff';
-		if ($conf->theme == 'md') $default='ffffff';
-
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
-		}
-		else
-		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// BackgroundTableLineEvenColor
-	if ($foruserprofile)
-	{
-
-	}
-	else
-	{
-		$default='f8f8f8';
-		if ($conf->theme == 'md') $default='f8f8f8';
-
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
-		}
-		else
-		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// Text LinkColor
-	if ($foruserprofile)
-	{
-		/*
+    }
+    else
+    {
+        $default='f0f0f0';
+        if ($conf->theme == 'md') $default='ffffff';
+
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
+        }
+        else
+        {
+            $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),'');
+            if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+            else print $langs->trans("Default");
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // TextTitleColor for title of Pages
+    if ($foruserprofile)
+    {
+
+
+    }
+    else
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("TextTitleColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
+        }
+        else
+        {
+            print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #643c14">643c14</span></strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+
+        print '</tr>';
+    }
+
+    // BackgroundTableTitleColor
+    if ($foruserprofile)
+    {
+
+
+    }
+    else
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
+        }
+            else
+            {
+                print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
+            }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+
+        print '</tr>';
+    }
+
+    // TextTitleColor
+    if ($foruserprofile)
+    {
+
+
+    }
+    else
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE,array()),''),'THEME_ELDY_TEXTTITLE','formcolor',1).' ';
+        }
+        else
+        {
+            print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000000">000000</span></strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+
+        print '</tr>';
+    }
+
+    // BackgroundTableLineOddColor
+    if ($foruserprofile)
+    {
+
+    }
+    else
+    {
+        $default='ffffff';
+        if ($conf->theme == 'md') $default='ffffff';
+
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
+        }
+        else
+        {
+            $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+            if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+            else print $langs->trans("Default");
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // BackgroundTableLineEvenColor
+    if ($foruserprofile)
+    {
+
+    }
+    else
+    {
+        $default='f8f8f8';
+        if ($conf->theme == 'md') $default='f8f8f8';
+
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
+        }
+        else
+        {
+            $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+            if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+            else print $langs->trans("Default");
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // Text LinkColor
+    if ($foruserprofile)
+    {
+        /*
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';
@@ -773,37 +773,37 @@ 
 	     }
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
-	}
-	else
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("LinkColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
-		}
-		else
-		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else
-			{
-				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
-				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
-				print $langs->trans("Default");
-			}
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// Use Hover
-	if ($foruserprofile)
-	{
-		/* Must first change option to choose color of highlight instead of yes or no.
+    }
+    else
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("LinkColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        if ($edit)
+        {
+            print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+        }
+        else
+        {
+            $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
+            if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+            else
+            {
+                //print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+                //print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+                print $langs->trans("Default");
+            }
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // Use Hover
+    if ($foruserprofile)
+    {
+        /* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
 	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
@@ -813,40 +813,40 @@ 
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else {
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		if ($edit)
-		{
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-			print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
-		}
-		else
-		{
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-			if ($color)
-			{
-				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-				else print $langs->trans("Default");
-			}
-			else print $langs->trans("None");
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-	}
-
-	// Use Checked
-	if ($foruserprofile)
-	{
-		/* Must first change option to choose color of highlight instead of yes or no.
+    }
+    else {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+        //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+        if ($edit)
+        {
+            if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
+            else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+            print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
+        }
+        else
+        {
+            if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
+            else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+            if ($color)
+            {
+                if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+                else print $langs->trans("Default");
+            }
+            else print $langs->trans("None");
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+    }
+
+    // Use Checked
+    if ($foruserprofile)
+    {
+        /* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
 	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
@@ -856,37 +856,37 @@ 
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else
-	{
-		print '<tr class="oddeven">';
-		print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
-		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		if ($edit)
-		{
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
-			print $formother->selectColor($color,'THEME_ELDY_USE_CHECKED','formcolor',1).' ';
-		}
-		else
-		{
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
-			if ($color)
-			{
-				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-				else print $langs->trans("Default");
-			}
-			else print $langs->trans("None");
-		}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
-		print '</span>';
-		print '</td>';
-		print '</tr>';
-	}
-
-	print '</table>';
+    }
+    else
+    {
+        print '<tr class="oddeven">';
+        print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
+        print '<td colspan="'.($colspan-1).'">';
+        //print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+        //print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+        if ($edit)
+        {
+            if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
+            else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+            print $formother->selectColor($color,'THEME_ELDY_USE_CHECKED','formcolor',1).' ';
+        }
+        else
+        {
+            if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
+            else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+            if ($color)
+            {
+                if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+                else print $langs->trans("Default");
+            }
+            else print $langs->trans("None");
+        }
+        print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
+        print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+        print '</span>';
+        print '</td>';
+        print '</tr>';
+    }
+
+    print '</table>';
 }

Spacing +134 added lines, -134 removed lines

@@ -37,10 +37,10 @@ 
 
 	$langs->load("users");
 
-	$canreadperms=true;
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+	$canreadperms = true;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
-		$canreadperms=($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
+		$canreadperms = ($user->admin || ($user->id != $object->id && $user->rights->user->user_advance->readperms) || ($user->id == $object->id && $user->rights->user->self_advance->readperms));
 	}
 
 	$h = 0;
@@ -51,8 +51,8 @@ 
 	$head[$h][2] = 'user';
 	$h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
@@ -64,7 +64,7 @@ 
 	if ($canreadperms)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Rights"). ' <span class="badge">'.($object->nb_rights).'</span>';
+		$head[$h][1] = $langs->trans("Rights").' <span class="badge">'.($object->nb_rights).'</span>';
 		$head[$h][2] = 'rights';
 		$h++;
 	}
@@ -74,23 +74,23 @@ 
 	$head[$h][2] = 'guisetup';
 	$h++;
 
-	if (! empty($conf->agenda->enabled))
+	if (!empty($conf->agenda->enabled))
 	{
-		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-		$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
+		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
+		$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
-		$i=1;
+		$i = 1;
 		$nbagenda = 0;
 		while ($i <= $MAXAGENDA)
 		{
-			$key=$i;
-			$name='AGENDA_EXT_NAME_'.$object->id.'_'.$key;
-			$src='AGENDA_EXT_SRC_'.$object->id.'_'.$key;
-			$offsettz='AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
-			$color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
+			$key = $i;
+			$name = 'AGENDA_EXT_NAME_'.$object->id.'_'.$key;
+			$src = 'AGENDA_EXT_SRC_'.$object->id.'_'.$key;
+			$offsettz = 'AGENDA_EXT_OFFSETTZ_'.$object->id.'_'.$key;
+			$color = 'AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
 			$i++;
 
-			if (! empty($object->conf->$name)) $nbagenda++;
+			if (!empty($object->conf->$name)) $nbagenda++;
 		}
 
 		$head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
@@ -99,7 +99,7 @@ 
 		$h++;
 	}
 
-	if (! empty($conf->clicktodial->enabled))
+	if (!empty($conf->clicktodial->enabled))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ClickToDial");
@@ -108,13 +108,13 @@ 
 	}
 
 	// Notifications
-	if ($user->societe_id == 0 && ! empty($conf->notification->enabled))
+	if ($user->societe_id == 0 && !empty($conf->notification->enabled))
 	{
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-		$sql.= " WHERE fk_user = ".$object->id;
-		$resql=$db->query($sql);
+		$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+		$sql .= " WHERE fk_user = ".$object->id;
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num = $db->num_rows($resql);
@@ -122,7 +122,7 @@ 
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				$nbNote=$obj->nb;
+				$nbNote = $obj->nb;
 				$i++;
 			}
 		}
@@ -132,7 +132,7 @@ 
 
 		$head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Notifications");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'notify';
 		$h++;
 	}
@@ -141,12 +141,12 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'user');
 
-	if ((! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
-		|| (! empty($conf->hrm->enabled) && ! empty($user->rights->hrm->employee->read))
-		|| (! empty($conf->expensereport->enabled) && ! empty($user->rights->expensereport->lire) && $user->id == $object->id)
-		|| (! empty($conf->holiday->enabled) && ! empty($user->rights->holiday->read) && $user->id == $object->id )
+	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))
+		|| (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && $user->id == $object->id)
+		|| (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && $user->id == $object->id)
 		)
 	{
 		// Bank
@@ -161,22 +161,22 @@ 
 	{
 		// Notes
 		$nbNote = 0;
-		if(!empty($object->note)) $nbNote++;
+		if (!empty($object->note)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
 
 		// Attached files
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-		$upload_dir = $conf->user->dir_output . "/" . $object->id;
-		$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-		$nbLinks=Link::count($db, $object->element, $object->id);
+		$upload_dir = $conf->user->dir_output."/".$object->id;
+		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+		$nbLinks = Link::count($db, $object->element, $object->id);
 		$head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
 		$head[$h][1] = $langs->trans("Documents");
-		if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+		if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 		$head[$h][2] = 'document';
 		$h++;
 
@@ -186,7 +186,7 @@ 
 		$h++;
 	}
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'user', 'remove');
 
 	return $head;
 }
@@ -201,10 +201,10 @@ 
 {
 	global $langs, $conf, $user;
 
-	$canreadperms=true;
-	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+	$canreadperms = true;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
-		$canreadperms=($user->admin || $user->rights->user->group_advance->readperms);
+		$canreadperms = ($user->admin || $user->rights->user->group_advance->readperms);
 	}
 
 	$h = 0;
@@ -215,8 +215,8 @@ 
 	$head[$h][2] = 'group';
 	$h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
@@ -228,7 +228,7 @@ 
 	if ($canreadperms)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("GroupRights"). ' <span class="badge">'.($object->nb_rights).'</span>';
+		$head[$h][1] = $langs->trans("GroupRights").' <span class="badge">'.($object->nb_rights).'</span>';
 		$head[$h][2] = 'rights';
 		$h++;
 	}
@@ -237,9 +237,9 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'group');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'group');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'group', 'remove');
 
 	return $head;
 }
@@ -254,7 +254,7 @@ 
 	global $langs, $conf, $user;
 
 	$langs->load("users");
-	$h=0;
+	$h = 0;
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
 	$head[$h][1] = $langs->trans("Parameters");
@@ -280,9 +280,9 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'useradmin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'useradmin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'useradmin', 'remove');
 
 	return $head;
 }
@@ -295,42 +295,42 @@ 
  * 	@param	boolean		$foruserprofile		Show for user profile view
  * 	@return	void
  */
-function show_theme($fuser,$edit=0,$foruserprofile=false)
+function show_theme($fuser, $edit = 0, $foruserprofile = false)
 {
-	global $conf,$langs,$db,$form;
+	global $conf, $langs, $db, $form;
 	global $bc;
 
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 	$formother = new FormOther($db);
 
-	$dirthemes=array('/theme');
-	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+	$dirthemes = array('/theme');
+	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
 	{
-		foreach($conf->modules_parts['theme'] as $reldir)
+		foreach ($conf->modules_parts['theme'] as $reldir)
 		{
-			$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
+			$dirthemes = array_merge($dirthemes, (array) ($reldir.'theme'));
 		}
 	}
-	$dirthemes=array_unique($dirthemes);
+	$dirthemes = array_unique($dirthemes);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
-	$selected_theme='';
-	if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
-	else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+	$selected_theme = '';
+	if (empty($foruserprofile)) $selected_theme = $conf->global->MAIN_THEME;
+	else $selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');
 
-	$hoverdisabled='';
-	if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-	else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+	$hoverdisabled = '';
+	if (empty($foruserprofile)) $hoverdisabled = (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+	else $hoverdisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0') : '');
 
-	$checkeddisabled='';
-	if (empty($foruserprofile)) $checkeddisabled=(isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
-	else $checkeddisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0'):'');
+	$checkeddisabled = '';
+	if (empty($foruserprofile)) $checkeddisabled = (isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
+	else $checkeddisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0') : '');
 
-	$colspan=2;
-	if ($foruserprofile) $colspan=4;
+	$colspan = 2;
+	if ($foruserprofile) $colspan = 4;
 
-	$thumbsbyrow=6;
+	$thumbsbyrow = 6;
 	print '<table class="noborder" width="100%">';
 
 	// Title
@@ -343,7 +343,7 @@ 
 		print '<tr>';
 		print '<td>'.$langs->trans("DefaultSkin").'</td>';
 		print '<td>'.$conf->global->MAIN_THEME.'</td>';
-		print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
 	}
@@ -351,8 +351,8 @@ 
 	{
 		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
 		print '<th align="right">';
-		$url='https://www.dolistore.com/lang-en/4-skins';
-		if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
+		$url = 'https://www.dolistore.com/lang-en/4-skins';
+		if (preg_match('/fr/i', $langs->defaultlang)) $url = 'https://www.dolistore.com/fr/4-themes';
 		//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
 		print '<a href="'.$url.'" target="_blank">';
 		print $langs->trans('DownloadMoreSkins');
@@ -362,7 +362,7 @@ 
 		print '<tr>';
 		print '<td>'.$langs->trans("ThemeDir").'</td>';
 		print '<td>';
-		foreach($dirthemes as $dirtheme)
+		foreach ($dirthemes as $dirtheme)
 		{
 			echo '"'.$dirtheme.'" ';
 		}
@@ -374,43 +374,43 @@ 
 
 	print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
 
-	$i=0;
-	foreach($dirthemes as $dir)
+	$i = 0;
+	foreach ($dirthemes as $dir)
 	{
 		//print $dirroot.$dir;exit;
-		$dirtheme=dol_buildpath($dir,0);	// This include loop on $conf->file->dol_document_root
-		$urltheme=dol_buildpath($dir,1);
+		$dirtheme = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
+		$urltheme = dol_buildpath($dir, 1);
 
 		if (is_dir($dirtheme))
 		{
-			$handle=opendir($dirtheme);
+			$handle = opendir($dirtheme);
 			if (is_resource($handle))
 			{
-				while (($subdir = readdir($handle))!==false)
+				while (($subdir = readdir($handle)) !== false)
 				{
 					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
 					{
 						// Disable not stable themes (dir ends with _exp or _dev)
-						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
-						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
 
 						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-						$file=$dirtheme."/".$subdir."/thumb.png";
-						$url=$urltheme."/".$subdir."/thumb.png";
-						if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-						print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-						if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-						else $title=$langs->trans("ShowPreview");
+						$file = $dirtheme."/".$subdir."/thumb.png";
+						$url = $urltheme."/".$subdir."/thumb.png";
+						if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+						if ($subdir == $conf->global->MAIN_THEME) $title = $langs->trans("ThemeCurrentlyActive");
+						else $title = $langs->trans("ShowPreview");
 						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
 						print '</a><br>';
 						if ($subdir == $selected_theme)
 						{
-							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
+							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
 						}
 						else
 						{
-							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
+							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
 						}
 						print '</div>';
 
@@ -451,10 +451,10 @@ 
 	}
 	else
 	{
-		$default=$langs->trans('No');
+		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
 			print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
@@ -497,15 +497,15 @@ 
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
 		}
 	   	else
 	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
@@ -541,19 +541,19 @@ 
 	}
 	else
 	{
-		$default='5a6482';
-		if ($conf->theme == 'md') $default='5a3278';
+		$default = '5a6482';
+		if ($conf->theme == 'md') $default = '5a3278';
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
 		}
 	   	else
 	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 	   	}
@@ -589,19 +589,19 @@ 
 	}
 	else
 	{
-		$default='f0f0f0';
-		if ($conf->theme == 'md') $default='ffffff';
+		$default = 'f0f0f0';
+		if ($conf->theme == 'md') $default = 'ffffff';
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
 		}
 		else
 		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),'');
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
@@ -621,10 +621,10 @@ 
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
 		}
 		else
 		{
@@ -648,16 +648,16 @@ 
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
 		}
 	   	else
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
-		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>f0f0f0</strong>) ';  // $colorbacktitle1 in CSS
+		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>f0f0f0</strong>) '; // $colorbacktitle1 in CSS
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 		print '</span>';
 		print '</td>';
@@ -675,10 +675,10 @@ 
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE,array()),''),'THEME_ELDY_TEXTTITLE','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
 		}
 		else
 		{
@@ -699,19 +699,19 @@ 
 	}
 	else
 	{
-		$default='ffffff';
-		if ($conf->theme == 'md') $default='ffffff';
+		$default = 'ffffff';
+		if ($conf->theme == 'md') $default = 'ffffff';
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
 		}
 		else
 		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
@@ -728,19 +728,19 @@ 
 	}
 	else
 	{
-		$default='f8f8f8';
-		if ($conf->theme == 'md') $default='f8f8f8';
+		$default = 'f8f8f8';
+		if ($conf->theme == 'md') $default = 'f8f8f8';
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
 		}
 		else
 		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
 		}
@@ -778,14 +778,14 @@ 
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LinkColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
 		}
 		else
 		{
-			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else
 			{
@@ -817,19 +817,19 @@ 
 	else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit)
 		{
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
-			print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = 'e6edf0';
+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
+			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
 		}
 		else
 		{
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = 'e6edf0';
+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			if ($color)
 			{
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -861,19 +861,19 @@ 
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
-		print '<td colspan="'.($colspan-1).'">';
+		print '<td colspan="'.($colspan - 1).'">';
 		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit)
 		{
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
-			print $formother->selectColor($color,'THEME_ELDY_USE_CHECKED','formcolor',1).' ';
+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
+			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
 		}
 		else
 		{
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
+			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			if ($color)
 			{
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';

Braces +157 added lines, -104 removed lines

@@ -76,7 +76,9 @@ 
 
 	if (! empty($conf->agenda->enabled))
 	{
-		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+		if (empty($conf->global->AGENDA_EXT_NB)) {
+		    $conf->global->AGENDA_EXT_NB=5;
+		}
 		$MAXAGENDA=$conf->global->AGENDA_EXT_NB;
 
 		$i=1;
@@ -90,7 +92,9 @@ 
 			$color='AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
 			$i++;
 
-			if (! empty($object->conf->$name)) $nbagenda++;
+			if (! empty($object->conf->$name)) {
+			    $nbagenda++;
+			}
 		}
 
 		$head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
@@ -125,14 +129,15 @@ 
 				$nbNote=$obj->nb;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
 		$head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Notifications");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'notify';
 		$h++;
 	}
@@ -161,10 +166,14 @@ 
 	{
 		// Notes
 		$nbNote = 0;
-		if(!empty($object->note)) $nbNote++;
+		if(!empty($object->note)) {
+		    $nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 
@@ -176,7 +185,9 @@ 
 		$nbLinks=Link::count($db, $object->element, $object->id);
 		$head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
 		$head[$h][1] = $langs->trans("Documents");
-		if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+		if (($nbFiles+$nbLinks) > 0) {
+		    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+		}
 		$head[$h][2] = 'document';
 		$h++;
 
@@ -305,30 +316,43 @@ 
 	$formother = new FormOther($db);
 
 	$dirthemes=array('/theme');
-	if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+	if (! empty($conf->modules_parts['theme'])) {
+	    // Using this feature slow down application
 	{
 		foreach($conf->modules_parts['theme'] as $reldir)
 		{
 			$dirthemes=array_merge($dirthemes,(array) ($reldir.'theme'));
+	}
 		}
 	}
 	$dirthemes=array_unique($dirthemes);
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
 	$selected_theme='';
-	if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
-	else $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+	if (empty($foruserprofile)) {
+	    $selected_theme=$conf->global->MAIN_THEME;
+	} else {
+	    $selected_theme=((is_object($fuser) && ! empty($fuser->conf->MAIN_THEME))?$fuser->conf->MAIN_THEME:'');
+	}
 
 	$hoverdisabled='';
-	if (empty($foruserprofile)) $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-	else $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+	if (empty($foruserprofile)) {
+	    $hoverdisabled=(isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+	} else {
+	    $hoverdisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0'):'');
+	}
 
 	$checkeddisabled='';
-	if (empty($foruserprofile)) $checkeddisabled=(isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
-	else $checkeddisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0'):'');
+	if (empty($foruserprofile)) {
+	    $checkeddisabled=(isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
+	} else {
+	    $checkeddisabled=(is_object($fuser)?(empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0'):'');
+	}
 
 	$colspan=2;
-	if ($foruserprofile) $colspan=4;
+	if ($foruserprofile) {
+	    $colspan=4;
+	}
 
 	$thumbsbyrow=6;
 	print '<table class="noborder" width="100%">';
@@ -346,13 +370,14 @@ 
 		print '<td align="left" class="nowrap" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
-	}
-	else
+	} else
 	{
 		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
 		print '<th align="right">';
 		$url='https://www.dolistore.com/lang-en/4-skins';
-		if (preg_match('/fr/i',$langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
+		if (preg_match('/fr/i',$langs->defaultlang)) {
+		    $url='https://www.dolistore.com/fr/4-themes';
+		}
 		//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
 		print '<a href="'.$url.'" target="_blank">';
 		print $langs->trans('DownloadMoreSkins');
@@ -392,23 +417,31 @@ 
 							&& substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir))
 					{
 						// Disable not stable themes (dir ends with _exp or _dev)
-						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue;
-						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) {
+						    continue;
+						}
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) {
+						    continue;
+						}
 
 						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 						$file=$dirtheme."/".$subdir."/thumb.png";
 						$url=$urltheme."/".$subdir."/thumb.png";
-						if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						if (! file_exists($file)) {
+						    $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						}
 						print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST('optioncss','alpha',1)?'&optioncss='.GETPOST('optioncss','alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-						if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
-						else $title=$langs->trans("ShowPreview");
+						if ($subdir == $conf->global->MAIN_THEME) {
+						    $title=$langs->trans("ThemeCurrentlyActive");
+						} else {
+						    $title=$langs->trans("ShowPreview");
+						}
 						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
 						print '</a><br>';
 						if ($subdir == $selected_theme)
 						{
 							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-						}
-						else
+						} else
 						{
 							print '<input '.($edit?'':'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
 						}
@@ -448,8 +481,7 @@ 
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-	}
-	else
+	} else
 	{
 		$default=$langs->trans('No');
 		print '<tr class="oddeven">';
@@ -458,8 +490,7 @@ 
 		if ($edit)
 		{
 			print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-		}
-		else
+		} else
 		{
 			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
@@ -492,8 +523,7 @@ 
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
+	} else
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
@@ -502,12 +532,14 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),''),'THEME_ELDY_BACKBODY','formcolor',1).' ';
-		}
-	   	else
+		} else
 	   	{
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+			    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+			    print $langs->trans("Default");
+			}
 	   	}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>ffffff</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -538,11 +570,12 @@ 
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
+	} else
 	{
 		$default='5a6482';
-		if ($conf->theme == 'md') $default='5a3278';
+		if ($conf->theme == 'md') {
+		    $default='5a3278';
+		}
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
@@ -550,12 +583,14 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
-		}
-	   	else
+		} else
 	   	{
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+			    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+			    print $langs->trans("Default");
+			}
 	   	}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -586,11 +621,12 @@ 
 		 }
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
-	}
-	else
+	} else
 	{
 		$default='f0f0f0';
-		if ($conf->theme == 'md') $default='ffffff';
+		if ($conf->theme == 'md') {
+		    $default='ffffff';
+		}
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
@@ -598,12 +634,14 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),''),'THEME_ELDY_VERMENU_BACK1','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+			    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+			    print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -616,8 +654,7 @@ 
 	{
 
 
-	}
-	else
+	} else
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
@@ -625,8 +662,7 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -643,8 +679,7 @@ 
 	{
 
 
-	}
-	else
+	} else
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
@@ -652,8 +687,7 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
-		}
-	   	else
+		} else
 	   	{
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -670,8 +704,7 @@ 
 	{
 
 
-	}
-	else
+	} else
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
@@ -679,8 +712,7 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE,array()),''),'THEME_ELDY_TEXTTITLE','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -696,11 +728,12 @@ 
 	if ($foruserprofile)
 	{
 
-	}
-	else
+	} else
 	{
 		$default='ffffff';
-		if ($conf->theme == 'md') $default='ffffff';
+		if ($conf->theme == 'md') {
+		    $default='ffffff';
+		}
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
@@ -708,12 +741,14 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+			    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+			    print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -725,11 +760,12 @@ 
 	if ($foruserprofile)
 	{
 
-	}
-	else
+	} else
 	{
 		$default='f8f8f8';
-		if ($conf->theme == 'md') $default='f8f8f8';
+		if ($conf->theme == 'md') {
+		    $default='f8f8f8';
+		}
 
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
@@ -737,12 +773,14 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+			    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+			    print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -773,8 +811,7 @@ 
 	     }
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
-	}
-	else
+	} else
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("LinkColor").'</td>';
@@ -782,12 +819,12 @@ 
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','formcolor',1).' ';
-		}
-		else
+		} else
 		{
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else
+			if ($color) {
+			    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else
 			{
 				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
@@ -813,8 +850,7 @@ 
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else {
+	} else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
 		print '<td colspan="'.($colspan-1).'">';
@@ -822,20 +858,29 @@ 
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit)
 		{
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
+			    $color='e6edf0';
+			} else {
+			    $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			}
 			print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' ';
-		}
-		else
+		} else
 		{
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
+			    $color='e6edf0';
+			} else {
+			    $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),'');
+			}
 			if ($color)
 			{
-				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-				else print $langs->trans("Default");
+				if ($color != 'e6edf0') {
+				    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+				} else {
+				    print $langs->trans("Default");
+				}
+			} else {
+			    print $langs->trans("None");
 			}
-			else print $langs->trans("None");
 		}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -856,8 +901,7 @@ 
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else
+	} else
 	{
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
@@ -866,20 +910,29 @@ 
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit)
 		{
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') {
+			    $color='e6edf0';
+			} else {
+			    $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+			}
 			print $formother->selectColor($color,'THEME_ELDY_USE_CHECKED','formcolor',1).' ';
-		}
-		else
+		} else
 		{
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') {
+			    $color='e6edf0';
+			} else {
+			    $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),'');
+			}
 			if ($color)
 			{
-				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-				else print $langs->trans("Default");
+				if ($color != 'e6edf0') {
+				    print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+				} else {
+				    print $langs->trans("Default");
+				}
+			} else {
+			    print $langs->trans("None");
 			}
-			else print $langs->trans("None");
 		}
 		print ' &nbsp; <span class="nowraponall">('.$langs->trans("Default").': <strong>e6edf0</strong>) ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));

dolibarr/htdocs/core/lib/import.lib.php

Indentation +14 added lines, -14 removed lines

@@ -34,22 +34,22 @@
  */
 function import_prepare_head($param, $maxstep=0)
 {
-	global $langs;
+    global $langs;
 
-	if (empty($maxstep)) $maxstep=6;
+    if (empty($maxstep)) $maxstep=6;
 
-	$h=0;
-	$head = array();
-	$i=1;
-	while($i <= $maxstep)
-	{
-    	$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
-    	$head[$h][1] = $langs->trans("Step")." ".$i;
-    	$head[$h][2] = 'step'.$i;
-    	$h++;
-    	$i++;
-	}
+    $h=0;
+    $head = array();
+    $i=1;
+    while($i <= $maxstep)
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
+        $head[$h][1] = $langs->trans("Step")." ".$i;
+        $head[$h][2] = 'step'.$i;
+        $h++;
+        $i++;
+    }
 
-	return $head;
+    return $head;
 }
 

Spacing +5 added lines, -5 removed lines

@@ -32,16 +32,16 @@
  * @param	int			$maxstep	Limit steps to maxstep or no limit if 0
  * @return	array					Array of tabs
  */
-function import_prepare_head($param, $maxstep=0)
+function import_prepare_head($param, $maxstep = 0)
 {
 	global $langs;
 
-	if (empty($maxstep)) $maxstep=6;
+	if (empty($maxstep)) $maxstep = 6;
 
-	$h=0;
+	$h = 0;
 	$head = array();
-	$i=1;
-	while($i <= $maxstep)
+	$i = 1;
+	while ($i <= $maxstep)
 	{
     	$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
     	$head[$h][1] = $langs->trans("Step")." ".$i;

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 {
 	global $langs;
 
-	if (empty($maxstep)) $maxstep=6;
+	if (empty($maxstep)) {
+	    $maxstep=6;
+	}
 
 	$h=0;
 	$head = array();

dolibarr/htdocs/core/lib/agenda.lib.php

Indentation +317 added lines, -317 removed lines

@@ -49,157 +49,157 @@ 
  */
 function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals=array(), $actioncode='', $usergroupid='', $excludetype='', $resourceid=0)
 {
-	global $conf, $user, $langs, $db, $hookmanager;
-	global $begin_h, $end_h, $begin_d, $end_d;
-
-	$langs->load("companies");
-
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	$formactions=new FormActions($db);
-
-	// Filters
-	//print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
-	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-	print '<input type="hidden" name="year" value="' . $year . '">';
-	print '<input type="hidden" name="month" value="' . $month . '">';
-	print '<input type="hidden" name="day" value="' . $day . '">';
-	print '<input type="hidden" name="action" value="' . $action . '">';
-	print '<input type="hidden" name="search_showbirthday" value="' . $showbirthday . '">';
-
-	print '<div class="fichecenter">';
-
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
-	else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
-
-	print '<table class="nobordernopadding centpercent">';
-
-	if ($canedit)
-	{
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("ActionsToDoBy").' &nbsp; ';
-		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
-		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
-		print '</td></tr>';
-
-		if ($conf->resource->enabled)
-		{
-		    include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
-		    $formresource=new FormResource($db);
-
-    		// Resource
-    		print '<tr>';
-    		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-    		print $langs->trans("Resource");
-    		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
+    global $conf, $user, $langs, $db, $hookmanager;
+    global $begin_h, $end_h, $begin_d, $end_d;
+
+    $langs->load("companies");
+
+    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+    $formactions=new FormActions($db);
+
+    // Filters
+    //print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
+    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<input type="hidden" name="year" value="' . $year . '">';
+    print '<input type="hidden" name="month" value="' . $month . '">';
+    print '<input type="hidden" name="day" value="' . $day . '">';
+    print '<input type="hidden" name="action" value="' . $action . '">';
+    print '<input type="hidden" name="search_showbirthday" value="' . $showbirthday . '">';
+
+    print '<div class="fichecenter">';
+
+    if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
+    else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+
+    print '<table class="nobordernopadding centpercent">';
+
+    if ($canedit)
+    {
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("ActionsToDoBy").' &nbsp; ';
+        print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
+        print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+        if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+        print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
+        print '</td></tr>';
+
+        if ($conf->resource->enabled)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
+            $formresource=new FormResource($db);
+
+            // Resource
+            print '<tr>';
+            print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+            print $langs->trans("Resource");
+            print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
             print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2);
-    		print '</td></tr>';
-		}
-
-		// Type
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("Type");
-		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$multiselect=0;
-		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
-		{
+            print '</td></tr>';
+        }
+
+        // Type
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("Type");
+        print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        $multiselect=0;
+        if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+        {
             $multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
-		}
+        }
         print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
-		print '</td></tr>';
-	}
-
-	if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
-	{
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("ThirdParty").' &nbsp; ';
-		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print $form->select_company($socid, 'search_socid', '', 'SelectThirdParty', 0, 0, null, 0);
-		print '</td></tr>';
-	}
-
-	if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-		$formproject=new FormProjets($db);
-
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px;">';
-		print $langs->trans("Project").' &nbsp; ';
-		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
-		print '</td></tr>';
-	}
-
-	if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
-	{
-		// Status
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		print $langs->trans("Status");
-		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
-		print '</td></tr>';
-	}
-
-	if ($canedit && $action == 'show_peruser')
-	{
-		// Filter on hours
-		print '<tr>';
-		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'.$langs->trans("VisibleTimeRange").'</td>';
-		print "<td class='nowrap'>";
-		print '<div class="ui-grid-a"><div class="ui-block-a">';
-		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
-		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
-		print '</div></div>';
-		print '</td></tr>';
-
-		// Filter on days
-		print '<tr>';
-		print '<td class="nowrap">'.$langs->trans("VisibleDaysRange").'</td>';
-		print "<td class='nowrap'>";
-		print '<div class="ui-grid-a"><div class="ui-block-a">';
-		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
-		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
-		print '</div></div>';
-		print '</td></tr>';
-	}
-
-	// Hooks
-	$parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid);
-	$reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
-
-	print '</table>';
-
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td>';
-
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
-	else print '<td align="center" valign="middle" class="nowrap">';
-
-	print '<table class="centpercent"><tr><td align="center">';
-	print '<div class="formleftzone">';
-	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
-	print '</div>';
-	print '</td></tr>';
-	print '</table>';
-
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td></tr></table>';
-
-	print '</div>';	// Close fichecenter
-	print '<div style="clear:both"></div>';
-
-	//print '</form>';
+        print '</td></tr>';
+    }
+
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    {
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("ThirdParty").' &nbsp; ';
+        print '</td><td class="nowrap" style="padding-bottom: 2px;">';
+        print $form->select_company($socid, 'search_socid', '', 'SelectThirdParty', 0, 0, null, 0);
+        print '</td></tr>';
+    }
+
+    if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+        $formproject=new FormProjets($db);
+
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px;">';
+        print $langs->trans("Project").' &nbsp; ';
+        print '</td><td class="nowrap" style="padding-bottom: 2px;">';
+        print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
+        print '</td></tr>';
+    }
+
+    if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
+    {
+        // Status
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        print $langs->trans("Status");
+        print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
+        $formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
+        print '</td></tr>';
+    }
+
+    if ($canedit && $action == 'show_peruser')
+    {
+        // Filter on hours
+        print '<tr>';
+        print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'.$langs->trans("VisibleTimeRange").'</td>';
+        print "<td class='nowrap'>";
+        print '<div class="ui-grid-a"><div class="ui-block-a">';
+        print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
+        if (empty($conf->dol_use_jmobile)) print ' - ';
+        else print '</div><div class="ui-block-b">';
+        print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
+        if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+        print '</div></div>';
+        print '</td></tr>';
+
+        // Filter on days
+        print '<tr>';
+        print '<td class="nowrap">'.$langs->trans("VisibleDaysRange").'</td>';
+        print "<td class='nowrap'>";
+        print '<div class="ui-grid-a"><div class="ui-block-a">';
+        print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
+        if (empty($conf->dol_use_jmobile)) print ' - ';
+        else print '</div><div class="ui-block-b">';
+        print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
+        print '</div></div>';
+        print '</td></tr>';
+    }
+
+    // Hooks
+    $parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid);
+    $reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
+
+    print '</table>';
+
+    if ($conf->browser->layout == 'phone') print '</div>';
+    else print '</td>';
+
+    if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
+    else print '<td align="center" valign="middle" class="nowrap">';
+
+    print '<table class="centpercent"><tr><td align="center">';
+    print '<div class="formleftzone">';
+    print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
+    print '</div>';
+    print '</td></tr>';
+    print '</table>';
+
+    if ($conf->browser->layout == 'phone') print '</div>';
+    else print '</td></tr></table>';
+
+    print '</div>';	// Close fichecenter
+    print '<div style="clear:both"></div>';
+
+    //print '</form>';
 }
 
 
@@ -211,42 +211,42 @@ 
  */
 function show_array_actions_to_do($max=5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+    global $langs, $conf, $user, $db, $bc, $socid;
 
-	$now=dol_now();
+    $now=dol_now();
 
-	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
-	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql.= " c.code, c.libelle as type_label,";
-	$sql.= " s.nom as sname, s.rowid, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
-	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
+    $sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
+    $sql.= " c.code, c.libelle as type_label,";
+    $sql.= " s.nom as sname, s.rowid, s.client";
+    $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+    $sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE a.entity = ".$conf->entity;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY a.datep DESC, a.id DESC";
-	$sql.= $db->plimit($max, 0);
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid) $sql.= " AND s.rowid = ".$socid;
+    $sql.= " ORDER BY a.datep DESC, a.id DESC";
+    $sql.= $db->plimit($max, 0);
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-	    $num = $db->num_rows($resql);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
 
-	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
-		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
-		print '</tr>';
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
+        print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
+        print '</tr>';
 
-		$var = true;
-	    $i = 0;
+        $var = true;
+        $i = 0;
 
-		$staticaction=new ActionComm($db);
-	    $customerstatic=new Client($db);
+        $staticaction=new ActionComm($db);
+        $customerstatic=new Client($db);
 
         while ($i < $num)
         {
@@ -260,15 +260,15 @@ 
             $staticaction->id=$obj->id;
             print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
 
-           // print '<td>'.dol_trunc($obj->label,22).'</td>';
+            // print '<td>'.dol_trunc($obj->label,22).'</td>';
 
             print '<td>';
             if ($obj->rowid > 0)
             {
-            	$customerstatic->id=$obj->rowid;
-            	$customerstatic->name=$obj->sname;
-            	$customerstatic->client=$obj->client;
-            	print $customerstatic->getNomUrl(1,'',16);
+                $customerstatic->id=$obj->rowid;
+                $customerstatic->name=$obj->sname;
+                $customerstatic->client=$obj->client;
+                print $customerstatic->getNomUrl(1,'',16);
             }
             print '</td>';
 
@@ -276,30 +276,30 @@ 
             $datep2=$db->jdate($obj->dp2);
 
             // Date
-			print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
-			$late=0;
-			if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
-			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
-			if ($late) print img_warning($langs->trans("Late"));
-			print "</td>";
+            print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
+            $late=0;
+            if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
+            if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
+            if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
+            if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
+            if ($late) print img_warning($langs->trans("Late"));
+            print "</td>";
 
-			// Statut
-			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
+            // Statut
+            print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
 
-			print "</tr>\n";
+            print "</tr>\n";
 
             $i++;
         }
-	    print "</table><br>";
-
-	    $db->free($resql);
-	}
-	else
-	{
-	    dol_print_error($db);
-	}
+        print "</table><br>";
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -311,83 +311,83 @@ 
  */
 function show_array_last_actions_done($max=5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+    global $langs, $conf, $user, $db, $bc, $socid;
 
-	$now=dol_now();
+    $now=dol_now();
 
-	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
-	$sql.= " c.code, c.libelle,";
-	$sql.= " s.rowid, s.nom as sname, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
-	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
+    $sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
+    $sql.= " c.code, c.libelle,";
+    $sql.= " s.rowid, s.nom as sname, s.client";
+    $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+    $sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE a.entity = ".$conf->entity;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
     if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql .= " ORDER BY a.datep2 DESC";
-	$sql .= $db->plimit($max, 0);
+    $sql .= " ORDER BY a.datep2 DESC";
+    $sql .= $db->plimit($max, 0);
 
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
 
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
-		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
-		print '</tr>';
-		$var = true;
-		$i = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
+        print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
+        print '</tr>';
+        $var = true;
+        $i = 0;
 
-	    $staticaction=new ActionComm($db);
-	    $customerstatic=new Societe($db);
+        $staticaction=new ActionComm($db);
+        $customerstatic=new Societe($db);
 
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
 
 
-			print '<tr class="oddeven">';
+            print '<tr class="oddeven">';
 
-			$staticaction->type_code=$obj->code;
-			$staticaction->libelle=$obj->label;
-			$staticaction->id=$obj->id;
-			print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
+            $staticaction->type_code=$obj->code;
+            $staticaction->libelle=$obj->label;
+            $staticaction->id=$obj->id;
+            print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
 
             //print '<td>'.dol_trunc($obj->label,24).'</td>';
 
-			print '<td>';
-			if ($obj->rowid > 0)
-			{
+            print '<td>';
+            if ($obj->rowid > 0)
+            {
                 $customerstatic->id=$obj->rowid;
                 $customerstatic->name=$obj->sname;
                 $customerstatic->client=$obj->client;
-			    print $customerstatic->getNomUrl(1,'',24);
-			}
-			print '</td>';
-
-			// Date
-			print '<td width="100" align="right">'.dol_print_date($db->jdate($obj->da2),'day');
-			print "</td>";
-
-			// Statut
-			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
-
-			print "</tr>\n";
-			$i++;
-		}
-		// TODO Ajouter rappel pour "il y a des contrats a mettre en service"
-		// TODO Ajouter rappel pour "il y a des contrats qui arrivent a expiration"
-		print "</table><br>";
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+                print $customerstatic->getNomUrl(1,'',24);
+            }
+            print '</td>';
+
+            // Date
+            print '<td width="100" align="right">'.dol_print_date($db->jdate($obj->da2),'day');
+            print "</td>";
+
+            // Statut
+            print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
+
+            print "</tr>\n";
+            $i++;
+        }
+        // TODO Ajouter rappel pour "il y a des contrats a mettre en service"
+        // TODO Ajouter rappel pour "il y a des contrats qui arrivent a expiration"
+        print "</table><br>";
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -398,49 +398,49 @@ 
  */
 function agenda_prepare_head()
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_other.php";
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'other';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_other.php";
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'other';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda.php";
-	$head[$h][1] = $langs->trans("AutoActions");
-	$head[$h][2] = 'autoactions';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda.php";
+    $head[$h][1] = $langs->trans("AutoActions");
+    $head[$h][2] = 'autoactions';
+    $h++;
 
-	if ($conf->global->MAIN_FEATURES_LEVEL > 0)
-	{
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
-	$head[$h][1] = $langs->trans("Reminders");
-	$head[$h][2] = 'reminders';
-	$h++;
-	}
+    if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+    {
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
+    $head[$h][1] = $langs->trans("Reminders");
+    $head[$h][2] = 'reminders';
+    $h++;
+    }
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
-	$head[$h][1] = $langs->trans("ExportCal");
-	$head[$h][2] = 'xcal';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
+    $head[$h][1] = $langs->trans("ExportCal");
+    $head[$h][2] = 'xcal';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
-	$head[$h][1] = $langs->trans("ExtSites");
-	$head[$h][2] = 'extsites';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php";
+    $head[$h][1] = $langs->trans("ExtSites");
+    $head[$h][2] = 'extsites';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin');
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extrafields.php";
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extrafields.php";
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin','remove');
 
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -451,30 +451,30 @@ 
  */
 function actions_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardAction");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("CardAction");
+    $head[$h][2] = 'card';
+    $h++;
 
     // Tab to link resources
-	if ($conf->resource->enabled)
-	{
-	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-	    $resource=new DolResource($db);
+    if ($conf->resource->enabled)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+        $resource=new DolResource($db);
 
-		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
+        $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
         $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
         $nbResources=count($listofresourcelinked);
-		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
-		$head[$h][2] = 'resources';
-		$h++;
-	}
+        $head[$h][1] = $langs->trans("Resources");
+        if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+        $head[$h][2] = 'resources';
+        $h++;
+    }
 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -484,20 +484,20 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
     $head[$h][2] = 'documents';
     $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'action');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'action');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'action','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'action','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -549,7 +549,7 @@ 
     $h++;
 
 
-	$object=new stdClass();
+    $object=new stdClass();
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line

Spacing +108 added lines, -108 removed lines

@@ -47,24 +47,24 @@ 
  * @param	int   	$resourceid	    Preselected value of resource for filter on resource
  * @return	void
  */
-function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals=array(), $actioncode='', $usergroupid='', $excludetype='', $resourceid=0)
+function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals = array(), $actioncode = '', $usergroupid = '', $excludetype = '', $resourceid = 0)
 {
 	global $conf, $user, $langs, $db, $hookmanager;
 	global $begin_h, $end_h, $begin_d, $end_d;
 
 	$langs->load("companies");
 
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	$formactions=new FormActions($db);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	$formactions = new FormActions($db);
 
 	// Filters
 	//print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
-	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-	print '<input type="hidden" name="year" value="' . $year . '">';
-	print '<input type="hidden" name="month" value="' . $month . '">';
-	print '<input type="hidden" name="day" value="' . $day . '">';
-	print '<input type="hidden" name="action" value="' . $action . '">';
-	print '<input type="hidden" name="search_showbirthday" value="' . $showbirthday . '">';
+	print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+	print '<input type="hidden" name="year" value="'.$year.'">';
+	print '<input type="hidden" name="month" value="'.$month.'">';
+	print '<input type="hidden" name="day" value="'.$day.'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';
 
 	print '<div class="fichecenter">';
 
@@ -79,15 +79,15 @@ 
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		print $langs->trans("ActionsToDoBy").' &nbsp; ';
 		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
-		print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
-		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
+		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or").' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit);
 		print '</td></tr>';
 
 		if ($conf->resource->enabled)
 		{
-		    include_once DOL_DOCUMENT_ROOT . '/resource/class/html.formresource.class.php';
-		    $formresource=new FormResource($db);
+		    include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
+		    $formresource = new FormResource($db);
 
     		// Resource
     		print '<tr>';
@@ -103,16 +103,16 @@ 
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		print $langs->trans("Type");
 		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$multiselect=0;
-		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+		$multiselect = 0;
+		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 		{
-            $multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
+            $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 		}
-        print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
+        print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect);
 		print '</td></tr>';
 	}
 
-	if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 	{
 		print '<tr>';
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
@@ -122,20 +122,20 @@ 
 		print '</td></tr>';
 	}
 
-	if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-		$formproject=new FormProjets($db);
+		$formproject = new FormProjets($db);
 
 		print '<tr>';
 		print '<td class="nowrap" style="padding-bottom: 2px;">';
 		print $langs->trans("Project").' &nbsp; ';
 		print '</td><td class="nowrap" style="padding-bottom: 2px;">';
-		print $formproject->select_projects($socid?$socid:-1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print '</td></tr>';
 	}
 
-	if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
+	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"]))
 	{
 		// Status
 		print '<tr>';
@@ -188,7 +188,7 @@ 
 
 	print '<table class="centpercent"><tr><td align="center">';
 	print '<div class="formleftzone">';
-	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
+	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="'.$langs->trans("Refresh").'">';
 	print '</div>';
 	print '</td></tr>';
 	print '</table>';
@@ -196,7 +196,7 @@ 
 	if ($conf->browser->layout == 'phone') print '</div>';
 	else print '</td></tr></table>';
 
-	print '</div>';	// Close fichecenter
+	print '</div>'; // Close fichecenter
 	print '<div style="clear:both"></div>';
 
 	//print '</form>';
@@ -209,44 +209,44 @@ 
  *  @param	int		$max		Max nb of records
  *  @return	void
  */
-function show_array_actions_to_do($max=5)
+function show_array_actions_to_do($max = 5)
 {
 	global $langs, $conf, $user, $db, $bc, $socid;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
 	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql.= " c.code, c.libelle as type_label,";
-	$sql.= " s.nom as sname, s.rowid, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
-	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE a.entity = ".$conf->entity;
-    $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
-	$sql.= " ORDER BY a.datep DESC, a.id DESC";
-	$sql.= $db->plimit($max, 0);
-
-	$resql=$db->query($sql);
+	$sql .= " c.code, c.libelle as type_label,";
+	$sql .= " s.nom as sname, s.rowid, s.client";
+	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE a.entity = ".$conf->entity;
+    $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	$sql .= " ORDER BY a.datep DESC, a.id DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 	    $num = $db->num_rows($resql);
 
 	    print '<table class="noborder" width="100%">';
-	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
+	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';
 		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
 		$var = true;
 	    $i = 0;
 
-		$staticaction=new ActionComm($db);
-	    $customerstatic=new Client($db);
+		$staticaction = new ActionComm($db);
+	    $customerstatic = new Client($db);
 
         while ($i < $num)
         {
@@ -255,38 +255,38 @@ 
 
             print '<tr class="oddeven">';
 
-            $staticaction->type_code=$obj->code;
-            $staticaction->label=($obj->label?$obj->label:$obj->type_label);
-            $staticaction->id=$obj->id;
-            print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
+            $staticaction->type_code = $obj->code;
+            $staticaction->label = ($obj->label ? $obj->label : $obj->type_label);
+            $staticaction->id = $obj->id;
+            print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
 
            // print '<td>'.dol_trunc($obj->label,22).'</td>';
 
             print '<td>';
             if ($obj->rowid > 0)
             {
-            	$customerstatic->id=$obj->rowid;
-            	$customerstatic->name=$obj->sname;
-            	$customerstatic->client=$obj->client;
-            	print $customerstatic->getNomUrl(1,'',16);
+            	$customerstatic->id = $obj->rowid;
+            	$customerstatic->name = $obj->sname;
+            	$customerstatic->client = $obj->client;
+            	print $customerstatic->getNomUrl(1, '', 16);
             }
             print '</td>';
 
-            $datep=$db->jdate($obj->dp);
-            $datep2=$db->jdate($obj->dp2);
+            $datep = $db->jdate($obj->dp);
+            $datep2 = $db->jdate($obj->dp2);
 
             // Date
-			print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
-			$late=0;
-			if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
-			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
+			print '<td width="100" align="right">'.dol_print_date($datep, 'day').'&nbsp;';
+			$late = 0;
+			if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;
+			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) $late = 1;
+			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late = 1;
+			if ($obj->percent > 0 && $obj->percent < 100 && !$datep2 && $datep && $datep < time()) $late = 1;
 			if ($late) print img_warning($langs->trans("Late"));
 			print "</td>";
 
 			// Statut
-			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
+			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent, 3)."</td>\n";
 
 			print "</tr>\n";
 
@@ -309,40 +309,40 @@ 
  *  @param	int		$max		Max nb of records
  *  @return	void
  */
-function show_array_last_actions_done($max=5)
+function show_array_last_actions_done($max = 5)
 {
 	global $langs, $conf, $user, $db, $bc, $socid;
 
-	$now=dol_now();
+	$now = dol_now();
 
 	$sql = "SELECT a.id, a.percent, a.datep as da, a.datep2 as da2, a.fk_user_author, a.label,";
-	$sql.= " c.code, c.libelle,";
-	$sql.= " s.rowid, s.nom as sname, s.client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
-	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE a.entity = ".$conf->entity;
-    $sql.= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    if ($socid) $sql.= " AND s.rowid = ".$socid;
+	$sql .= " c.code, c.libelle,";
+	$sql .= " s.rowid, s.nom as sname, s.client";
+	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
+	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE a.entity = ".$conf->entity;
+    $sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    if ($socid) $sql .= " AND s.rowid = ".$socid;
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks", $max).'</th>';
 		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		$var = true;
 		$i = 0;
 
-	    $staticaction=new ActionComm($db);
-	    $customerstatic=new Societe($db);
+	    $staticaction = new ActionComm($db);
+	    $customerstatic = new Societe($db);
 
 		while ($i < $num)
 		{
@@ -351,29 +351,29 @@ 
 
 			print '<tr class="oddeven">';
 
-			$staticaction->type_code=$obj->code;
-			$staticaction->libelle=$obj->label;
-			$staticaction->id=$obj->id;
-			print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
+			$staticaction->type_code = $obj->code;
+			$staticaction->libelle = $obj->label;
+			$staticaction->id = $obj->id;
+			print '<td>'.$staticaction->getNomUrl(1, 34).'</td>';
 
             //print '<td>'.dol_trunc($obj->label,24).'</td>';
 
 			print '<td>';
 			if ($obj->rowid > 0)
 			{
-                $customerstatic->id=$obj->rowid;
-                $customerstatic->name=$obj->sname;
-                $customerstatic->client=$obj->client;
-			    print $customerstatic->getNomUrl(1,'',24);
+                $customerstatic->id = $obj->rowid;
+                $customerstatic->name = $obj->sname;
+                $customerstatic->client = $obj->client;
+			    print $customerstatic->getNomUrl(1, '', 24);
 			}
 			print '</td>';
 
 			// Date
-			print '<td width="100" align="right">'.dol_print_date($db->jdate($obj->da2),'day');
+			print '<td width="100" align="right">'.dol_print_date($db->jdate($obj->da2), 'day');
 			print "</td>";
 
 			// Statut
-			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent,3)."</td>\n";
+			print "<td align=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent, 3)."</td>\n";
 
 			print "</tr>\n";
 			$i++;
@@ -430,14 +430,14 @@ 
 	$head[$h][2] = 'extsites';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda_admin');
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extrafields.php";
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda_admin', 'remove');
 
 
 	return $head;
@@ -465,13 +465,13 @@ 
 	if ($conf->resource->enabled)
 	{
 	    include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-	    $resource=new DolResource($db);
+	    $resource = new DolResource($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
         $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
-        $nbResources=count($listofresourcelinked);
+        $nbResources = count($listofresourcelinked);
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+		if ($nbResources > 0) $head[$h][1] .= ' <span class="badge">'.($nbResources).'</span>';
 		$head[$h][2] = 'resources';
 		$h++;
 	}
@@ -479,12 +479,12 @@ 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->agenda->dir_output . "/" . $object->id;
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+    $upload_dir = $conf->agenda->dir_output."/".$object->id;
+    $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
     $head[$h][2] = 'documents';
     $h++;
 
@@ -493,9 +493,9 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'action');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'action');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'action','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'action', 'remove');
 
 	return $head;
 }
@@ -514,50 +514,50 @@ 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param?'?'.$param:'');
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param ? '?'.$param : '');
     $head[$h][1] = $langs->trans("ViewList");
     $head[$h][2] = 'cardlist';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param?'&'.$param:'');
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
     $head[$h][1] = $langs->trans("ViewCal");
     $head[$h][2] = 'cardmonth';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param?'&'.$param:'');
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
     $head[$h][1] = $langs->trans("ViewWeek");
     $head[$h][2] = 'cardweek';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param?'&'.$param:'');
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
     $head[$h][1] = $langs->trans("ViewDay");
     $head[$h][2] = 'cardday';
     $h++;
 
     //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    if (! empty($conf->global->AGENDA_SHOW_PERTYPE))
+    if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
     {
-        $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param?'?'.$param:'');
+        $head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
         $head[$h][1] = $langs->trans("ViewPerType");
         $head[$h][2] = 'cardpertype';
         $h++;
     }
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($param?'?'.$param:'');
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($param ? '?'.$param : '');
     $head[$h][1] = $langs->trans("ViewPerUser");
     $head[$h][2] = 'cardperuser';
     $h++;
 
 
-	$object=new stdClass();
+	$object = new stdClass();
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'agenda');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'agenda');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'agenda','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'agenda', 'remove');
 
     return $head;
 }

Braces +80 added lines, -32 removed lines

@@ -68,8 +68,11 @@ 
 
 	print '<div class="fichecenter">';
 
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
-	else print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+	if ($conf->browser->layout == 'phone') {
+	    print '<div class="fichehalfleft">';
+	} else {
+	    print '<table class="nobordernopadding" width="100%"><tr><td class="borderright">';
+	}
 
 	print '<table class="nobordernopadding centpercent">';
 
@@ -80,7 +83,9 @@ 
 		print $langs->trans("ActionsToDoBy").' &nbsp; ';
 		print '</td><td style="padding-bottom: 2px; padding-right: 4px;">';
 		print $form->select_dolusers($filtert, 'search_filtert', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+		if (empty($conf->dol_optimize_smallscreen)) {
+		    print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
+		}
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
 		print '</td></tr>';
 
@@ -104,10 +109,12 @@ 
 		print $langs->trans("Type");
 		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		$multiselect=0;
-		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+		if (! empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {
+		    // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 		{
             $multiselect=(!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 		}
+		}
         print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1), 0, $multiselect);
 		print '</td></tr>';
 	}
@@ -154,10 +161,15 @@ 
 		print "<td class='nowrap'>";
 		print '<div class="ui-grid-a"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+		    print ' - ';
+		} else {
+		    print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+		if (empty($conf->dol_use_jmobile)) {
+		    print ' '.$langs->trans("H");
+		}
 		print '</div></div>';
 		print '</td></tr>';
 
@@ -167,8 +179,11 @@ 
 		print "<td class='nowrap'>";
 		print '<div class="ui-grid-a"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+		    print ' - ';
+		} else {
+		    print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</div></div>';
 		print '</td></tr>';
@@ -180,11 +195,17 @@ 
 
 	print '</table>';
 
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td>';
+	if ($conf->browser->layout == 'phone') {
+	    print '</div>';
+	} else {
+	    print '</td>';
+	}
 
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
-	else print '<td align="center" valign="middle" class="nowrap">';
+	if ($conf->browser->layout == 'phone') {
+	    print '<div class="fichehalfright">';
+	} else {
+	    print '<td align="center" valign="middle" class="nowrap">';
+	}
 
 	print '<table class="centpercent"><tr><td align="center">';
 	print '<div class="formleftzone">';
@@ -193,8 +214,11 @@ 
 	print '</td></tr>';
 	print '</table>';
 
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td></tr></table>';
+	if ($conf->browser->layout == 'phone') {
+	    print '</div>';
+	} else {
+	    print '</td></tr></table>';
+	}
 
 	print '</div>';	// Close fichecenter
 	print '<div style="clear:both"></div>';
@@ -224,11 +248,17 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+	if ($socid) {
+	    $sql.= " AND s.rowid = ".$socid;
+	}
 	$sql.= " ORDER BY a.datep DESC, a.id DESC";
 	$sql.= $db->plimit($max, 0);
 
@@ -278,11 +308,21 @@ 
             // Date
 			print '<td width="100" align="right">'.dol_print_date($datep,'day').'&nbsp;';
 			$late=0;
-			if ($obj->percent == 0 && $datep && $datep < time()) $late=1;
-			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late=1;
-			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) $late=1;
-			if ($late) print img_warning($langs->trans("Late"));
+			if ($obj->percent == 0 && $datep && $datep < time()) {
+			    $late=1;
+			}
+			if ($obj->percent == 0 && ! $datep && $datep2 && $datep2 < time()) {
+			    $late=1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) {
+			    $late=1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && ! $datep2 && $datep && $datep < time()) {
+			    $late=1;
+			}
+			if ($late) {
+			    print img_warning($langs->trans("Late"));
+			}
 			print "</td>";
 
 			// Statut
@@ -295,8 +335,7 @@ 
 	    print "</table><br>";
 
 	    $db->free($resql);
-	}
-	else
+	} else
 	{
 	    dol_print_error($db);
 	}
@@ -321,11 +360,17 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql.= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE a.entity = ".$conf->entity;
     $sql.= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    if ($socid) $sql.= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+    if ($socid) {
+        $sql.= " AND s.rowid = ".$socid;
+    }
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -383,8 +428,7 @@ 
 		print "</table><br>";
 
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -471,7 +515,9 @@ 
         $listofresourcelinked = $resource->getElementResources($object->element, $object->id);
         $nbResources=count($listofresourcelinked);
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResources > 0) $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+		if ($nbResources > 0) {
+		    $head[$h][1].= ' <span class="badge">'.($nbResources).'</span>';
+		}
 		$head[$h][2] = 'resources';
 		$h++;
 	}
@@ -484,7 +530,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
     $head[$h][2] = 'documents';
     $h++;
 

dolibarr/htdocs/core/lib/invoice.lib.php

Indentation +107 added lines, -107 removed lines

@@ -35,33 +35,33 @@ 
  */
 function facture_prepare_head($object)
 {
-	global $db, $langs, $conf;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'compta';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
-	//if ($fac->mode_reglement_code == 'PRE')
-	if (! empty($conf->prelevement->enabled))
-	{
-	    $nbStandingOrders=0;
-	    $sql = "SELECT COUNT(pfd.rowid) as nb";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-	    $sql .= " WHERE pfd.fk_facture = ".$object->id;
+    global $db, $langs, $conf;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Card');
+    $head[$h][2] = 'compta';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
+
+    //if ($fac->mode_reglement_code == 'PRE')
+    if (! empty($conf->prelevement->enabled))
+    {
+        $nbStandingOrders=0;
+        $sql = "SELECT COUNT(pfd.rowid) as nb";
+        $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+        $sql .= " WHERE pfd.fk_facture = ".$object->id;
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -69,12 +69,12 @@ 
             if ($obj) $nbStandingOrders = $obj->nb;
         }
         else dol_print_error($db);
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
-		$head[$h][1] = $langs->trans('StandingOrders');
-		if ($nbStandingOrders > 0) $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
-		$head[$h][2] = 'standingorders';
-		$h++;
-	}
+        $head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('StandingOrders');
+        if ($nbStandingOrders > 0) $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
+        $head[$h][2] = 'standingorders';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -84,35 +84,35 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -122,50 +122,50 @@ 
  */
 function invoice_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/facture.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/admin/payment.php';
-	$head[$h][1] = $langs->trans("Payments");
-	$head[$h][2] = 'payment';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin');
-
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_cust_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoices");
-	$head[$h][2] = 'attributes';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_cust_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_rec_cust_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoicesRec");
-	$head[$h][2] = 'attributesrec';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_rec_cust_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLinesRec");
-	$head[$h][2] = 'attributeslinesrec';
-	$h++;
-
-	complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin','remove');
-
-	return $head;
+    global $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/admin/facture.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/admin/payment.php';
+    $head[$h][1] = $langs->trans("Payments");
+    $head[$h][2] = 'payment';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin');
+
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_cust_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoices");
+    $head[$h][2] = 'attributes';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_cust_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_rec_cust_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoicesRec");
+    $head[$h][2] = 'attributesrec';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_rec_cust_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLinesRec");
+    $head[$h][2] = 'attributeslinesrec';
+    $h++;
+
+    complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin','remove');
+
+    return $head;
 }
 
 
@@ -177,15 +177,15 @@ 
  */
 function invoice_rec_prepare_head($object)
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardBill");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/fiche-rec.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("CardBill");
+    $head[$h][2] = 'card';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -193,7 +193,7 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec','remove');
 
-	return $head;
+    return $head;
 }

Spacing +20 added lines, -20 removed lines

@@ -47,31 +47,31 @@ 
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) $head[$h][1] .= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
 	//if ($fac->mode_reglement_code == 'PRE')
-	if (! empty($conf->prelevement->enabled))
+	if (!empty($conf->prelevement->enabled))
 	{
-	    $nbStandingOrders=0;
+	    $nbStandingOrders = 0;
 	    $sql = "SELECT COUNT(pfd.rowid) as nb";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 	    $sql .= " WHERE pfd.fk_facture = ".$object->id;
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
-            $obj=$db->fetch_object($resql);
+            $obj = $db->fetch_object($resql);
             if ($obj) $nbStandingOrders = $obj->nb;
         }
         else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
-		if ($nbStandingOrders > 0) $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
+		if ($nbStandingOrders > 0) $head[$h][1] .= ' <span class="badge">'.$nbStandingOrders.'</span>';
 		$head[$h][2] = 'standingorders';
 		$h++;
 	}
@@ -80,28 +80,28 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -110,7 +110,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice', 'remove');
 
 	return $head;
 }
@@ -141,7 +141,7 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'invoice_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoices");
@@ -163,7 +163,7 @@ 
 	$head[$h][2] = 'attributeslinesrec';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'invoice_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'invoice_admin', 'remove');
 
 	return $head;
 }
@@ -191,9 +191,9 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice-rec','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice-rec', 'remove');
 
 	return $head;
 }

Braces +23 added lines, -8 removed lines

@@ -50,7 +50,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -66,12 +68,17 @@ 
         if ($resql)
         {
             $obj=$db->fetch_object($resql);
-            if ($obj) $nbStandingOrders = $obj->nb;
+            if ($obj) {
+                $nbStandingOrders = $obj->nb;
+            }
+        } else {
+            dol_print_error($db);
         }
-        else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
-		if ($nbStandingOrders > 0) $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
+		if ($nbStandingOrders > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbStandingOrders.'</span>';
+		}
 		$head[$h][2] = 'standingorders';
 		$h++;
 	}
@@ -85,11 +92,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+		if(!empty($object->note_public)) {
+		    $nbNote++;
+		}
     	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -101,7 +114,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 

dolibarr/htdocs/core/lib/hrm.lib.php

Indentation +18 added lines, -18 removed lines

@@ -30,30 +30,30 @@ 
  */
 function establishment_prepare_head($object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment');
 
-	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -68,12 +68,12 @@ 
     $h = 0;
     $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_hrm.php';
+    $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_hrm.php';
     $head[$h][1] = $langs->trans("Parameters");
     $head[$h][2] = 'parameters';
     $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php';
+    $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php';
     $head[$h][1] = $langs->trans("Establishments");
     $head[$h][2] = 'establishments';
     $h++;

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -44,14 +44,14 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'establishment');
 
-	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'establishment','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'establishment', 'remove');
 
 	return $head;
 }
@@ -82,9 +82,9 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,'',$head,$h,'hrm_admin');
+    complete_head_from_modules($conf, $langs, '', $head, $h, 'hrm_admin');
 
-    complete_head_from_modules($conf,$langs,'',$head,$h,'hrm_admin','remove');
+    complete_head_from_modules($conf, $langs, '', $head, $h, 'hrm_admin', 'remove');
 
     return $head;
 }

dolibarr/htdocs/core/lib/payments.lib.php

Indentation +174 added lines, -174 removed lines

@@ -28,15 +28,15 @@ 
 function payment_prepare_head(Paiement $object)
 {
 
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'payment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'payment';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -44,14 +44,14 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'payment');
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -63,15 +63,15 @@ 
  */
 function payment_supplier_prepare_head(Paiement $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'payment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'payment';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -79,14 +79,14 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier');
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -97,23 +97,23 @@ 
  */
 function getValidOnlinePaymentMethods($paymentmethod='')
 {
-	global $conf;
-
-	$validpaymentmethod=array();
-
-	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
-	{
-		$validpaymentmethod['paypal']='valid';
-	}
-	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
-	{
-		$validpaymentmethod['paybox']='valid';
-	}
-	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
-	{
-		$validpaymentmethod['stripe']='valid';
-	}
-	return $validpaymentmethod;
+    global $conf;
+
+    $validpaymentmethod=array();
+
+    if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
+    {
+        $validpaymentmethod['paypal']='valid';
+    }
+    if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
+    {
+        $validpaymentmethod['paybox']='valid';
+    }
+    if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
+    {
+        $validpaymentmethod['stripe']='valid';
+    }
+    return $validpaymentmethod;
 }
 
 /**
@@ -125,18 +125,18 @@ 
  */
 function showOnlinePaymentUrl($type,$ref)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array('payment', 'paybox'));
 
-	$servicename='Online';
+    $servicename='Online';
 
-	$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
-	$url = getOnlinePaymentUrl(0,$type,$ref);
-	$out.= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
-	$out.= ajax_autoselect("onlinepaymenturl", 0);
-	return $out;
+    $out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
+    $url = getOnlinePaymentUrl(0,$type,$ref);
+    $out.= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
+    $out.= ajax_autoselect("onlinepaymenturl", 0);
+    return $out;
 }
 
 /**
@@ -151,115 +151,115 @@ 
  */
 function getOnlinePaymentUrl($mode, $type, $ref='', $amount='9.99', $freetag='your_free_tag')
 {
-	global $conf;
-
-	$ref=str_replace(' ','',$ref);
-	$out='';
-
-	if ($type == 'free')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-		}
-	}
-	elseif ($type == 'order')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='order_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	elseif ($type == 'invoice')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='invoice_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	elseif ($type == 'contractline')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='contractline_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	elseif ($type == 'member' || $type == 'membersubscription')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='member_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	if ($type == 'donation')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='donation_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-
-	// For multicompany
-	if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
-
-	return $out;
+    global $conf;
+
+    $ref=str_replace(' ','',$ref);
+    $out='';
+
+    if ($type == 'free')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+        }
+    }
+    elseif ($type == 'order')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='order_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    elseif ($type == 'invoice')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='invoice_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    elseif ($type == 'contractline')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='contractline_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    elseif ($type == 'member' || $type == 'membersubscription')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='member_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'donation')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='donation_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+
+    // For multicompany
+    if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+
+    return $out;
 }
 
 
@@ -331,20 +331,20 @@ 
     print '<div class="center">'."\n";
     if ($addformmessage)
     {
-    	print '<!-- object = '.$object->element.' -->';
-    	print '<br>';
-
-    	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
-
-    	// Add other message if VAT exists
-    	if ($object->total_vat != 0 || $object->total_tva != 0)
-    	{
-    		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
-    	}
+        print '<!-- object = '.$object->element.' -->';
+        print '<br>';
+
+        $parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+        if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+        elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+
+        // Add other message if VAT exists
+        if ($object->total_vat != 0 || $object->total_tva != 0)
+        {
+            $parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+            if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+            elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+        }
     }
 
     print '<font style="font-size: 10px;"><br><hr>'."\n";

Spacing +101 added lines, -101 removed lines

@@ -42,14 +42,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment', 'remove');
 
 	return $head;
 }
@@ -77,14 +77,14 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier', 'remove');
 
 	return $head;
 }
@@ -95,23 +95,23 @@ 
  * @param	string	$paymentmethod		Filter on this payment method (''=none, 'paypal', ...)
  * @return	array						Array of valid payment method
  */
-function getValidOnlinePaymentMethods($paymentmethod='')
+function getValidOnlinePaymentMethods($paymentmethod = '')
 {
 	global $conf;
 
-	$validpaymentmethod=array();
+	$validpaymentmethod = array();
 
-	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
+	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled))
 	{
-		$validpaymentmethod['paypal']='valid';
+		$validpaymentmethod['paypal'] = 'valid';
 	}
-	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
+	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))
 	{
-		$validpaymentmethod['paybox']='valid';
+		$validpaymentmethod['paybox'] = 'valid';
 	}
-	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
+	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled))
 	{
-		$validpaymentmethod['stripe']='valid';
+		$validpaymentmethod['stripe'] = 'valid';
 	}
 	return $validpaymentmethod;
 }
@@ -123,19 +123,19 @@ 
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type,$ref)
+function showOnlinePaymentUrl($type, $ref)
 {
 	global $conf, $langs;
 
 	// Load translation files required by the page
     $langs->loadLangs(array('payment', 'paybox'));
 
-	$servicename='Online';
+	$servicename = 'Online';
 
-	$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
-	$url = getOnlinePaymentUrl(0,$type,$ref);
-	$out.= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
-	$out.= ajax_autoselect("onlinepaymenturl", 0);
+	$out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+	$url = getOnlinePaymentUrl(0, $type, $ref);
+	$out .= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
+	$out .= ajax_autoselect("onlinepaymenturl", 0);
 	return $out;
 }
 
@@ -149,115 +149,115 @@ 
  * @param	string	$freetag	Free tag
  * @return	string				Url string
  */
-function getOnlinePaymentUrl($mode, $type, $ref='', $amount='9.99', $freetag='your_free_tag')
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_free_tag')
 {
 	global $conf;
 
-	$ref=str_replace(' ','',$ref);
-	$out='';
+	$ref = str_replace(' ', '', $ref);
+	$out = '';
 
 	if ($type == 'free')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}
 	}
 	elseif ($type == 'order')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='order_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'order_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	elseif ($type == 'invoice')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='invoice_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'invoice_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	elseif ($type == 'contractline')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='contractline_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'contractline_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	elseif ($type == 'member' || $type == 'membersubscription')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='member_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'member_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 	if ($type == 'donation')
 	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='donation_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+		$out = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
+		if ($mode == 1) $out .= 'donation_ref';
+		if ($mode == 0) $out .= urlencode($ref);
+		$out .= ($mode ? '</font>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else
 			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
+				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
+				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 
 	// For multicompany
-	if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+	if (!empty($out) && !empty($conf->multicompany->enabled)) $out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
 
 	return $out;
 }
@@ -274,56 +274,56 @@ 
  * @param	Object		$object			Object related to payment
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage=0, $suffix='', $object=null)
+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
 {
     global $conf;
 
     // Juridical status
-    $line1="";
+    $line1 = "";
     if ($fromcompany->forme_juridique_code)
     {
-        $line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+        $line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
     }
     // Capital
     if ($fromcompany->capital)
     {
-        $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+        $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
     }
     // Prof Id 1
-    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
     {
-        $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+        $field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
     }
     // Prof Id 2
     if ($fromcompany->idprof2)
     {
-        $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+        $field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
     }
 
     // Second line of company infos
-    $line2="";
+    $line2 = "";
     // Prof Id 3
     if ($fromcompany->idprof3)
     {
-        $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+        $field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
     }
     // Prof Id 4
     if ($fromcompany->idprof4)
     {
-        $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+        $field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
     }
     // IntraCommunautary VAT
     if ($fromcompany->tva_intra != '')
     {
-        $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+        $line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
     }
 
     print '<br>';
@@ -334,16 +334,16 @@ 
     	print '<!-- object = '.$object->element.' -->';
     	print '<br>';
 
-    	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+    	$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+    	if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+    	elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
 
     	// Add other message if VAT exists
     	if ($object->total_vat != 0 || $object->total_tva != 0)
     	{
-    		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+    		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+    		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+    		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
     	}
     }
 

Braces +115 added lines, -51 removed lines

@@ -161,78 +161,113 @@ 
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			    $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
+			    $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			}
 		}
-	}
-	elseif ($type == 'order')
+	} elseif ($type == 'order')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='order_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+		    $out.='order_ref';
+		}
+		if ($mode == 0) {
+		    $out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			    $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+				    $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+				}
+				if ($mode == 0) {
+				    $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
-	}
-	elseif ($type == 'invoice')
+	} elseif ($type == 'invoice')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='invoice_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+		    $out.='invoice_ref';
+		}
+		if ($mode == 0) {
+		    $out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			    $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+				    $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				}
+				if ($mode == 0) {
+				    $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
-	}
-	elseif ($type == 'contractline')
+	} elseif ($type == 'contractline')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='contractline_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+		    $out.='contractline_ref';
+		}
+		if ($mode == 0) {
+		    $out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			    $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+				    $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+				}
+				if ($mode == 0) {
+				    $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
-	}
-	elseif ($type == 'member' || $type == 'membersubscription')
+	} elseif ($type == 'member' || $type == 'membersubscription')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='member_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+		    $out.='member_ref';
+		}
+		if ($mode == 0) {
+		    $out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			    $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+				    $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+				}
+				if ($mode == 0) {
+				    $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
@@ -240,24 +275,36 @@ 
 	if ($type == 'donation')
 	{
 		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='donation_ref';
-		if ($mode == 0) $out.=urlencode($ref);
+		if ($mode == 1) {
+		    $out.='donation_ref';
+		}
+		if ($mode == 0) {
+		    $out.=urlencode($ref);
+		}
 		$out.=($mode?'</font>':'');
 		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			    $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else
 			{
 				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				if ($mode == 1) {
+				    $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
+				}
+				if ($mode == 0) {
+				    $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+				}
 				$out.=($mode?'</font>':'');
 			}
 		}
 	}
 
 	// For multicompany
-	if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+	if (! empty($out) && ! empty($conf->multicompany->enabled)) {
+	    $out.="&entity=".$conf->entity;
+	}
+	// Check the entity because we may have the same reference in several entities
 
 	return $out;
 }
@@ -293,14 +340,18 @@ 
     if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
     {
         $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+            $field=$reg[1];
+        }
         $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
     }
     // Prof Id 2
     if ($fromcompany->idprof2)
     {
         $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+            $field=$reg[1];
+        }
         $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
     }
 
@@ -310,14 +361,18 @@ 
     if ($fromcompany->idprof3)
     {
         $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+            $field=$reg[1];
+        }
         $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
     }
     // Prof Id 4
     if ($fromcompany->idprof4)
     {
         $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        if (preg_match('/\((.*)\)/i',$field,$reg)) {
+            $field=$reg[1];
+        }
         $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
     }
     // IntraCommunautary VAT
@@ -335,23 +390,32 @@ 
     	print '<br>';
 
     	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+    	if (! empty($conf->global->$parammessageform)) {
+    	    print $langs->transnoentities($conf->global->$parammessageform);
+    	} elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) {
+    	    print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+    	}
 
     	// Add other message if VAT exists
     	if ($object->total_vat != 0 || $object->total_tva != 0)
     	{
     		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+    		if (! empty($conf->global->$parammessageform)) {
+    		    print $langs->transnoentities($conf->global->$parammessageform);
+    		} elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) {
+    		    print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+    		}
     	}
     }
 
     print '<font style="font-size: 10px;"><br><hr>'."\n";
     print $fromcompany->name.'<br>';
     print $line1;
-    if (strlen($line1.$line2) > 50) print '<br>';
-    else print ' - ';
+    if (strlen($line1.$line2) > 50) {
+        print '<br>';
+    } else {
+        print ' - ';
+    }
     print $line2;
     print '</font></div>'."\n";
 }

dolibarr/htdocs/core/lib/asset.lib.php

Indentation +91 added lines, -91 removed lines

@@ -28,41 +28,41 @@ 
  */
 function asset_admin_prepare_head()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$langs->load("assets");
+    $langs->load("assets");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
-	$head[$h][1] = $langs->trans("Settings");
-	$head[$h][2] = 'settings';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
+    $head[$h][1] = $langs->trans("Settings");
+    $head[$h][2] = 'settings';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
-	$head[$h][2] = 'attributes_type';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
+    $head[$h][2] = 'attributes_type';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -72,56 +72,56 @@ 
  */
 function asset_prepare_head()
 {
-	global $langs, $conf;
-
-	$langs->load("assets");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
-
-	$nbNote = 0;
-	if(!empty($object->note_private)) $nbNote++;
-	if(!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-	$head[$h][2] = 'note';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT . '/asset/info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
-
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'asset', 'remove');
-
-	return $head;
+    global $langs, $conf;
+
+    $langs->load("assets");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+    $head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
+
+    $nbNote = 0;
+    if(!empty($object->note_private)) $nbNote++;
+    if(!empty($object->note_public)) $nbNote++;
+    $head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Notes");
+    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    $head[$h][2] = 'note';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT . '/asset/info.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
+
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'asset', 'remove');
+
+    return $head;
 }
 
 /**
@@ -132,23 +132,23 @@ 
  */
 function asset_type_prepare_head(AssetType $object)
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h=0;
-	$head = array();
+    $h=0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype','remove');
 
-	return $head;
+    return $head;
 }

Spacing +15 added lines, -15 removed lines

@@ -35,7 +35,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/setup.php';
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -50,12 +50,12 @@ 
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_type_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
 	$head[$h][2] = 'attributes_type';
 	$h++;
@@ -79,7 +79,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php';
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -96,25 +96,25 @@ 
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->assets->dir_output.'/'.get_exdir($filename, 2, 0, 1, $object, 'assets').'/'.dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$nbNote = 0;
-	if(!empty($object->note_private)) $nbNote++;
-	if(!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note_private)) $nbNote++;
+	if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$head[$h][2] = 'note';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/info.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
@@ -134,7 +134,7 @@ 
 {
 	global $langs, $conf, $user;
 
-	$h=0;
+	$h = 0;
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
@@ -146,9 +146,9 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype', 'remove');
 
 	return $head;
 }

Braces +12 added lines, -4 removed lines

@@ -101,16 +101,24 @@
 	$nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$nbNote = 0;
-	if(!empty($object->note_private)) $nbNote++;
-	if(!empty($object->note_public)) $nbNote++;
+	if(!empty($object->note_private)) {
+	    $nbNote++;
+	}
+	if(!empty($object->note_public)) {
+	    $nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+	    $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 

dolibarr/htdocs/core/lib/vat.lib.php

Indentation +12 added lines, -12 removed lines

@@ -36,10 +36,10 @@ 
     $tab = 0;
     $head = array();
 
-	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans('Card');
-	$head[$tab][2] = 'card';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans('Card');
+    $head[$tab][2] = 'card';
+    $tab++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -47,16 +47,16 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf, $langs, $object, $head, $tab,'vat');
 	
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$tab][2] = 'documents';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$tab][2] = 'documents';
+    $tab++;
 
     $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;
     $head[$tab][1] = $langs->trans("Info");

Spacing +6 added lines, -6 removed lines

@@ -45,16 +45,16 @@ 
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $tab,'vat');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat');
 	
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$upload_dir = $conf->tax->dir_output."/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+    $nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$tab][2] = 'documents';
 	$tab++;
 
@@ -63,7 +63,7 @@ 
     $head[$tab][2] = 'info';
     $tab++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$tab,'vat','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'vat', 'remove');
 
     return $head;
 }

Braces +3 added lines, -1 removed lines

@@ -54,7 +54,9 @@
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$tab][2] = 'documents';
 	$tab++;