alxarafe / alixar

dolibarr/htdocs/core/lib/oauth.lib.php

Indentation +13 added lines, -13 removed lines

@@ -29,8 +29,8 @@ 
 );
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME']='stripetest';
-	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME']='stripelive';
+    $supportedoauth2array['OAUTH_STRIPE_TEST_NAME']='stripetest';
+    $supportedoauth2array['OAUTH_STRIPE_LIVE_NAME']='stripelive';
 }
 $supportedoauth2array['OAUTH_GITHUB_NAME']='github';
 
@@ -220,17 +220,17 @@ 
         'OAUTH_STRAVA_ID',
         'OAUTH_STRAVA_SECRET',
     ),
-	array(
-		'OAUTH_STRIPE_TEST_NAME',
-		'OAUTH_STRIPE_TEST_ID',
-		'STRIPE_TEST_SECRET_KEY',
-	),
-	array(
-		'OAUTH_STRIPE_LIVE_NAME',
-		'OAUTH_STRIPE_LIVE_ID',
-		'STRIPE_LIVE_SECRET_KEY',
-	),
-	array(
+    array(
+        'OAUTH_STRIPE_TEST_NAME',
+        'OAUTH_STRIPE_TEST_ID',
+        'STRIPE_TEST_SECRET_KEY',
+    ),
+    array(
+        'OAUTH_STRIPE_LIVE_NAME',
+        'OAUTH_STRIPE_LIVE_ID',
+        'STRIPE_LIVE_SECRET_KEY',
+    ),
+    array(
         'OAUTH_TUMBLR_NAME',
         'OAUTH_TUMBLR_ID',
         'OAUTH_TUMBLR_SECRET',

Spacing +5 added lines, -5 removed lines

@@ -24,20 +24,20 @@
 
 
 // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
-$supportedoauth2array=array(
+$supportedoauth2array = array(
     'OAUTH_GOOGLE_NAME'=>'google',
 );
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME']='stripetest';
-	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME']='stripelive';
+	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = 'stripetest';
+	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = 'stripelive';
 }
-$supportedoauth2array['OAUTH_GITHUB_NAME']='github';
+$supportedoauth2array['OAUTH_GITHUB_NAME'] = 'github';
 
 
 
 // API access parameters OAUTH
-$list = array (
+$list = array(
     array(
         'OAUTH_AMAZON_NAME',
         'OAUTH_AMAZON_ID',

dolibarr/htdocs/core/lib/holiday.lib.php

Indentation +11 added lines, -11 removed lines

@@ -29,10 +29,10 @@ 
  */
 function holiday_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.'/holiday/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Card");
@@ -57,23 +57,23 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'holiday');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'holiday','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'holiday','remove');
 
-	return $head;
+    return $head;
 }
 
 
 /**
  *  Return array head with list of tabs to view object informations
  *
-  *  @return array           		head
+ *  @return array           		head
  */
 function holiday_admin_prepare_head()
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
     $head[$h][0] = DOL_URL_ROOT.'/admin/holiday.php';
     $head[$h][1] = $langs->trans("Setup");
@@ -86,7 +86,7 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,null,$head,$h,'holiday_admin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'holiday_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'holiday_admin','remove');
 
-	return $head;
+    return $head;
 }

Spacing +7 added lines, -7 removed lines

@@ -43,11 +43,11 @@ 
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $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.'/holiday/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++;
 
@@ -55,9 +55,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,'holiday');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'holiday','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'holiday', 'remove');
 
 	return $head;
 }
@@ -84,9 +84,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,'holiday_admin');
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'holiday_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'holiday_admin', 'remove');
 
 	return $head;
 }

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/holiday/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/geturl.lib.php

Indentation +49 added lines, -49 removed lines

@@ -41,7 +41,7 @@ 
     $PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
     $PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
 
-	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
+    dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
     //setting the curl parameters.
     $ch = curl_init();
@@ -52,17 +52,17 @@ 
      exit;*/
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
-	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
-	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
+    @curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
 
-	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
-	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
+    if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+    curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
-	// By default use tls decied by PHP.
-	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
-	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
+    // By default use tls decied by PHP.
+    // You can force, if supported a version like TLSv1 or TLSv1.2
+    if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+    //curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
@@ -75,37 +75,37 @@ 
     curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
     if ($postorget == 'POST')
     {
-    	curl_setopt($ch, CURLOPT_POST, 1);	// POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
+        curl_setopt($ch, CURLOPT_POST, 1);	// POST
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
     }
     else if ($postorget == 'PUT')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
-    	else
-    	{
-    	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param=$param;
-    	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+        if (! is_array($param)) parse_str($param, $array_param);
+        else
+        {
+            dol_syslog("parameter param must be a string", LOG_WARNING);
+            $array_param=$param;
+        }
+        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
     }
     else if ($postorget == 'PUTALREADYFORMATED')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
     }
     else if ($postorget == 'HEAD')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
-    	curl_setopt($ch, CURLOPT_NOBODY, true);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
+        curl_setopt($ch, CURLOPT_NOBODY, true);
     }
     else if ($postorget == 'DELETE')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
     }
     else
     {
-    	curl_setopt($ch, CURLOPT_POST, 0);			// GET
+        curl_setopt($ch, CURLOPT_POST, 0);			// GET
     }
 
     //if USE_PROXY constant set at begin of this method.
@@ -133,27 +133,27 @@ 
         $rep['content']=$response;
 
         // moving to display page to display curl errors
-		$rep['curl_error_no']=curl_errno($ch);
+        $rep['curl_error_no']=curl_errno($ch);
         $rep['curl_error_msg']=curl_error($ch);
 
-		dol_syslog("getURLContent response array is ".join(',',$rep));
+        dol_syslog("getURLContent response array is ".join(',',$rep));
     }
     else
     {
-    	$info = curl_getinfo($ch);
+        $info = curl_getinfo($ch);
 
-    	// Ad keys to $rep
-    	$rep = $info;
-    	//$rep['header_size']=$info['header_size'];
-    	//$rep['http_code']=$info['http_code'];
-    	dol_syslog("getURLContent http_code=".$rep['http_code']);
+        // Ad keys to $rep
+        $rep = $info;
+        //$rep['header_size']=$info['header_size'];
+        //$rep['http_code']=$info['http_code'];
+        dol_syslog("getURLContent http_code=".$rep['http_code']);
 
         // Add more keys to $rep
         $rep['content']=$response;
-    	$rep['curl_error_no']='';
-    	$rep['curl_error_msg']='';
+        $rep['curl_error_no']='';
+        $rep['curl_error_msg']='';
 
-    	//closing the curl
+        //closing the curl
         curl_close($ch);
     }
 
