Dolibarr / dolibarr

htdocs/core/class/commonorder.class.php

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 	 * @deprecated
 	 * @see $subprice
 	 */
-    public $price;
+	public $price;
 
 	/**
 	 * Unit price before taxes

htdocs/dav/fileserver.php

Indentation +2 added lines, -2 removed lines

@@ -158,8 +158,8 @@
 // Support for html frontend
 if (empty($conf->global->DAV_DISABLE_BROWSER))
 {
-    $browser = new \Sabre\DAV\Browser\Plugin();
-    $server->addPlugin($browser);
+	$browser = new \Sabre\DAV\Browser\Plugin();
+	$server->addPlugin($browser);
 }
 
 // Automatically guess (some) contenttypes, based on extension

Braces +39 added lines, -13 removed lines

@@ -25,12 +25,28 @@ 
  *      \brief      Server DAV
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOLOGIN'))  		 define("NOLOGIN", 1); // This means this output page does not require to be logged.
-if (!defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+// If there is no menu to show
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+// If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1);
+}
+// This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1);
+}
+// We accept to go on this page from external web site.
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -51,8 +67,9 @@ 
 $langs->loadLangs(array("main", "other"));
 
 
-if (empty($conf->dav->enabled))
+if (empty($conf->dav->enabled)) {
 	accessforbidden();
+}
 
 
 // Restrict API to some IPs
@@ -104,12 +121,16 @@ 
 	}
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'dolibarr';
+	if (empty($dolibarr_main_authentication)) {
+		$dolibarr_main_authentication = 'dolibarr';
+	}
 
 	// Authentication mode: forceuser
 	if ($dolibarr_main_authentication == 'forceuser')
 	{
-		if (empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+		if (empty($dolibarr_auto_user)) {
+			$dolibarr_auto_user = 'auto';
+		}
 		if ($dolibarr_auto_user != $username)
 		{
 			dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. DAV usage is forbidden in this mode.");
@@ -120,8 +141,9 @@ 
 	$authmode = explode(',', $dolibarr_main_authentication);
 	$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username)
-		return false;
+	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username) {
+			return false;
+	}
 
 	return true;
 });
@@ -175,7 +197,9 @@ 
 // If you want to run the SabreDAV server in a custom location (using mod_rewrite for instance)
 // You can override the baseUri here.
 $baseUri = DOL_URL_ROOT.'/dav/fileserver.php/';
-if (isset($baseUri)) $server->setBaseUri($baseUri);
+if (isset($baseUri)) {
+	$server->setBaseUri($baseUri);
+}
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
@@ -213,4 +237,6 @@ 
 // And off we go!
 $server->exec();
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 
 // Authentication callback function
-$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
+$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($username, $password) {
 	global $user;
 	global $conf;
 	global $dolibarr_main_authentication, $dolibarr_auto_user;

htdocs/core/modules/modCron.class.php

Indentation +42 added lines, -42 removed lines

@@ -32,37 +32,37 @@ 
 class modCron extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	global $langs, $conf;
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
-        $this->numero = 2300;
+		$this->db = $db;
+		$this->numero = 2300;
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		// It is used to group modules in module setup page
-        $this->family = "base";
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the Dolibarr cron service";
+		$this->family = "base";
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the Dolibarr cron service";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'dolibarr';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'dolibarr';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //-------------
-        $this->config_page_url = array("cron.php@cron");
+		// Config pages
+		//-------------
+		$this->config_page_url = array("cron.php@cron");
 
 		// Dependancies
 		//-------------
@@ -85,13 +85,13 @@ 
 					0
 				),);
 
-        // New pages on tabs
-        // -----------------
-        $this->tabs = array();
+		// New pages on tabs
+		// -----------------
+		$this->tabs = array();
 
-        // Boxes
-        //------
-        $this->boxes = array();
+		// Boxes
+		//------
+		$this->boxes = array();
 
 		// Cronjobs
 		$this->cronjobs = array(
@@ -100,7 +100,7 @@ 
 			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
 		);
 
-        // Permissions
+		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$this->rights_class = 'cron';
 		$r = 0;
@@ -129,18 +129,18 @@ 
 		$this->rights[$r][4] = 'execute';
 		$r++;
 
-        // Main menu entries
-        $r = 0;
-        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-						        'type'=>'left', // This is a Left menu entry
-						        'titre'=>'CronList',
-						        'url'=>'/cron/list.php?leftmenu=admintools',
-						        'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-						        'position'=>200,
-						        'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-						        'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-						        'target'=>'',
-						        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
-        $r++;
-    }
+		// Main menu entries
+		$r = 0;
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+								'type'=>'left', // This is a Left menu entry
+								'titre'=>'CronList',
+								'url'=>'/cron/list.php?leftmenu=admintools',
+								'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+								'position'=>200,
+								'enabled'=>'$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+								'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+								'target'=>'',
+								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
+	}
 }

scripts/user/sync_groups_ldap2dolibarr.php

Indentation +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
 				if ($key === 'count')
 					continue;
 				if (empty($userList[$userdn])) { // Récupération de l'utilisateur
-				                                 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
+												 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid') {
 						$userKey = array($userdn);
 					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets

Braces +27 added lines, -17 removed lines

@@ -25,7 +25,9 @@ 
  * \brief Script to update groups into Dolibarr from LDAP
  */
 
