Dolibarr / dolibarr

htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php

Braces +12 added lines, -4 removed lines

@@ -92,10 +92,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

Indentation +8 added lines, -8 removed lines

@@ -42,17 +42,17 @@
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return list of active generation modules
-     *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'supplier_proposal';

htdocs/core/modules/expedition/modules_expedition.php

Braces +12 added lines, -4 removed lines

@@ -92,10 +92,18 @@
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }

Indentation +12 added lines, -12 removed lines

@@ -36,23 +36,23 @@ 
  */
 abstract class ModelePdfExpedition extends CommonDocGenerator
 {
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation models
 	 *
-     *  @param	DoliDB	$db     			Database handler
-     *  @param  integer	$maxfilenamelength  Max length of value to show
-     *  @return	array						List of templates
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
 	 */
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$type = 'shipping';
@@ -80,7 +80,7 @@ 
 	 *
 	 *  @return		boolean     true if model can be used
 	 */
-    public function isEnabled()
+	public function isEnabled()
 	{
 		return true;
 	}
@@ -90,7 +90,7 @@ 
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
+	public function info()
 	{
 		global $langs;
 		$langs->load("sendings");
@@ -102,7 +102,7 @@ 
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		global $langs;
 		$langs->load("sendings");
@@ -114,7 +114,7 @@ 
 	 *
 	 *	@return     boolean     false if conflict, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		return true;
 	}
@@ -126,7 +126,7 @@ 
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return	string					Value
 	 */
-    public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $shipment)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
@@ -137,7 +137,7 @@ 
 	 *
 	 *	@return     string      Value
 	 */