@@ -170,12 +170,12 @@ 
  */
 function getDomainFromURL($url)
 {
-	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
-	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
-	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
+    $tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
+    $tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
+    $tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
+    $tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
 
-	return $tmpdomain;
+    return $tmpdomain;
 }
 
 /**
@@ -188,13 +188,13 @@ 
  */
 function getRootURLFromURL($url)
 {
-	$prefix='';
-	$tmpurl = $url;
-	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
-	$tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl);				// Remove http(s)://
-	$tmpurl = preg_replace('/\/.*$/i', '', $tmpurl);					// Remove part after domain
+    $prefix='';
+    $tmpurl = $url;
+    if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
+    $tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl);				// Remove http(s)://
+    $tmpurl = preg_replace('/\/.*$/i', '', $tmpurl);					// Remove part after domain
 
-	return $prefix.$tmpurl;
+    return $prefix.$tmpurl;
 }
 
 /**
@@ -205,7 +205,7 @@ 
  */
 function removeHtmlComment($content)
 {
-	$content = preg_replace('/<!--[^\-]+-->/', '', $content);
-	return $content;
+    $content = preg_replace('/<!--[^\-]+-->/', '', $content);
+    return $content;
 }
 

Spacing +40 added lines, -40 removed lines

@@ -31,15 +31,15 @@ 
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
  * @return	array						    Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
  */
-function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addheaders=array())
+function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array())
 {
     //declaring of global variables
     global $conf, $langs;
-    $USE_PROXY=empty($conf->global->MAIN_PROXY_USE)?0:$conf->global->MAIN_PROXY_USE;
-    $PROXY_HOST=empty($conf->global->MAIN_PROXY_HOST)?0:$conf->global->MAIN_PROXY_HOST;
-    $PROXY_PORT=empty($conf->global->MAIN_PROXY_PORT)?0:$conf->global->MAIN_PROXY_PORT;
-    $PROXY_USER=empty($conf->global->MAIN_PROXY_USER)?0:$conf->global->MAIN_PROXY_USER;
-    $PROXY_PASS=empty($conf->global->MAIN_PROXY_PASS)?0:$conf->global->MAIN_PROXY_PASS;
+    $USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
+    $PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
+    $PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
+    $PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
+    $PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
 
 	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
@@ -54,45 +54,45 @@ 
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
-	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
+	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation ?true:false)); // We use @ here because this may return warning if safe mode is on or open_basedir is on
 
 	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
-	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
+	curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
 
 	// By default use tls decied by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
     //curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);		// We want response
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
     if ($postorget == 'POST')
     {
-    	curl_setopt($ch, CURLOPT_POST, 1);	// POST
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
+    	curl_setopt($ch, CURLOPT_POST, 1); // POST
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
     }
     else if ($postorget == 'PUT')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
+    	if (!is_array($param)) parse_str($param, $array_param);
     	else
     	{
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
-    	    $array_param=$param;
+    	    $array_param = $param;
     	}
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
     }
     else if ($postorget == 'PUTALREADYFORMATED')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
     }
     else if ($postorget == 'HEAD')
     {
@@ -101,42 +101,42 @@ 
     }
     else if ($postorget == 'DELETE')
     {
-    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
     }
     else
     {
-    	curl_setopt($ch, CURLOPT_POST, 0);			// GET
+    	curl_setopt($ch, CURLOPT_POST, 0); // GET
     }
 
     //if USE_PROXY constant set at begin of this method.
     if ($USE_PROXY)
     {
-        dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
+        dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
         //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
     }
 
     //getting response from server
     $response = curl_exec($ch);
 
-    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT);	// Reading of request must be done after sending request
+    $request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
 
     dol_syslog("getURLContent request=".$request);
     //dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it
-    dol_syslog("getURLContent response size=".strlen($response));	// This may contains binary data, so we dont output it
+    dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
 
-    $rep=array();
+    $rep = array();
     if (curl_errno($ch))
     {
         // Ad keys to $rep
-        $rep['content']=$response;
+        $rep['content'] = $response;
 
         // moving to display page to display curl errors
-		$rep['curl_error_no']=curl_errno($ch);
-        $rep['curl_error_msg']=curl_error($ch);
+		$rep['curl_error_no'] = curl_errno($ch);
+        $rep['curl_error_msg'] = curl_error($ch);
 
-		dol_syslog("getURLContent response array is ".join(',',$rep));
+		dol_syslog("getURLContent response array is ".join(',', $rep));
     }
     else
     {
@@ -149,9 +149,9 @@ 
     	dol_syslog("getURLContent http_code=".$rep['http_code']);
 
         // Add more keys to $rep
-        $rep['content']=$response;
-    	$rep['curl_error_no']='';
-    	$rep['curl_error_msg']='';
+        $rep['content'] = $response;
+    	$rep['curl_error_no'] = '';
+    	$rep['curl_error_msg'] = '';
 
     	//closing the curl
         curl_close($ch);
@@ -170,10 +170,10 @@ 
  */
 function getDomainFromURL($url)
 {
-	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url);				// Remove http(s)://
-	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain);				// Remove part after domain
-	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain);			// Remove first level domain (.com, .net, ...)
-	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain);			// Remove part www. before domain name
+	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
+	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
+	$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
+	$tmpdomain = preg_replace('/^[^\.]+\./', '', $tmpdomain); // Remove part www. before domain name
 
 	return $tmpdomain;
 }
@@ -188,11 +188,11 @@ 
  */
 function getRootURLFromURL($url)
 {
-	$prefix='';
+	$prefix = '';
 	$tmpurl = $url;
 	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
-	$tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl);				// Remove http(s)://
-	$tmpurl = preg_replace('/\/.*$/i', '', $tmpurl);					// Remove part after domain
+	$tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl); // Remove http(s)://
+	$tmpurl = preg_replace('/\/.*$/i', '', $tmpurl); // Remove part after domain
 
 	return $prefix.$tmpurl;
 }

Braces +21 added lines, -18 removed lines

@@ -56,12 +56,16 @@ 
 
 	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, ($followlocation?true:false));   // We use @ here because this may return warning if safe mode is on or open_basedir is on
 
-	if (count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	if (count($addheaders)) {
+	    curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	}
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true);	// To be able to retrieve request header and log it
 
 	// By default use tls decied by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	if (! empty($conf->global->MAIN_CURL_SSLVERSION)) {
+	    curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	}
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
     //turning off the server and peer verification(TrustManager Concept).
@@ -77,33 +81,29 @@ 
     {
     	curl_setopt($ch, CURLOPT_POST, 1);	// POST
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
-    }
-    else if ($postorget == 'PUT')
+    } else if ($postorget == 'PUT')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-    	if (! is_array($param)) parse_str($param, $array_param);
-    	else
+    	if (! is_array($param)) {
+    	    parse_str($param, $array_param);
+    	} else
     	{
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
     	    $array_param=$param;
     	}
     	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields
