Dolibarr / dolibarr

htdocs/asterisk/cidlookup.php

Indentation +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
 // Security check
 if (empty($conf->clicktodial->enabled))
 {
-    print "Error: Module Click to dial is not enabled.\n";
-    exit;
+	print "Error: Module Click to dial is not enabled.\n";
+	exit;
 }
 
 // Check parameters

htdocs/variants/class/ProductCombination2ValuePair.class.php

Indentation +9 added lines, -9 removed lines

@@ -52,15 +52,15 @@
 	 */
 	public $fk_prod_attr_val;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 * Translates this class to a human-readable string

htdocs/core/modules/commande/modules_commande.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");
 	}
 }

htdocs/adherents/admin/adherent_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	print '<div name="topofform"></div><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 '<div name="topofform"></div><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 = 'adherent'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*

htdocs/holiday/common.inc.php

Indentation +6 added lines, -6 removed lines

@@ -33,10 +33,10 @@
 
 if (empty($conf->holiday->enabled))
 {
-    llxHeader('', $langs->trans('CPTitreMenu'));
-    print '<div class="tabBar">';
-    print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-    print '</div>';
-    llxFooter();
-    exit();
+	llxHeader('', $langs->trans('CPTitreMenu'));
+	print '<div class="tabBar">';
+	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
+	print '</div>';
+	llxFooter();
+	exit();
 }

htdocs/datapolicy/mailing.php

Indentation +8 added lines, -8 removed lines

@@ -29,14 +29,14 @@
 $idcontact = GETPOST('idc');
 
 if (!empty($idcontact)) {
-    $contact = new Contact($db);
-    $contact->fetch($idcontact);
-    DataPolicy::sendMailDataPolicyContact($contact);
+	$contact = new Contact($db);
+	$contact->fetch($idcontact);
+	DataPolicy::sendMailDataPolicyContact($contact);
 } else {
 
-    $contacts = new DataPolicy($db);
-    $contacts->getAllContactNotInformed();
-    $contacts->getAllCompaniesNotInformed();
-    $contacts->getAllAdherentsNotInformed();
-    echo $langs->trans('AllAgreementSend');
+	$contacts = new DataPolicy($db);
+	$contacts->getAllContactNotInformed();
+	$contacts->getAllCompaniesNotInformed();
+	$contacts->getAllAdherentsNotInformed();
+	echo $langs->trans('AllAgreementSend');
 }

htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php

Indentation +7 added lines, -7 removed lines

@@ -68,22 +68,22 @@ 
 	 * @param string $url Root URL for the shop
 	 * @param string $key Authentification key
 	 * @param mixed $debug Debug mode Activated (true) or deactivated (false)