-if (!defined('NOSESSION')) define('NOSESSION', '1');
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -72,15 +74,19 @@ 
 }
 
 foreach ($argv as $key => $val) {
-	if ($val == 'commitiferror')
-		$forcecommit = 1;
-	if (preg_match('/--server=([^\s]+)$/', $val, $reg))
-		$conf->global->LDAP_SERVER_HOST = $reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/', $val, $reg))
-		$excludeuser = explode(',', $reg[1]);
-	if (preg_match('/-y$/', $val, $reg))
-		$confirmed = 1;
-}
+	if ($val == 'commitiferror') {
+			$forcecommit = 1;
+	}
+	if (preg_match('/--server=([^\s]+)$/', $val, $reg)) {
+			$conf->global->LDAP_SERVER_HOST = $reg[1];
+	}
+	if (preg_match('/--excludeuser=([^\s]+)$/', $val, $reg)) {
+			$excludeuser = explode(',', $reg[1]);
+	}
+	if (preg_match('/-y$/', $val, $reg)) {
+			$confirmed = 1;
+	}
+	}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
@@ -167,8 +173,9 @@ 
 			$userList = array();
 			$userIdList = array();
 			foreach ($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
-				if ($key === 'count')
-					continue;
+				if ($key === 'count') {
+									continue;
+				}
 				if (empty($userList[$userdn])) { // Récupération de l'utilisateur
 				                                 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if ($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS === 'memberUid') {
@@ -177,8 +184,9 @@ 
 						$userFilter = explode(',', $userdn);
 						$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
 					}
-					if (!is_array($userKey))
-						continue;
+					if (!is_array($userKey)) {
+											continue;
+					}
 
 					$fuser = new User($db);
 
@@ -212,9 +220,11 @@ 
 		}
 
 		if (!$error || $forcecommit) {
-			if (!$error)
-				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			if (!$error) {
+							print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+			} else {
+				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			}
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";

htdocs/bom/bom_document.php

Indentation +2 added lines, -2 removed lines

@@ -114,9 +114,9 @@
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Number of files

Braces +9 added lines, -3 removed lines

@@ -54,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 //if (! $sortfield) $sortfield="position_name";
 
 // Initialize technical objects
@@ -70,7 +74,9 @@ 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 //if ($id > 0 || ! empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity?$object->entity:1] . "/bom/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/bom/".dol_sanitizeFileName($object->ref);
+}
 
 
 /*

htdocs/opensurvey/wizard/choix_date.php

Indentation +1 added lines, -1 removed lines

@@ -485,7 +485,7 @@
 			if (($numerojour >= $jourAJ && $_SESSION["mois"] == $moisAJ && $_SESSION["annee"] == $anneeAJ) || ($_SESSION["mois"] > $moisAJ && $_SESSION["annee"] == $anneeAJ) || $_SESSION["annee"] > $anneeAJ) {
 				print '<td align="center" class="libre"><input type="submit" class="bouton ON" name="choixjourajout[]" value="'.$numerojour.'"></td>'."\n";
 			} else {
-                // grey button
+				// grey button
 				print '<td align="center" class="avant">'.$numerojour.'</td>'."\n";
 			}
 		}

Braces +12 added lines, -4 removed lines

@@ -28,7 +28,9 @@ 
 require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
 
 // Security check
-if (!$user->rights->opensurvey->write) accessforbidden();
+if (!$user->rights->opensurvey->write) {
+	accessforbidden();
+}
 
 // Survey type is DATE
 $_SESSION["formatsondage"] = "D";
@@ -220,9 +222,15 @@ 
 $anneeAJ = date("Y");
 
 // Initialisation des jour, mois et année
-if (!isset($_SESSION['jour'])) $_SESSION['jour'] = date('j');
-if (!isset($_SESSION['mois'])) $_SESSION['mois'] = date('n');
-if (!isset($_SESSION['annee'])) $_SESSION['annee'] = date('Y');
+if (!isset($_SESSION['jour'])) {
+	$_SESSION['jour'] = date('j');
+}
+if (!isset($_SESSION['mois'])) {
+	$_SESSION['mois'] = date('n');
+}
+if (!isset($_SESSION['annee'])) {
+	$_SESSION['annee'] = date('Y');
+}
 
 //mise a jour des valeurs de session si bouton retour a aujourd'hui
 if (!issetAndNoEmpty('choixjourajout') && !issetAndNoEmpty('choixjourretrait') && (issetAndNoEmpty('retourmois') || issetAndNoEmpty('retourmois_x'))) {

htdocs/core/lib/stock.lib.php

Indentation +26 added lines, -26 removed lines

@@ -63,20 +63,20 @@ 
 	}
 	*/
 
-    // 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, 'stock');
+	// 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, 'stock');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/product/stock/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, 'stock', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stock', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -86,28 +86,28 @@ 
  */
 function stock_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/stock.php';
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'general';
+	$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, 'stock_admin');
+	// 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, 'stock_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFields");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
 