-    }
-    else if ($postorget == 'PUTALREADYFORMATED')
+    } else if ($postorget == 'PUTALREADYFORMATED')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// param = content of post, like a xml string
-    }
-    else if ($postorget == 'HEAD')
+    } else if ($postorget == 'HEAD')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
     	curl_setopt($ch, CURLOPT_NOBODY, true);
-    }
-    else if ($postorget == 'DELETE')
+    } else if ($postorget == 'DELETE')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');	// POST
-    }
-    else
+    } else
     {
     	curl_setopt($ch, CURLOPT_POST, 0);			// GET
     }
@@ -114,7 +114,9 @@ 
         dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
         //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
         curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        if ($PROXY_USER) {
+            curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        }
     }
 
     //getting response from server
@@ -137,8 +139,7 @@ 
         $rep['curl_error_msg']=curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',',$rep));
-    }
-    else
+    } else
     {
     	$info = curl_getinfo($ch);
 
@@ -190,7 +191,9 @@ 
 {
 	$prefix='';
 	$tmpurl = $url;
-	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
+	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) {
+	    $prefix = $reg[1];
+	}
 	$tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl);				// Remove http(s)://
 	$tmpurl = preg_replace('/\/.*$/i', '', $tmpurl);					// Remove part after domain
 

dolibarr/htdocs/core/lib/modulebuilder.lib.php

Indentation +67 added lines, -67 removed lines

@@ -46,37 +46,37 @@ 
 
     if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
     {
-    	dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
-    	return -1;
+        dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
+        return -1;
     }
 
     // Check parameters
     if (count($addfieldentry) > 0)
     {
         if (empty($addfieldentry['name']))
-    	{
-    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
-    		return -2;
-    	}
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
+            return -2;
+        }
         if (empty($addfieldentry['label']))
-    	{
-    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
-    		return -2;
-    	}
+        {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
+            return -2;
+        }
 
-    	if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
+        if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
 
-    	{
-    		setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
-    		return -2;
-    	}
+        {
+            setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
+            return -2;
+        }
     }
 
     $pathoffiletoeditsrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
     $pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
     if (! dol_is_file($pathoffiletoeditsrc))
     {
-    	$langs->load("errors");
+        $langs->load("errors");
         setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
         return -3;
     }
@@ -96,21 +96,21 @@ 
         // Edit class files
         $contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-	    // Update ->fields (add or remove entries)
+        // Update ->fields (add or remove entries)
         if (count($object->fields))
         {
-        	if (is_array($addfieldentry) && count($addfieldentry))
-        	{
-				$name=$addfieldentry['name'];
-        		unset($addfieldentry['name']);
-
-        		$object->fields[$name]=$addfieldentry;
-        	}
-        	if (! empty($delfieldentry))
-        	{
-        		$name=$delfieldentry;
-        		unset($object->fields[$name]);
-        	}
+            if (is_array($addfieldentry) && count($addfieldentry))
+            {
+                $name=$addfieldentry['name'];
+                unset($addfieldentry['name']);
+
+                $object->fields[$name]=$addfieldentry;
+            }
+            if (! empty($delfieldentry))
+            {
+                $name=$delfieldentry;
+                unset($object->fields[$name]);
+            }
         }
 
         dol_sort_array($object->fields, 'position');
@@ -143,28 +143,28 @@ 
                 if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
                 if ($val['arrayofkeyval'])
                 {
-                	$texttoinsert.= " 'arrayofkeyval'=>array(";
-                	$i=0;
-                	foreach($val['arrayofkeyval'] as $key2 => $val2)
-                	{
-                		if ($i) $texttoinsert.=", ";
-                		$texttoinsert.="'".$key2."'=>'".$val2."'";
-                		$i++;
-                	}
-                	$texttoinsert.= ")";
+                    $texttoinsert.= " 'arrayofkeyval'=>array(";
+                    $i=0;
+                    foreach($val['arrayofkeyval'] as $key2 => $val2)
+                    {
+                        if ($i) $texttoinsert.=", ";
+                        $texttoinsert.="'".$key2."'=>'".$val2."'";
+                        $i++;
+                    }
+                    $texttoinsert.= ")";
                 }
                 $texttoinsert.= "),\n";
             }
         }
 
         $texttoinsert.= "\t".');'."\n";
-		//print ($texttoinsert);exit;
+        //print ($texttoinsert);exit;
 
         if (count($object->fields))
         {
-        	$typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
+            $typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
 
-        	foreach($object->fields as $key => $val)
+            foreach($object->fields as $key => $val)
             {
                 $i++;
                 //$typephp=$typetotypephp[$val['type']];
@@ -224,22 +224,22 @@ 
     // Edit .sql file
     $pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
     $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
-	if (! dol_is_file($pathoffiletoeditsrc))
+    if (! dol_is_file($pathoffiletoeditsrc))
     {
-    	$langs->load("errors");
-    	setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
-    	return -1;
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
+        return -1;
     }
 
     // Load object from myobject.class.php
     try
     {
-    	if (! is_object($object))
-    	{
-    		include_once $pathoffiletoclasssrc;
-        	if (class_exists($objectname)) $object=new $objectname($db);
-        	else return -1;
-    	}
+        if (! is_object($object))
+        {
+            include_once $pathoffiletoclasssrc;
+            if (class_exists($objectname)) $object=new $objectname($db);
+            else return -1;
+        }
     }
     catch(Exception $e)
     {
@@ -270,12 +270,12 @@ 
             if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
             else
             {
-            	if ($val['default'] != '')
-            	{
-            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
-            		else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
-            		else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
-            	}
+                if ($val['default'] != '')
+                {
+                    if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
+                    else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
+                    else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+                }
             }
             $texttoinsert.= (($val['notnull'] > 0)?' NOT NULL':'');
             if ($i < count($object->fields)) $texttoinsert.=", ";
@@ -289,11 +289,11 @@ 
     $result = file_put_contents($pathoffiletoedittarget, $contentsql);
     if ($result)
     {
-    	@chmod($pathoffiletoedittarget, octdec($newmask));
+        @chmod($pathoffiletoedittarget, octdec($newmask));
     }
     else
     {
-    	$error++;
+        $error++;
     }
 
     // Edit .key.sql file
@@ -316,12 +316,12 @@ 
             }
             if (! empty($val['foreignkey']))
             {
-            	$tmp=explode('.',$val['foreignkey']);
-            	if (! empty($tmp[0]) && ! empty($tmp[1]))
-            	{
-            		$texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
-            		$texttoinsert.= "\n";
-            	}
+                $tmp=explode('.',$val['foreignkey']);
+                if (! empty($tmp[0]) && ! empty($tmp[1]))
+                {
+                    $texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
+                    $texttoinsert.= "\n";
+                }
             }
         }
     }