-	*/
-    public function __construct($url, $key, $debug = true)
-    {
+	 */
+	public function __construct($url, $key, $debug = true)
+	{
 		if (!extension_loaded('curl'))
 		  throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
 		$this->url = $url;
 		$this->key = $key;
 		$this->debug = $debug;
 		$this->version = 'unknown';
-    }
+	}
 
 	/**
 	 * Take the status code and throw an exception if the server didn't return 200 or 201 code
 	 *
 	 * @param int $status_code Status code of an HTTP return
-     * @return void
+	 * @return void
 	 */
 	protected function checkStatusCode($status_code)
 	{
@@ -271,7 +271,7 @@ 
 	}
 
 	/**
- 	 * Retrieve (GET) a resource
+	 * Retrieve (GET) a resource
 	 * <p>Unique parameter must take : <br><br>
 	 * 'url' => Full URL for a GET request of Webservice (ex: http://mystore.com/api/customers/1/)<br>
 	 * OR<br>
@@ -326,7 +326,7 @@ 
 	}
 
 	/**
- 	 * Head method (HEAD) a resource
+	 * Head method (HEAD) a resource
 	 *
 	 * @param 	array 				$options 	Array representing resource for head request.
 	 * @return 	SimpleXMLElement 				status_code, response

Braces +66 added lines, -48 removed lines

@@ -71,8 +71,9 @@ 
 	*/
     public function __construct($url, $key, $debug = true)
     {
-		if (!extension_loaded('curl'))
-		  throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
+		if (!extension_loaded('curl')) {
+				  throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
+		}
 		$this->url = $url;
 		$this->key = $key;
 		$this->debug = $debug;
@@ -134,23 +135,25 @@ 
 		$curl_options = array();
 		foreach ($defaultParams as $defkey => $defval)
 		{
-			if (isset($curl_params[$defkey]))
-				$curl_options[$defkey] = $curl_params[$defkey];
-			else {
+			if (isset($curl_params[$defkey])) {
+							$curl_options[$defkey] = $curl_params[$defkey];
+			} else {
 				$curl_options[$defkey] = $defaultParams[$defkey];
 			}
 		}
-		foreach ($curl_params as $defkey => $defval)
-			if (!isset($curl_options[$defkey]))
+		foreach ($curl_params as $defkey => $defval) {
+					if (!isset($curl_options[$defkey]))
 				$curl_options[$defkey] = $curl_params[$defkey];
+		}
 
 		dol_syslog("curl curl_options = ".var_export($curl_options, true));
 		curl_setopt_array($session, $curl_options);
 		$response = curl_exec($session);
 
 		$index = strpos($response, "\r\n\r\n");
-		if ($index === false && $curl_params[CURLOPT_CUSTOMREQUEST] != 'HEAD')
-			throw new PrestaShopWebserviceException('Bad HTTP response');
+		if ($index === false && $curl_params[CURLOPT_CUSTOMREQUEST] != 'HEAD') {
+					throw new PrestaShopWebserviceException('Bad HTTP response');
+		}
 
 		$header = substr($response, 0, $index);
 		$body = substr($response, $index + 4);
@@ -162,8 +165,9 @@ 
 		{
 			$tmp = explode(':', $headerItem);
 			$tmp = array_map('trim', $tmp);
-			if (count($tmp) == 2)
-				$headerArray[$tmp[0]] = $tmp[1];
+			if (count($tmp) == 2) {
+							$headerArray[$tmp[0]] = $tmp[1];
+			}
 		}
 
 		if (array_key_exists('PSWS-Version', $headerArray))
@@ -172,8 +176,9 @@ 
 			if (
 				version_compare(PrestaShopWebservice::PSCOMPATIBLEVERSIONMIN, $headerArray['PSWS-Version']) == 1 ||
 				version_compare(PrestaShopWebservice::PSCOMPATIBLEVERSIONMAX, $headerArray['PSWS-Version']) == -1
-			)
-			throw new PrestaShopWebserviceException('This library is not compatible with this version of PrestaShop. Please upgrade/downgrade this library');
+			) {
+						throw new PrestaShopWebserviceException('This library is not compatible with this version of PrestaShop. Please upgrade/downgrade this library');
+			}
 		}
 
 		if ($this->debug)
@@ -182,15 +187,18 @@ 
 			$this->printDebug('HTTP RESPONSE HEADER', $header);
 		}
 		$status_code = curl_getinfo($session, CURLINFO_HTTP_CODE);
-		if ($status_code === 0)
-			throw new PrestaShopWebserviceException('CURL Error: '.curl_error($session));
+		if ($status_code === 0) {
+					throw new PrestaShopWebserviceException('CURL Error: '.curl_error($session));
+		}
 		curl_close($session);
 		if ($this->debug)
 		{
-			if ($curl_params[CURLOPT_CUSTOMREQUEST] == 'PUT' || $curl_params[CURLOPT_CUSTOMREQUEST] == 'POST')
-				$this->printDebug('XML SENT', urldecode($curl_params[CURLOPT_POSTFIELDS]));
-			if ($curl_params[CURLOPT_CUSTOMREQUEST] != 'DELETE' && $curl_params[CURLOPT_CUSTOMREQUEST] != 'HEAD')
-				$this->printDebug('RETURN HTTP BODY', $body);
+			if ($curl_params[CURLOPT_CUSTOMREQUEST] == 'PUT' || $curl_params[CURLOPT_CUSTOMREQUEST] == 'POST') {
+							$this->printDebug('XML SENT', urldecode($curl_params[CURLOPT_POSTFIELDS]));
+			}
+			if ($curl_params[CURLOPT_CUSTOMREQUEST] != 'DELETE' && $curl_params[CURLOPT_CUSTOMREQUEST] != 'HEAD') {
+							$this->printDebug('RETURN HTTP BODY', $body);
+			}
 		}
 		return array('status_code' => $status_code, 'response' => $body, 'header' => $header);
 	}