-    return $head;
+	return $head;
 }

htdocs/imports/emptyexample.php

Indentation +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
  */
 function llxHeader()
 {
-    print '<html><title>Build an import example file</title><body>';
+	print '<html><title>Build an import example file</title><body>';
 }
 
 /**
@@ -40,7 +40,7 @@ 
  */
 function llxFooter()
 {
-    print '</body></html>';
+	print '</body></html>';
 }
 
 require '../main.inc.php';

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  *      \brief      Show example of import file
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 
 
 /**

Braces +16 added lines, -5 removed lines

@@ -21,7 +21,10 @@ 
  *      \brief      Show example of import file
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 
 
 /**
@@ -81,15 +84,23 @@ 
 $valuestarget = $objimport->array_import_examplevalues[0];
 
 $attachment = true;
-if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
+if (isset($_GET["attachment"])) {
+	$attachment = $_GET["attachment"];
+}
 //$attachment = false;
 $contenttype = dol_mimetype($format);
-if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
+if (isset($_GET["contenttype"])) {
+	$contenttype = $_GET["contenttype"];
+}
 //$contenttype='text/plain';
 $outputencoding = 'UTF-8';
 
-if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
-if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
+if ($contenttype) {
+	header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+}
+if ($attachment) {
+	header('Content-Disposition: attachment; filename="'.$filename.'"');
+}
 
 
 // List of targets fields

htdocs/core/tpl/admin_extrafields_add.tpl.php

Indentation +9 added lines, -9 removed lines

@@ -55,17 +55,17 @@
     		var list = jQuery("#list");
             var totalizable = jQuery("#totalizable");
     		<?php
-    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-    		{
-    			print 'jQuery("#value_choice").hide();';
-    		}
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
+			{
+				print 'jQuery("#value_choice").hide();';
+			}
 
-    		if (GETPOST('type', 'alpha') == "separate")
-    		{
+			if (GETPOST('type', 'alpha') == "separate")
+			{
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
-    			print 'jQuery("#value_choice").hide();';
-    		}
-    		?>
+				print 'jQuery("#value_choice").hide();';
+			}
+			?>
 
     		// Case of computed field
     		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {