alxarafe / alixar

dolibarr/htdocs/core/lib/bank.lib.php

Indentation +62 added lines, -62 removed lines

@@ -67,27 +67,27 @@ 
 
     if ($object->courant != Account::TYPE_CASH)
     {
-    	$nbReceipts=0;
-
-    	// List of all standing receipts
-    	$sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-    	$sql.= " WHERE b.fk_account = ".$object->id;
-
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$obj = $db->fetch_object($resql);
-    		if ($obj) $nbReceipts = $obj->nb;
-    		$db->free($resql);
-    	}
-
-    	$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
-	    $head[$h][1] = $langs->trans("AccountStatements");
-	    if (($nbReceipts) > 0) $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
-	    $head[$h][2] = 'statement';
-	    $h++;
-	}
+        $nbReceipts=0;
+
+        // List of all standing receipts
+        $sql = "SELECT COUNT(DISTINCT(b.num_releve)) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+        $sql.= " WHERE b.fk_account = ".$object->id;
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $nbReceipts = $obj->nb;
+            $db->free($resql);
+        }
+
+        $head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
+        $head[$h][1] = $langs->trans("AccountStatements");
+        if (($nbReceipts) > 0) $head[$h][1].= ' <span class="badge">'.($nbReceipts).'</span>';
+        $head[$h][2] = 'statement';
+        $h++;
+    }
 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -101,7 +101,7 @@ 
     $head[$h][2] = 'document';
     $h++;
 
-	// Show more tabs from modules
+    // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
@@ -112,7 +112,7 @@ 
     $head[$h][2] = 'info';
     $h++;*/
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
     return $head;
 }
@@ -124,14 +124,14 @@ 
  */
 function bank_admin_prepare_head($object)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $h++;
 
     $head[$h][0] = DOL_URL_ROOT . '/admin/chequereceipts.php';
     $head[$h][1] = $langs->trans("CheckReceiptShort");
@@ -139,20 +139,20 @@ 
     $h++;
 
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_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);   												to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/bank_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/bank_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -164,15 +164,15 @@ 
 function various_payment_prepare_head($object)
 {
 
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -180,25 +180,25 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment');
 
-	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->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->banque->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/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.'/compta/bank/various_payment/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.'/compta/bank/various_payment/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/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,'various_payment', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'various_payment', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**

dolibarr/htdocs/core/lib/fiscalyear.lib.php

Indentation +16 added lines, -16 removed lines

@@ -29,28 +29,28 @@
  */
 function fiscalyear_prepare_head(Fiscalyear $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear');
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_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,'fiscalyear','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear','remove');
 
-	return $head;
+    return $head;
 }
\ No newline at end of file

dolibarr/htdocs/core/lib/functions_ch.lib.php

Indentation +136 added lines, -136 removed lines