@@ -334,11 +334,11 @@ 
     $result2 = file_put_contents($pathoffiletoedittarget, $contentsql);
     if ($result)
     {
-    	@chmod($pathoffiletoedittarget, octdec($newmask));
+        @chmod($pathoffiletoedittarget, octdec($newmask));
     }
     else
     {
-    	$error++;
+        $error++;
     }
 
     return $error ? -1 : 1;

Spacing +82 added lines, -82 removed lines

@@ -37,14 +37,14 @@ 
  * 	@return	int|object					<=0 if KO, Object if OK
  *  @see rebuildObjectSql
  */
-function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir='', $addfieldentry=array() ,$delfieldentry='')
+function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir = '', $addfieldentry = array(), $delfieldentry = '')
 {
     global $db, $langs;
 
     if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($readdir)) $readdir = $destdir;
 
-    if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
+    if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
     {
     	dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
     	return -1;
@@ -64,7 +64,7 @@ 
     		return -2;
     	}
 
-    	if (! preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
+    	if (!preg_match('/^(price|boolean|sellist|integer|date|timestamp|varchar|double|text|html)/', $addfieldentry['type']))
 
     	{
     		setEventMessages($langs->trans('BadFormatForType', $objectname), null, 'errors');
@@ -72,9 +72,9 @@ 
     	}
     }
 
-    $pathoffiletoeditsrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
-    $pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
-    if (! dol_is_file($pathoffiletoeditsrc))
+    $pathoffiletoeditsrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
+    $pathoffiletoedittarget = $destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
+    if (!dol_is_file($pathoffiletoeditsrc))
     {
     	$langs->load("errors");
         setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -87,7 +87,7 @@ 
     try
     {
         include_once $pathoffiletoeditsrc;
-        if (class_exists($objectname)) $object=new $objectname($db);
+        if (class_exists($objectname)) $object = new $objectname($db);
         else return -4;
 
         // Backup old file
@@ -101,83 +101,83 @@ 
         {
         	if (is_array($addfieldentry) && count($addfieldentry))
         	{
-				$name=$addfieldentry['name'];
+				$name = $addfieldentry['name'];
         		unset($addfieldentry['name']);
 
-        		$object->fields[$name]=$addfieldentry;
+        		$object->fields[$name] = $addfieldentry;
         	}
-        	if (! empty($delfieldentry))
+        	if (!empty($delfieldentry))
         	{
-        		$name=$delfieldentry;
+        		$name = $delfieldentry;
         		unset($object->fields[$name]);
         	}
         }
 
         dol_sort_array($object->fields, 'position');
 
-        $i=0;
+        $i = 0;
         $texttoinsert = '// BEGIN MODULEBUILDER PROPERTIES'."\n";
-        $texttoinsert.= "\t".'/**'."\n";
-        $texttoinsert.= "\t".' * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
-        $texttoinsert.= "\t".' */'."\n";
-        $texttoinsert.= "\t".'public $fields=array('."\n";
+        $texttoinsert .= "\t".'/**'."\n";
+        $texttoinsert .= "\t".' * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
+        $texttoinsert .= "\t".' */'."\n";
+        $texttoinsert .= "\t".'public $fields=array('."\n";
 
         if (count($object->fields))
         {
 
-            foreach($object->fields as $key => $val)
+            foreach ($object->fields as $key => $val)
             {
                 $i++;
-                $texttoinsert.= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
-                $texttoinsert.= " 'enabled'=>".($val['enabled']!=''?$val['enabled']:1).",";
-                $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
-                $texttoinsert.= " 'position'=>".($val['position']!=''?$val['position']:50).",";
-                $texttoinsert.= " 'notnull'=>".($val['notnull']!=''?$val['notnull']:-1).",";
-                if ($val['default'])        $texttoinsert.= " 'default'=>'".$val['default']."',";
-                if ($val['index'])          $texttoinsert.= " 'index'=>".$val['index'].",";
-                if ($val['searchall'])      $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
-                if ($val['isameasure'])     $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
-                if ($val['foreignkey'])     $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
-                if ($val['help'])           $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-                if ($val['comment'])        $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
-                if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+                $texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
+                $texttoinsert .= " 'enabled'=>".($val['enabled'] != '' ? $val['enabled'] : 1).",";
+                $texttoinsert .= " 'visible'=>".($val['visible'] != '' ? $val['visible'] : -1).",";
+                $texttoinsert .= " 'position'=>".($val['position'] != '' ? $val['position'] : 50).",";
+                $texttoinsert .= " 'notnull'=>".($val['notnull'] != '' ? $val['notnull'] : -1).",";
+                if ($val['default'])        $texttoinsert .= " 'default'=>'".$val['default']."',";
+                if ($val['index'])          $texttoinsert .= " 'index'=>".$val['index'].",";
+                if ($val['searchall'])      $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
+                if ($val['isameasure'])     $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
+                if ($val['foreignkey'])     $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
+                if ($val['help'])           $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+                if ($val['comment'])        $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
+                if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
                 if ($val['arrayofkeyval'])
                 {
-                	$texttoinsert.= " 'arrayofkeyval'=>array(";
-                	$i=0;
-                	foreach($val['arrayofkeyval'] as $key2 => $val2)
+                	$texttoinsert .= " 'arrayofkeyval'=>array(";
+                	$i = 0;
+                	foreach ($val['arrayofkeyval'] as $key2 => $val2)
                 	{
-                		if ($i) $texttoinsert.=", ";
-                		$texttoinsert.="'".$key2."'=>'".$val2."'";
+                		if ($i) $texttoinsert .= ", ";
+                		$texttoinsert .= "'".$key2."'=>'".$val2."'";
                 		$i++;
                 	}
-                	$texttoinsert.= ")";
+                	$texttoinsert .= ")";
                 }
-                $texttoinsert.= "),\n";
+                $texttoinsert .= "),\n";
             }
         }
 
-        $texttoinsert.= "\t".');'."\n";
+        $texttoinsert .= "\t".');'."\n";
 		//print ($texttoinsert);exit;
 
         if (count($object->fields))
         {
-        	$typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
+        	$typetotypephp = array('integer'=>'integer', 'varchar'=>'string');
 
-        	foreach($object->fields as $key => $val)
+        	foreach ($object->fields as $key => $val)
             {
                 $i++;
                 //$typephp=$typetotypephp[$val['type']];
-                $texttoinsert.= "\t".'public $'.$key.";";
+                $texttoinsert .= "\t".'public $'.$key.";";
                 //if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
                 //if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
                 //$texttoinsert.= ($val['notnull']?' NOT NULL':'');
                 //if ($i < count($object->fields)) $texttoinsert.=";";
-                $texttoinsert.= "\n";
+                $texttoinsert .= "\n";
             }
         }
 
-        $texttoinsert.= "\t".'// END MODULEBUILDER PROPERTIES';
+        $texttoinsert .= "\t".'// END MODULEBUILDER PROPERTIES';
 
         //print($texttoinsert);exit;
 
@@ -191,7 +191,7 @@ 
 
         return $object;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
         print $e->getMessage();
         return -5;
@@ -210,21 +210,21 @@ 
  * 	@return	int							<=0 if KO, >0 if OK
  *  @see rebuildObjectClass
  */
-function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='', $object=null)
+function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null)
 {
     global $db, $langs;
 
     $error = 0;
 
     if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($readdir)) $readdir = $destdir;
 