-    public function getVersion()
+	public function getVersion()
 	{
 		global $langs;
 		$langs->load("admin");

htdocs/core/filemanagerdol/connectors/php/io.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -374,7 +374,7 @@
 	echo <<<EOF
 <script type="text/javascript">
 (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
-EOF;
+eof;
 
 	if ($errorNumber && $errorNumber != 201) {
 		$fileUrl = "";

Indentation +30 added lines, -30 removed lines

@@ -131,8 +131,8 @@ 
  */
 function GetParentFolder($folderPath)
 {
-    $sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
-    return preg_replace($sPattern, '', $folderPath);
+	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
+	return preg_replace($sPattern, '', $folderPath);
 }
 
 /**
@@ -214,26 +214,26 @@ 
  */
 function GetRootPath()
 {
-    if (!isset($_SERVER)) {
-        global $_SERVER;
-    }
-    $sRealPath = realpath('./');
-    // #2124 ensure that no slash is at the end
-    $sRealPath = rtrim($sRealPath, "\\/");
+	if (!isset($_SERVER)) {
+		global $_SERVER;
+	}
+	$sRealPath = realpath('./');
+	// #2124 ensure that no slash is at the end
+	$sRealPath = rtrim($sRealPath, "\\/");
 
-    $sSelfPath = $_SERVER['PHP_SELF'];
-    $sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
+	$sSelfPath = $_SERVER['PHP_SELF'];
+	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
 
-    $sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
+	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
 
-    $position = strpos($sRealPath, $sSelfPath);
+	$position = strpos($sRealPath, $sSelfPath);
 
-    // This can check only that this script isn't run from a virtual dir
-    // But it avoids the problems that arise if it isn't checked
-    if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
-        SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+	// This can check only that this script isn't run from a virtual dir
+	// But it avoids the problems that arise if it isn't checked
+	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
+		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
 
-    return substr($sRealPath, 0, $position);
+	return substr($sRealPath, 0, $position);
 }
 
 /**
@@ -243,15 +243,15 @@ 
  */
 function Server_MapPath($path)
 {
-    // This function is available only for Apache
-    if (function_exists('apache_lookup_uri')) {
-        $info = apache_lookup_uri($path);
-        return $info->filename.$info->path_info;
-    }
-
-    // This isn't correct but for the moment there's no other solution
-    // If this script is under a virtual directory or symlink it will detect the problem and stop
-    return GetRootPath().$path;
+	// This function is available only for Apache
+	if (function_exists('apache_lookup_uri')) {
+		$info = apache_lookup_uri($path);
+		return $info->filename.$info->path_info;
+	}
+
+	// This isn't correct but for the moment there's no other solution
+	// If this script is under a virtual directory or symlink it will detect the problem and stop
+	return GetRootPath().$path;
 }
 
 /**
@@ -422,11 +422,11 @@ 
  */
 function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
 {
-    echo '<script type="text/javascript">';
+	echo '<script type="text/javascript">';
 
-    $rpl = array('\\' => '\\\\', '"' => '\\"');
+	$rpl = array('\\' => '\\\\', '"' => '\\"');
 
-    echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+	echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
 
-    echo '</script>';
+	echo '</script>';
 }

Braces +52 added lines, -34 removed lines

@@ -44,10 +44,12 @@ 
 {
 	global $Config;
 
-	if ($sCommand == "QuickUpload")
-		return $Config['QuickUploadPath'][$resourceType];
-	else return $Config['FileTypesPath'][$resourceType];
-}
+	if ($sCommand == "QuickUpload") {
+			return $Config['QuickUploadPath'][$resourceType];
+	} else {
+		return $Config['FileTypesPath'][$resourceType];
+	}
+	}
 
 /**
  * GetResourceTypeDirectory
@@ -61,14 +63,16 @@ 
 	global $Config;
 	if ($sCommand == "QuickUpload")
 	{
-		if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
-			return $Config['QuickUploadAbsolutePath'][$resourceType];
+		if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0) {
+					return $Config['QuickUploadAbsolutePath'][$resourceType];
+		}
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
 	} else {
-		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
-			return $Config['FileTypesAbsolutePath'][$resourceType];
+		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0) {
+					return $Config['FileTypesAbsolutePath'][$resourceType];
+		}
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
@@ -113,8 +117,9 @@ 
 
 	// Ensure that the directory exists.
 	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ($sErrorMsg != '')
-		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+	if ($sErrorMsg != '') {
+			SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+	}
 
 	// Return the resource type directory combined with the required path.
 	return CombinePaths($sResourceTypePath, $folderPath);
@@ -159,8 +164,9 @@ 
 		}
 
 		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ($sErrorMsg != '')
-			return $sErrorMsg;
+		if ($sErrorMsg != '') {
+					return $sErrorMsg;
+		}
 	}
 
 	if (!file_exists($folderPath))
@@ -197,8 +203,10 @@ 
 		ini_restore('error_reporting');
 
 		return $sErrorMsg;
-	} else return '';
-}
+	} else {
+		return '';
+	}
+	}
 
 /**
  * Get Root Path
@@ -223,8 +231,9 @@ 
 
     // This can check only that this script isn't run from a virtual dir
     // But it avoids the problems that arise if it isn't checked
-    if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
-        SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+    if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath)) {
+            SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+    }
 
     return substr($sRealPath, 0, $position);
 }
@@ -261,11 +270,13 @@ 
 	$arAllowed = $Config['AllowedExtensions'][$resourceType];
 	$arDenied = $Config['DeniedExtensions'][$resourceType];
 
-	if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
-		return false;
+	if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed)) {
+			return false;
+	}
 
-	if (count($arDenied) > 0 && in_array($sExtension, $arDenied))
-		return false;
+	if (count($arDenied) > 0 && in_array($sExtension, $arDenied)) {
+			return false;
+	}
 
 	return true;
 }
@@ -279,8 +290,9 @@ 
 function IsAllowedType($resourceType)
 {
 	global $Config;
-	if (!in_array($resourceType, $Config['ConfigAllowedTypes']))
-		return false;
+	if (!in_array($resourceType, $Config['ConfigAllowedTypes'])) {
+			return false;
+	}
 
 	return true;
 }
@@ -295,8 +307,9 @@ 
 {
 	global $Config;
 
-	if (!in_array($sCommand, $Config['ConfigAllowedCommands']))
-		return false;
+	if (!in_array($sCommand, $Config['ConfigAllowedCommands'])) {
+			return false;
+	}
 
 	return true;
 }
@@ -314,10 +327,12 @@ 
 	$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
 
 	// Check the current folder syntax (must begin and start with a slash).
-	if (!preg_match('|/$|', $sCurrentFolder))
-		$sCurrentFolder .= '/';
-	if (strpos($sCurrentFolder, '/') !== 0)
-		$sCurrentFolder = '/'.$sCurrentFolder;
+	if (!preg_match('|/$|', $sCurrentFolder)) {
+			$sCurrentFolder .= '/';
+	}
+	if (strpos($sCurrentFolder, '/') !== 0) {
+			$sCurrentFolder = '/'.$sCurrentFolder;
+	}
 
 	// Ensure the folder path has no double-slashes
 	while (strpos($sCurrentFolder, '//') !== false) {
@@ -325,11 +340,13 @@ 
 	}
 
 	// Check for invalid folder paths (..)
-	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
-		SendError(102, '');
+	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\")) {
+			SendError(102, '');
+	}
 
-	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
-		SendError(102, '');
+	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder)) {
+			SendError(102, '');
+	}
 
 	return $sCurrentFolder;
 }
@@ -363,8 +380,9 @@ 
 	$sNewFileName = stripslashes($sNewFileName);
 
 	// Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ($Config['ForceSingleExtension'])
-		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+	if ($Config['ForceSingleExtension']) {
+			$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+	}
 
 	// Remove \ / | : ? * " < >
 	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);

htdocs/compta/bank/bilan.php

Braces +2 added lines, -1 removed lines

@@ -28,8 +28,9 @@
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories'));
 
-if (!$user->rights->banque->lire)
+if (!$user->rights->banque->lire) {
   accessforbidden();
+}
 
 
 /**

htdocs/opensurvey/wizard/choix_autre.php

Braces +3 added lines, -1 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();
+}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 	}
 }
 
-var_dump($_SESSION);exit;
+var_dump($_SESSION); exit;
 
 
 /*

htdocs/asset/admin/assets_type_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,7 +110,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

Braces +6 added lines, -2 removed lines

@@ -34,13 +34,17 @@
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'adherent_type'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*

htdocs/user/admin/user_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -111,7 +111,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

Braces +6 added lines, -2 removed lines

@@ -37,13 +37,17 @@
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'user'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*

htdocs/projet/admin/project_task_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,7 +110,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

Braces +6 added lines, -2 removed lines

@@ -39,13 +39,17 @@
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'projet_task';
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*

htdocs/projet/admin/project_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -110,7 +110,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

Braces +6 added lines, -2 removed lines

@@ -38,13 +38,17 @@
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'projet'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*