@@ -31,140 +31,140 @@
  */
 function dol_ch_controle_bvrb($bvrb)
 {
-	// Init array for control
-	$tableau[0][0]=0;
-	$tableau[0][1]=9;
-	$tableau[0][2]=4;
-	$tableau[0][3]=6;
-	$tableau[0][4]=8;
-	$tableau[0][5]=2;
-	$tableau[0][6]=7;
-	$tableau[0][7]=1;
-	$tableau[0][8]=3;
-	$tableau[0][9]=5;
-	$tableau[0][10]=0;
-
-	$tableau[1][0]=9;
-	$tableau[1][1]=4;
-	$tableau[1][2]=6;
-	$tableau[1][3]=8;
-	$tableau[1][4]=2;
-	$tableau[1][5]=7;
-	$tableau[1][6]=1;
-	$tableau[1][7]=3;
-	$tableau[1][8]=5;
-	$tableau[1][9]=0;
-	$tableau[1][10]=9;
-
-	$tableau[2][0]=4;
-	$tableau[2][1]=6;
-	$tableau[2][2]=8;
-	$tableau[2][3]=2;
-	$tableau[2][4]=7;
-	$tableau[2][5]=1;
-	$tableau[2][6]=3;
-	$tableau[2][7]=5;
-	$tableau[2][8]=0;
-	$tableau[2][9]=9;
-	$tableau[2][10]=8;
-
-	$tableau[3][0]=6;
-	$tableau[3][1]=8;
-	$tableau[3][2]=2;
-	$tableau[3][3]=7;
-	$tableau[3][4]=1;
-	$tableau[3][5]=3;
-	$tableau[3][6]=5;
-	$tableau[3][7]=0;
-	$tableau[3][8]=9;
-	$tableau[3][9]=4;
-	$tableau[3][10]=7;
-
-	$tableau[4][0]=8;
-	$tableau[4][1]=2;
-	$tableau[4][2]=7;
-	$tableau[4][3]=1;
-	$tableau[4][4]=3;
-	$tableau[4][5]=5;
-	$tableau[4][6]=0;
-	$tableau[4][7]=9;
-	$tableau[4][8]=4;
-	$tableau[4][9]=6;
-	$tableau[4][10]=6;
-
-	$tableau[5][0]=2;
-	$tableau[5][1]=7;
-	$tableau[5][2]=1;
-	$tableau[5][3]=3;
-	$tableau[5][4]=5;
-	$tableau[5][5]=0;
-	$tableau[5][6]=9;
-	$tableau[5][7]=4;
-	$tableau[5][8]=6;
-	$tableau[5][9]=8;
-	$tableau[5][10]=5;
-
-	$tableau[6][0]=7;
-	$tableau[6][1]=1;
-	$tableau[6][2]=3;
-	$tableau[6][3]=5;
-	$tableau[6][4]=0;
-	$tableau[6][5]=9;
-	$tableau[6][6]=4;
-	$tableau[6][7]=6;
-	$tableau[6][8]=8;
-	$tableau[6][9]=2;
-	$tableau[6][10]=4;
-
-	$tableau[7][0]=1;
-	$tableau[7][1]=3;
-	$tableau[7][2]=5;
-	$tableau[7][3]=0;
-	$tableau[7][4]=9;
-	$tableau[7][5]=4;
-	$tableau[7][6]=6;
-	$tableau[7][7]=8;
-	$tableau[7][8]=2;
-	$tableau[7][9]=7;
-	$tableau[7][10]=3;
-
-	$tableau[8][0]=3;
-	$tableau[8][1]=5;
-	$tableau[8][2]=0;
-	$tableau[8][3]=9;
-	$tableau[8][4]=4;
-	$tableau[8][5]=6;
-	$tableau[8][6]=8;
-	$tableau[8][7]=2;
-	$tableau[8][8]=7;
-	$tableau[8][9]=1;
-	$tableau[8][10]=2;
-
-	$tableau[9][0]=5;
-	$tableau[9][1]=0;
-	$tableau[9][2]=9;
-	$tableau[9][3]=4;
-	$tableau[9][4]=6;
-	$tableau[9][5]=8;
-	$tableau[9][6]=2;
-	$tableau[9][7]=7;
-	$tableau[9][8]=1;
-	$tableau[9][9]=3;
-	$tableau[9][10]=1;
-
-
-	// Clean data
-	$bv=str_replace(' ','',$bvrb);
-
-	// Make control
-	$report=0;
-	while (dol_strlen($bv)>1)
-	{
-		$match=substr($bv,0,1);
-		$report=$tableau[$report][$match];
-		$bv=substr($bv,1);
-	}
-	$controle=$tableau[$report][10];
-
-	return ($controle==$bv);
+    // Init array for control
+    $tableau[0][0]=0;
+    $tableau[0][1]=9;
+    $tableau[0][2]=4;
+    $tableau[0][3]=6;
+    $tableau[0][4]=8;
+    $tableau[0][5]=2;
+    $tableau[0][6]=7;
+    $tableau[0][7]=1;
+    $tableau[0][8]=3;
+    $tableau[0][9]=5;
+    $tableau[0][10]=0;
+
+    $tableau[1][0]=9;
+    $tableau[1][1]=4;
+    $tableau[1][2]=6;
+    $tableau[1][3]=8;
+    $tableau[1][4]=2;
+    $tableau[1][5]=7;
+    $tableau[1][6]=1;
+    $tableau[1][7]=3;
+    $tableau[1][8]=5;
+    $tableau[1][9]=0;
+    $tableau[1][10]=9;
+
+    $tableau[2][0]=4;
+    $tableau[2][1]=6;
+    $tableau[2][2]=8;
+    $tableau[2][3]=2;
+    $tableau[2][4]=7;
+    $tableau[2][5]=1;
+    $tableau[2][6]=3;
+    $tableau[2][7]=5;
+    $tableau[2][8]=0;
+    $tableau[2][9]=9;
+    $tableau[2][10]=8;
+
+    $tableau[3][0]=6;
+    $tableau[3][1]=8;
+    $tableau[3][2]=2;
+    $tableau[3][3]=7;
+    $tableau[3][4]=1;
+    $tableau[3][5]=3;
+    $tableau[3][6]=5;
+    $tableau[3][7]=0;
+    $tableau[3][8]=9;
+    $tableau[3][9]=4;
+    $tableau[3][10]=7;
+
+    $tableau[4][0]=8;
+    $tableau[4][1]=2;
+    $tableau[4][2]=7;
+    $tableau[4][3]=1;
+    $tableau[4][4]=3;
+    $tableau[4][5]=5;
+    $tableau[4][6]=0;
+    $tableau[4][7]=9;
+    $tableau[4][8]=4;
+    $tableau[4][9]=6;
+    $tableau[4][10]=6;
+
+    $tableau[5][0]=2;
+    $tableau[5][1]=7;
+    $tableau[5][2]=1;
+    $tableau[5][3]=3;
+    $tableau[5][4]=5;
+    $tableau[5][5]=0;
+    $tableau[5][6]=9;
+    $tableau[5][7]=4;
+    $tableau[5][8]=6;
+    $tableau[5][9]=8;
+    $tableau[5][10]=5;
+
+    $tableau[6][0]=7;
+    $tableau[6][1]=1;
+    $tableau[6][2]=3;
+    $tableau[6][3]=5;
+    $tableau[6][4]=0;
+    $tableau[6][5]=9;
+    $tableau[6][6]=4;
+    $tableau[6][7]=6;
+    $tableau[6][8]=8;
+    $tableau[6][9]=2;
+    $tableau[6][10]=4;
+
+    $tableau[7][0]=1;
+    $tableau[7][1]=3;
+    $tableau[7][2]=5;
+    $tableau[7][3]=0;
+    $tableau[7][4]=9;
+    $tableau[7][5]=4;
+    $tableau[7][6]=6;
+    $tableau[7][7]=8;
+    $tableau[7][8]=2;
+    $tableau[7][9]=7;
+    $tableau[7][10]=3;
+
+    $tableau[8][0]=3;
+    $tableau[8][1]=5;
+    $tableau[8][2]=0;
+    $tableau[8][3]=9;
+    $tableau[8][4]=4;
+    $tableau[8][5]=6;
+    $tableau[8][6]=8;
+    $tableau[8][7]=2;
+    $tableau[8][8]=7;
+    $tableau[8][9]=1;
+    $tableau[8][10]=2;
+
+    $tableau[9][0]=5;
+    $tableau[9][1]=0;
+    $tableau[9][2]=9;
+    $tableau[9][3]=4;
+    $tableau[9][4]=6;
+    $tableau[9][5]=8;
+    $tableau[9][6]=2;
+    $tableau[9][7]=7;
+    $tableau[9][8]=1;
+    $tableau[9][9]=3;
+    $tableau[9][10]=1;
+
+
+    // Clean data
+    $bv=str_replace(' ','',$bvrb);
+
+    // Make control
+    $report=0;
+    while (dol_strlen($bv)>1)
+    {
+        $match=substr($bv,0,1);
+        $report=$tableau[$report][$match];
+        $bv=substr($bv,1);
+    }
+    $controle=$tableau[$report][10];
+
+    return ($controle==$bv);
 }

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',

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;
 }

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;
 }
 

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;

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;
 }

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;
 }