-    $pathoffiletoclasssrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
+    $pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 
     // Edit .sql file
-    $pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
-	if (! dol_is_file($pathoffiletoeditsrc))
+    $pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+    $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+	if (!dol_is_file($pathoffiletoeditsrc))
     {
     	$langs->load("errors");
     	setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -234,14 +234,14 @@ 
     // Load object from myobject.class.php
     try
     {
-    	if (! is_object($object))
+    	if (!is_object($object))
     	{
     		include_once $pathoffiletoclasssrc;
-        	if (class_exists($objectname)) $object=new $objectname($db);
+        	if (class_exists($objectname)) $object = new $objectname($db);
         	else return -1;
     	}
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
         print $e->getMessage();
     }
@@ -251,38 +251,38 @@ 
 
     $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-    $i=0;
+    $i = 0;
     $texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
     if (count($object->fields))
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             $i++;
 
             $type = $val['type'];
-            $type = preg_replace('/:.*$/', '', $type);		// For case type = 'integer:Societe:societe/class/societe.class.php'
+            $type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
 
-            if ($type == 'html') $type = 'text';            // html modulebuilder type is a text type in database
-            else if ($type == 'price') $type = 'double';            // html modulebuilder type is a text type in database
+            if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
+            else if ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
             else if ($type == 'link' || $type == 'sellist') $type = 'integer';
-            $texttoinsert.= "\t".$key." ".$type;
-            if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
-            if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
+            $texttoinsert .= "\t".$key." ".$type;
+            if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+            if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
             else
             {
             	if ($val['default'] != '')
             	{
-            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
-            		else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
-            		else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
+            		else if (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
+            		else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
             	}
             }
-            $texttoinsert.= (($val['notnull'] > 0)?' NOT NULL':'');
-            if ($i < count($object->fields)) $texttoinsert.=", ";
-            $texttoinsert.= "\n";
+            $texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
+            if ($i < count($object->fields)) $texttoinsert .= ", ";
+            $texttoinsert .= "\n";
         }
     }
-    $texttoinsert.= "\t".'-- END MODULEBUILDER FIELDS';
+    $texttoinsert .= "\t".'-- END MODULEBUILDER FIELDS';
 
     $contentsql = preg_replace('/-- BEGIN MODULEBUILDER FIELDS.*END MODULEBUILDER FIELDS/ims', $texttoinsert, $contentsql);
 
@@ -297,35 +297,35 @@ 
     }
 
     // Edit .key.sql file
-    $pathoffiletoeditsrc=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+    $pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
+    $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
 
     $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-    $i=0;
+    $i = 0;
     $texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
     if (count($object->fields))
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             $i++;
-            if (! empty($val['index']))
+            if (!empty($val['index']))
             {
-                $texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
-                $texttoinsert.= "\n";
+                $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
+                $texttoinsert .= "\n";
             }
-            if (! empty($val['foreignkey']))
+            if (!empty($val['foreignkey']))
             {
-            	$tmp=explode('.',$val['foreignkey']);
-            	if (! empty($tmp[0]) && ! empty($tmp[1]))
+            	$tmp = explode('.', $val['foreignkey']);
+            	if (!empty($tmp[0]) && !empty($tmp[1]))
             	{
-            		$texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
-            		$texttoinsert.= "\n";
+            		$texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
+            		$texttoinsert .= "\n";
             	}
             }
         }
     }
-    $texttoinsert.= '-- END MODULEBUILDER INDEXES';
+    $texttoinsert .= '-- END MODULEBUILDER INDEXES';
 
     $contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql);
 

Braces +80 added lines, -35 removed lines

@@ -41,8 +41,12 @@ 
 {
     global $db, $langs;
 
-    if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($objectname)) {
+        return -1;
+    }
+    if (empty($readdir)) {
+        $readdir=$destdir;
+    }
 
     if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
     {
@@ -87,8 +91,11 @@ 
     try
     {
         include_once $pathoffiletoeditsrc;
-        if (class_exists($objectname)) $object=new $objectname($db);
-        else return -4;
+        if (class_exists($objectname)) {
+            $object=new $objectname($db);
+        } else {
+            return -4;
+        }
 
         // Backup old file
         dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
@@ -133,21 +140,39 @@ 
                 $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
                 $texttoinsert.= " 'position'=>".($val['position']!=''?$val['position']:50).",";
                 $texttoinsert.= " 'notnull'=>".($val['notnull']!=''?$val['notnull']:-1).",";
-                if ($val['default'])        $texttoinsert.= " 'default'=>'".$val['default']."',";
-                if ($val['index'])          $texttoinsert.= " 'index'=>".$val['index'].",";
-                if ($val['searchall'])      $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
-                if ($val['isameasure'])     $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
-                if ($val['foreignkey'])     $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
-                if ($val['help'])           $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-                if ($val['comment'])        $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
-                if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+                if ($val['default']) {
+                    $texttoinsert.= " 'default'=>'".$val['default']."',";
+                }
+                if ($val['index']) {
+                    $texttoinsert.= " 'index'=>".$val['index'].",";
+                }
+                if ($val['searchall']) {
+                    $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
+                }
+                if ($val['isameasure']) {
+                    $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
+                }
+                if ($val['foreignkey']) {
+                    $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
+                }
+                if ($val['help']) {
+                    $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+                }
+                if ($val['comment']) {
+                    $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
+                }
+                if ($val['showoncombobox']) {
+                    $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+                }
                 if ($val['arrayofkeyval'])
                 {
                 	$texttoinsert.= " 'arrayofkeyval'=>array(";
                 	$i=0;
                 	foreach($val['arrayofkeyval'] as $key2 => $val2)
                 	{
-                		if ($i) $texttoinsert.=", ";
+                		if ($i) {
+                		    $texttoinsert.=", ";
+                		}
                 		$texttoinsert.="'".$key2."'=>'".$val2."'";
                 		$i++;
                 	}
@@ -190,8 +215,7 @@ 
         @chmod($pathoffiletoedittarget, octdec($newmask));
 
         return $object;
-    }
-    catch(Exception $e)
+    } catch(Exception $e)
     {
         print $e->getMessage();
         return -5;
@@ -216,8 +240,12 @@ 
 
     $error = 0;
 
-    if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($objectname)) {
+        return -1;
+    }
+    if (empty($readdir)) {
+        $readdir=$destdir;
+    }
 
     $pathoffiletoclasssrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
 
@@ -237,11 +265,13 @@ 
     	if (! is_object($object))
     	{
     		include_once $pathoffiletoclasssrc;
-        	if (class_exists($objectname)) $object=new $objectname($db);
-        	else return -1;
+        	if (class_exists($objectname)) {
+        	    $object=new $objectname($db);
+        	} else {
+        	    return -1;
+        	}
     	}
-    }
-    catch(Exception $e)
+    } catch(Exception $e)
     {
         print $e->getMessage();
     }