@@ -261,10 +269,12 @@ 
 		{
 			$url = (isset($options['resource']) ? $this->url.'/api/'.$options['resource'] : $options['url']);
 			$xml = $options['postXml'];
-			if (isset($options['id_shop']))
-				$url .= '&id_shop='.$options['id_shop'];
-			if (isset($options['id_group_shop']))
-				$url .= '&id_group_shop='.$options['id_group_shop'];
+			if (isset($options['id_shop'])) {
+							$url .= '&id_shop='.$options['id_shop'];
+			}
+			if (isset($options['id_group_shop'])) {
+							$url .= '&id_group_shop='.$options['id_group_shop'];
+			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
@@ -304,24 +314,27 @@ 
 	 */
 	public function get($options)
 	{
-		if (isset($options['url']))
-			$url = $options['url'];
-		elseif (isset($options['resource']))
+		if (isset($options['url'])) {
+					$url = $options['url'];
+		} elseif (isset($options['resource']))
 		{
 			$url = $this->url.'/api/'.$options['resource'];
 			$url_params = array();
-			if (isset($options['id']))
-				$url .= '/'.$options['id'];
+			if (isset($options['id'])) {
+							$url .= '/'.$options['id'];
+			}
 
 			// @CHANGE LDR
 			//$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop');
 			$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop', 'date');
-			foreach ($params as $p)
-				foreach ($options as $k => $o)
+			foreach ($params as $p) {
+							foreach ($options as $k => $o)
 					if (strpos($k, $p) !== false)
 						$url_params[$k] = $options[$k];
-			if (count($url_params) > 0)
-				$url .= '?'.http_build_query($url_params);
+			}
+			if (count($url_params) > 0) {
+							$url .= '?'.http_build_query($url_params);
+			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given ');
 		}
@@ -339,22 +352,25 @@ 
 	 */
 	public function head($options)
 	{
-		if (isset($options['url']))
-			$url = $options['url'];
-		elseif (isset($options['resource']))
+		if (isset($options['url'])) {
+					$url = $options['url'];
+		} elseif (isset($options['resource']))
 		{
 			$url = $this->url.'/api/'.$options['resource'];
 			$url_params = array();
-			if (isset($options['id']))
-				$url .= '/'.$options['id'];
+			if (isset($options['id'])) {
+							$url .= '/'.$options['id'];
+			}
 
 			$params = array('filter', 'display', 'sort', 'limit');
-			foreach ($params as $p)
-				foreach ($options as $k => $o)
+			foreach ($params as $p) {
+							foreach ($options as $k => $o)
 					if (strpos($k, $p) !== false)
 						$url_params[$k] = $options[$k];
-			if (count($url_params) > 0)
-				$url .= '?'.http_build_query($url_params);
+			}
+			if (count($url_params) > 0) {
+							$url .= '?'.http_build_query($url_params);
+			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
@@ -376,16 +392,18 @@ 
 	public function edit($options)
 	{
 		$xml = '';
-		if (isset($options['url']))
-			$url = $options['url'];
-		elseif ((isset($options['resource'], $options['id']) || isset($options['url'])) && $options['putXml'])
+		if (isset($options['url'])) {
+					$url = $options['url'];
+		} elseif ((isset($options['resource'], $options['id']) || isset($options['url'])) && $options['putXml'])
 		{
 			$url = (isset($options['url']) ? $options['url'] : $this->url.'/api/'.$options['resource'].'/'.$options['id']);
 			$xml = $options['putXml'];
-			if (isset($options['id_shop']))
-				$url .= '&id_shop='.$options['id_shop'];
-			if (isset($options['id_group_shop']))
-				$url .= '&id_group_shop='.$options['id_group_shop'];
+			if (isset($options['id_shop'])) {
+							$url .= '&id_shop='.$options['id_shop'];
+			}
+			if (isset($options['id_group_shop'])) {
+							$url .= '&id_group_shop='.$options['id_group_shop'];
+			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}

htdocs/projet/class/projectstats.class.php

Indentation +19 added lines, -19 removed lines

@@ -24,25 +24,25 @@
  */
 class ProjectStats extends Stats
 {
-    private $project;
-    public $userid;
-    public $socid;
-    public $year;
-
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $user;
-
-        $this->db = $db;
-
-        require_once 'project.class.php';
-        $this->project = new Project($this->db);
-    }
+	private $project;
+	public $userid;
+	public $socid;
+	public $year;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		require_once 'project.class.php';
+		$this->project = new Project($this->db);
+	}
 
 
 	/**

Braces +55 added lines, -26 removed lines

@@ -92,14 +92,17 @@ 
 					$label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')',
 					$row[0]
 					);
-				} else $other += $row[1];
+				} else {
+					$other += $row[1];
+				}
 					$i++;
 			}
-			if ($num > $limit)
-				$result[$i] = array(
+			if ($num > $limit) {
+							$result[$i] = array(
 				$langs->transnoentitiesnoconv("Other"),
 				$other
 				);
+			}
 				$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -156,25 +159,35 @@ 
 		// Get list of project id allowed to user (in a string list separated by coma)
 		$object = new Project($this->db);
 		$projectsListId = '';
-		if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
+		if (!$user->rights->projet->all->lire) {
+			$projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
+		}
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
-		if (!empty($this->userid))
-			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		if (!empty($this->userid)) {
+					$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		}
 
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
-		if (!empty($this->socid))
-			$sqlwhere[] = ' t.fk_soc='.$this->socid;
-		if (!empty($this->year) && empty($this->yearmonth))
-			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
-		if (!empty($this->yearmonth))
-			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		if (!empty($this->socid)) {
+					$sqlwhere[] = ' t.fk_soc='.$this->socid;
+		}
+		if (!empty($this->year) && empty($this->yearmonth)) {
+					$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
+		}
+		if (!empty($this->yearmonth)) {
+					$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		}
 
-		if (!empty($this->status))
-			$sqlwhere[] = " t.fk_opp_status IN (".$this->status.")";
+		if (!empty($this->status)) {
+					$sqlwhere[] = " t.fk_opp_status IN (".$this->status.")";
+		}
 
-		if (!$user->rights->projet->all->lire) $sqlwhere[] = " t.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+		if (!$user->rights->projet->all->lire) {
+			$sqlwhere[] = " t.rowid IN (".$projectsListId.")";
+		}
+		// public and assigned to, or restricted to company for external users
 
 		if (count($sqlwhere) > 0) {
 			$sqlwhere_str = ' WHERE '.implode(' AND ', $sqlwhere);
@@ -254,7 +267,9 @@ 
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
@@ -285,9 +300,11 @@ 
 		}
 
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
+		if ($foundintocache) {
+			// Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+		}
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
@@ -315,15 +332,21 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) {
+					$newmask = $conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
-			} else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else {
+				dol_syslog("Failed to write cache file", LOG_ERR);
+			}
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -371,7 +394,9 @@ 
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
@@ -400,9 +425,11 @@ 
 		}
 
 		// Load file into $data
-		if ($foundintocache) // Cache file found and is not too old
+		if ($foundintocache) {
+			// Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+		}
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
@@ -426,13 +453,15 @@ 
 		// Save cache file
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp))
-				dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+							dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK))
-				$newmask = $conf->global->MAIN_UMASK;
+			if (!empty($conf->global->MAIN_UMASK)) {
+							$newmask = $conf->global->MAIN_UMASK;
+			}
 			@chmod($newpathofdestfile, octdec($newmask));
 
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;

htdocs/core/class/dolexception.class.php

Indentation +6 added lines, -6 removed lines

@@ -27,10 +27,10 @@
  */
 class DolException extends Exception
 {
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+	}
 }