@@ -262,23 +292,40 @@ 
             $type = $val['type'];
             $type = preg_replace('/:.*$/', '', $type);		// For case type = 'integer:Societe:societe/class/societe.class.php'
 
-            if ($type == 'html') $type = 'text';            // html modulebuilder type is a text type in database
-            else if ($type == 'price') $type = 'double';            // html modulebuilder type is a text type in database
-            else if ($type == 'link' || $type == 'sellist') $type = 'integer';
+            if ($type == 'html') {
+                $type = 'text';
+            }
+            // html modulebuilder type is a text type in database
+            else if ($type == 'price') {
+                $type = 'double';
+            }
+            // html modulebuilder type is a text type in database
+            else if ($type == 'link' || $type == 'sellist') {
+                $type = 'integer';
+            }
             $texttoinsert.= "\t".$key." ".$type;
-            if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
-            if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
-            else
+            if ($key == 'rowid') {
+                $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
+            }
+            if ($key == 'entity') {
+                $texttoinsert.= ' DEFAULT 1';
+            } else
             {
             	if ($val['default'] != '')
             	{
-            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
-            		else if (preg_match('/varchar/', $type )) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
-            		else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+            		if (preg_match('/^null$/i', $val['default'])) {
+            		    $texttoinsert.= " DEFAULT NULL";
+            		} else if (preg_match('/varchar/', $type )) {
+            		    $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
+            		} else {
+            		    $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+            		}
             	}
             }
             $texttoinsert.= (($val['notnull'] > 0)?' NOT NULL':'');
-            if ($i < count($object->fields)) $texttoinsert.=", ";
+            if ($i < count($object->fields)) {
+                $texttoinsert.=", ";
+            }
             $texttoinsert.= "\n";
         }
     }
@@ -290,8 +337,7 @@ 
     if ($result)
     {
     	@chmod($pathoffiletoedittarget, octdec($newmask));
-    }
-    else
+    } else
     {
     	$error++;
     }
@@ -335,8 +381,7 @@ 
     if ($result)
     {
     	@chmod($pathoffiletoedittarget, octdec($newmask));
-    }
-    else
+    } else
     {
     	$error++;
     }

dolibarr/htdocs/core/lib/member.lib.php

Indentation +86 added lines, -86 removed lines

@@ -32,36 +32,36 @@ 
  */
 function member_prepare_head(Adherent $object)
 {
-	global $db, $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'general';
-	$h++;
-
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
-
-		$head[$h][0] = DOL_URL_ROOT.'/adherents/ldap.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("LDAPCard");
-		$head[$h][2] = 'ldap';
-		$h++;
-	}
-
-	if (! empty($user->rights->adherent->cotisation->lire))
-	{
-		$nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
-		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
-		$head[$h][1] = $langs->trans("Subscriptions");
-		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
-		$h++;
-	}
+    global $db, $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'general';
+    $h++;
+
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
+
+        $head[$h][0] = DOL_URL_ROOT.'/adherents/ldap.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("LDAPCard");
+        $head[$h][2] = 'ldap';
+        $h++;
+    }
+
+    if (! empty($user->rights->adherent->cotisation->lire))
+    {
+        $nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
+        $head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
+        $head[$h][1] = $langs->trans("Subscriptions");
+        $head[$h][2] = 'subscription';
+        if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -74,10 +74,10 @@ 
     if(!empty($object->note_private)) $nbNote++;
     if(!empty($object->note_public)) $nbNote++;
     $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Note");
-	$head[$h][2] = 'note';
+    $head[$h][1] = $langs->trans("Note");
+    $head[$h][2] = 'note';
     if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-	$h++;
+    $h++;
 
     // Attachments
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -91,23 +91,23 @@ 
     $head[$h][2] = 'document';
     $h++;
 
-	// Show agenda tab
-	if (! empty($conf->agenda->enabled))
-	{
-	    $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
-	    $head[$h][1] = $langs->trans("Events");
-	    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-	    {
-	        $head[$h][1].= '/';
-	        $head[$h][1].= $langs->trans("Agenda");
-	    }
-	    $head[$h][2] = 'agenda';
-	    $h++;
-	}
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove');
-
-	return $head;
+    // Show agenda tab
+    if (! empty($conf->agenda->enabled))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
+        $head[$h][1] = $langs->trans("Events");
+        if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+        {
+            $head[$h][1].= '/';
+            $head[$h][1].= $langs->trans("Agenda");
+        }
+        $head[$h][2] = 'agenda';
+        $h++;
+    }
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove');
+
+    return $head;
 }
 
 /**
@@ -118,26 +118,26 @@ 
  */
 function member_type_prepare_head(AdherentType $object)
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h=0;
-	$head = array();
+    $h=0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
 
-		$head[$h][0] = DOL_URL_ROOT.'/adherents/type_ldap.php?rowid='.$object->id;
-		$head[$h][1] = $langs->trans("LDAPCard");
-		$head[$h][2] = 'ldap';
-		$h++;
-	}
+        $head[$h][0] = DOL_URL_ROOT.'/adherents/type_ldap.php?rowid='.$object->id;
+        $head[$h][1] = $langs->trans("LDAPCard");
+        $head[$h][2] = 'ldap';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -145,9 +145,9 @@ 
     // $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,'membertype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -261,28 +261,28 @@ 
  */
 function subscription_prepare_head(Subscription $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.'/adherents/subscription/card.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'general';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/info.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/adherents/subscription/info.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $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,'subscription');
+    // 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,'subscription');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription','remove');
 
-	return $head;
+    return $head;
 }

Spacing +30 added lines, -30 removed lines

@@ -42,8 +42,8 @@ 
 	$head[$h][2] = 'general';
 	$h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 
@@ -53,13 +53,13 @@ 
 		$h++;
 	}
 
-	if (! empty($user->rights->adherent->cotisation->lire))
+	if (!empty($user->rights->adherent->cotisation->lire))
 	{
-		$nbSubscription = is_array($object->subscriptions)?count($object->subscriptions):0;
+		$nbSubscription = is_array($object->subscriptions) ?count($object->subscriptions) : 0;
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
+		if ($nbSubscription > 0) $head[$h][1] .= ' <span class="badge">'.$nbSubscription.'</span>';
 		$h++;
 	}
 
@@ -67,45 +67,45 @@ 
     // 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,'member');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
 
     $nbNote = 0;
-    if(!empty($object->note)) $nbNote++;
-    if(!empty($object->note_private)) $nbNote++;
-    if(!empty($object->note_public)) $nbNote++;
+    if (!empty($object->note)) $nbNote++;
+    if (!empty($object->note_private)) $nbNote++;
+    if (!empty($object->note_public)) $nbNote++;
     $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    if ($nbNote > 0) $head[$h][1] .= ' <span class="badge">'.$nbNote.'</span>';
 	$h++;
 
     // Attachments
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0,0,0,1,$object,'member');
-    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+    $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');
+    $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.'/adherents/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] = 'document';
     $h++;
 
 	// Show agenda tab
-	if (! empty($conf->agenda->enabled))
+	if (!empty($conf->agenda->enabled))
 	{
 	    $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
 	    $head[$h][1] = $langs->trans("Events");
-	    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+	    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	    {
-	        $head[$h][1].= '/';
-	        $head[$h][1].= $langs->trans("Agenda");
+	        $head[$h][1] .= '/';
+	        $head[$h][1] .= $langs->trans("Agenda");
 	    }
 	    $head[$h][2] = 'agenda';
 	    $h++;
 	}
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'member','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'remove');
 
 	return $head;
 }
@@ -120,7 +120,7 @@ 
 {
 	global $langs, $conf, $user;
 
-	$h=0;
+	$h = 0;
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/type.php?rowid='.$object->id;
@@ -128,8 +128,8 @@ 
 	$head[$h][2] = 'card';
 	$h++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 
@@ -143,9 +143,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,'membertype');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'membertype','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype', 'remove');
 
 	return $head;
 }
@@ -176,7 +176,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,'',$head,$h,'member_admin');
+    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin');
 
     $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
     $head[$h][1] = $langs->trans("ExtraFieldsMember");
@@ -193,7 +193,7 @@ 
     $head[$h][2] = 'website';
     $h++;
 
-    complete_head_from_modules($conf,$langs,'',$head,$h,'member_admin','remove');
+    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin', 'remove');
 
     return $head;
 }
@@ -246,9 +246,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,'member_stats');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats');
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'member_stats','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove');
 
     return $head;
 }
@@ -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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'subscription');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'subscription','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'subscription', 'remove');
 
 	return $head;
 }

Braces +18 added lines, -6 removed lines

@@ -59,7 +59,9 @@ 
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
+		if ($nbSubscription > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbSubscription.'</span>';
+		}
 		$h++;
 	}
 
@@ -70,13 +72,21 @@ 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'member');
 
     $nbNote = 0;
-    if(!empty($object->note)) $nbNote++;
-    if(!empty($object->note_private)) $nbNote++;
-    if(!empty($object->note_public)) $nbNote++;
+    if(!empty($object->note)) {
+        $nbNote++;
+    }
+    if(!empty($object->note_private)) {
+        $nbNote++;
+    }
+    if(!empty($object->note_public)) {
+        $nbNote++;
+    }
     $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    if ($nbNote > 0) {
+        $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+    }
 	$h++;
 
     // Attachments
@@ -87,7 +97,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = DOL_URL_ROOT.'/adherents/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] = 'document';
     $h++;
 

dolibarr/htdocs/core/lib/contract.lib.php

Indentation +54 added lines, -54 removed lines

@@ -30,25 +30,25 @@ 
  */
 function contract_prepare_head(Contrat $object)
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 	
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("ContractCard");
-	$head[$h][2] = 'card';
-	$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.'/contrat/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("ContractCard");
+    $head[$h][2] = 'card';
+    $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.'/contrat/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("ContactsAddresses");
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -58,35 +58,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.'/contrat/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++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/contrat/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++;
     }
 
-	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->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->contrat->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.'/contrat/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++;
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/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++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/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,'contract','remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -96,24 +96,24 @@ 
  */
 function contract_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/contract.php";
-	$head[$h][1] = $langs->trans("Contracts");
-	$head[$h][2] = 'contract';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/contract.php";
+    $head[$h][1] = $langs->trans("Contracts");
+    $head[$h][2] = 'contract';
+    $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,'contract_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,'contract_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
@@ -124,8 +124,8 @@ 
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin','remove');
 
-		return $head;
+        return $head;
 }
 

Spacing +13 added lines, -13 removed lines

@@ -42,10 +42,10 @@ 
 
 	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.'/contrat/contact.php?id='.$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++;
 	}
@@ -54,28 +54,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,'contract');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract');
 
     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.'/contrat/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++;
     }
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->contrat->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->contrat->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.'/contrat/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++;
 
@@ -84,7 +84,7 @@ 
 	$head[$h][2] = 'info';
 	$h++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'contract','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'remove');
 
 	return $head;
 }
@@ -110,7 +110,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,'contract_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/admin/contract_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
@@ -124,7 +124,7 @@ 
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'contract_admin','remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'remove');
 
 		return $head;
 }

Braces +15 added lines, -5 removed lines

@@ -45,7 +45,9 @@ 
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$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++;
 	}
@@ -59,11 +61,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.'/contrat/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++;
     }
@@ -75,7 +83,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/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/format_cards.lib.php

Indentation +1 added lines, -1 removed lines

@@ -64,6 +64,6 @@
 // We add characteristics to the name
 foreach($_Avery_Labels as $key => $val)
 {
-	$_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
+    $_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
 }
 

Spacing +18 added lines, -18 removed lines

@@ -38,22 +38,22 @@ 
 {
     while ($row = $db->fetch_array($resql))
     {
-        $_Avery_Labels[$row['code']]['name']=$row['name'];
-        $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
-        $_Avery_Labels[$row['code']]['orientation']=$row['orientation'];
-        $_Avery_Labels[$row['code']]['metric']=$row['metric'];
-        $_Avery_Labels[$row['code']]['marginLeft']=$row['leftmargin'];
-        $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
-        $_Avery_Labels[$row['code']]['marginTop']=$row['topmargin'];
-        $_Avery_Labels[$row['code']]['NX']=$row['nx'];
-        $_Avery_Labels[$row['code']]['NY']=$row['ny'];
-        $_Avery_Labels[$row['code']]['SpaceX']=$row['spacex'];
-        $_Avery_Labels[$row['code']]['SpaceY']=$row['spacey'];
-        $_Avery_Labels[$row['code']]['width']=$row['width'];
-        $_Avery_Labels[$row['code']]['height']=$row['height'];
-        $_Avery_Labels[$row['code']]['font-size']=$row['font_size'];
-        $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
-        $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
+        $_Avery_Labels[$row['code']]['name'] = $row['name'];
+        $_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
+        $_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
+        $_Avery_Labels[$row['code']]['metric'] = $row['metric'];
+        $_Avery_Labels[$row['code']]['marginLeft'] = $row['leftmargin'];
+        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+        $_Avery_Labels[$row['code']]['marginTop'] = $row['topmargin'];
+        $_Avery_Labels[$row['code']]['NX'] = $row['nx'];
+        $_Avery_Labels[$row['code']]['NY'] = $row['ny'];
+        $_Avery_Labels[$row['code']]['SpaceX'] = $row['spacex'];
+        $_Avery_Labels[$row['code']]['SpaceY'] = $row['spacey'];
+        $_Avery_Labels[$row['code']]['width'] = $row['width'];
+        $_Avery_Labels[$row['code']]['height'] = $row['height'];
+        $_Avery_Labels[$row['code']]['font-size'] = $row['font_size'];
+        $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
+        $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
     }
 }
 else
@@ -62,8 +62,8 @@ 
 }
 
 // We add characteristics to the name
-foreach($_Avery_Labels as $key => $val)
+foreach ($_Avery_Labels as $key => $val)
 {
-	$_Avery_Labels[$key]['name'].=' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
+	$_Avery_Labels[$key]['name'] .= ' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
 }
 

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         $_Avery_Labels[$row['code']]['custom_x']=$row['custom_x'];
         $_Avery_Labels[$row['code']]['custom_y']=$row['custom_y'];
     }
-}
-else
+} else
 {
     dol_print_error($db);
 }

dolibarr/htdocs/core/lib/contact.lib.php

Indentation +22 added lines, -22 removed lines

@@ -32,31 +32,31 @@ 
  */
 function contact_prepare_head(Contact $object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$tab = 0;
-	$head = array();
+    $tab = 0;
+    $head = array();
 
-	$head[$tab][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("Card");
-	$head[$tab][2] = 'card';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans("Card");
+    $head[$tab][2] = 'card';
+    $tab++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
 
-		$head[$tab][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id;
-		$head[$tab][1] = $langs->trans("LDAPCard");
-		$head[$tab][2] = 'ldap';
-		$tab++;
-	}
+        $head[$tab][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id;
+        $head[$tab][1] = $langs->trans("LDAPCard");
+        $head[$tab][2] = 'ldap';
+        $tab++;
+    }
 
-	$head[$tab][0] = DOL_URL_ROOT.'/contact/perso.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("PersonalInformations");
-	$head[$tab][2] = 'perso';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/contact/perso.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans("PersonalInformations");
+    $head[$tab][2] = 'perso';
+    $tab++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -103,8 +103,8 @@ 
 	$head[$tab][2] = 'info';
 	$tab++;*/
 
-	complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact','remove');
 
-	return $head;
+    return $head;
 }
 

Spacing +14 added lines, -14 removed lines

@@ -42,8 +42,8 @@ 
 	$head[$tab][2] = 'card';
 	$tab++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
 	{
 		$langs->load("ldap");
 
@@ -62,36 +62,36 @@ 
     // 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,'contact');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact');
 
     // Notes
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
-        $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+        $nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
         $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
         $head[$tab][1] = $langs->trans("Note");
-        if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if ($nbNote > 0) $head[$tab][1] .= ' <span class="badge">'.$nbNote.'</span>';
         $head[$tab][2] = 'note';
         $tab++;
     }
 
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->societe->dir_output . "/contact/" . 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->societe->dir_output."/contact/".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.'/contact/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++;
 
     // Agenda / Events
     $head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
-    $head[$tab][1].= $langs->trans("Events");
-    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    $head[$tab][1] .= $langs->trans("Events");
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
     {
-        $head[$tab][1].= '/';
-        $head[$tab][1].= $langs->trans("Agenda");
+        $head[$tab][1] .= '/';
+        $head[$tab][1] .= $langs->trans("Agenda");
     }
     $head[$tab][2] = 'agenda';
     $tab++;
@@ -103,7 +103,7 @@ 
 	$head[$tab][2] = 'info';
 	$tab++;*/
 
-	complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact', 'remove');
 
 	return $head;
 }

Braces +6 added lines, -2 removed lines

@@ -69,7 +69,9 @@ 
         $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
         $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
         $head[$tab][1] = $langs->trans("Note");
-        if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if($nbNote > 0) {
+            $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        }
         $head[$tab][2] = 'note';
         $tab++;
     }
@@ -81,7 +83,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$tab][0] = DOL_URL_ROOT.'/contact/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++;
 

dolibarr/htdocs/core/lib/loan.lib.php

Indentation +25 added lines, -25 removed lines

@@ -36,15 +36,15 @@ 
     $tab = 0;
     $head = array();
 
-	$head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans('Card');
-	$head[$tab][2] = 'card';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans('Card');
+    $head[$tab][2] = 'card';
+    $tab++;
 	
-	$head[$tab][0] = DOL_URL_ROOT.'/loan/schedule.php?loanid='.$object->id;
-	$head[$tab][1] = $langs->trans('FinancialCommitment');
-	$head[$tab][2] = 'FinancialCommitment';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/loan/schedule.php?loanid='.$object->id;
+    $head[$tab][1] = $langs->trans('FinancialCommitment');
+    $head[$tab][2] = 'FinancialCommitment';
+    $tab++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -52,26 +52,26 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf, $langs, $object, $head, $tab,'loan');
 
-	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->loan->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->loan->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.'/loan/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.'/loan/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++;
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
-		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
-		$head[$tab][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$tab][2] = 'note';
-		$tab++;
-	}
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+        $head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
+        $head[$tab][1] = $langs->trans("Notes");
+        if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$tab][2] = 'note';
+        $tab++;
+    }
 
     $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id;
     $head[$tab][1] = $langs->trans("Info");

Spacing +8 added lines, -8 removed lines

@@ -50,25 +50,25 @@ 
     // 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,'loan');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->loan->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->loan->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.'/loan/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++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
-		$nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
+		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if ($nbNote > 0) $head[$tab][1] .= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$tab][2] = 'note';
 		$tab++;
 	}
@@ -78,7 +78,7 @@ 
     $head[$tab][2] = 'info';
     $tab++;
 
-    complete_head_from_modules($conf,$langs,$object,$head,$tab,'loan','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $tab, 'loan', 'remove');
 
     return $head;
 }

Braces +6 added lines, -2 removed lines

@@ -59,7 +59,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/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++;
 
@@ -68,7 +70,9 @@ 
 		$nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+		if($nbNote > 0) {
+		    $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+		}
 		$head[$tab][2] = 'note';
 		$tab++;
 	}