alxarafe / alixar

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

Spacing +27 added lines, -27 removed lines

@@ -37,42 +37,42 @@ 
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT . '/compta/bank/card.php?id=' . $object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'bankname';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/bankentries_list.php?id=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/bankentries_list.php?id=".$object->id;
     $head[$h][1] = $langs->trans("BankTransactions");
     $head[$h][2] = 'journal';
     $h++;
 
 //    if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
 //	{
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/treso.php?account=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/treso.php?account=".$object->id;
     $head[$h][1] = $langs->trans("PlannedTransactions");
     $head[$h][2] = 'cash';
     $h++;
 //	}
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/annuel.php?account=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/annuel.php?account=".$object->id;
     $head[$h][1] = $langs->trans("IOMonthlyReporting");
     $head[$h][2] = 'annual';
     $h++;
 
-    $head[$h][0] = DOL_URL_ROOT . "/compta/bank/graph.php?account=" . $object->id;
+    $head[$h][0] = DOL_URL_ROOT."/compta/bank/graph.php?account=".$object->id;
     $head[$h][1] = $langs->trans("Graph");
     $head[$h][2] = 'graph';
     $h++;
 
     if ($object->courant != Account::TYPE_CASH)
     {
-    	$nbReceipts=0;
+    	$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;
+    	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+    	$sql .= " WHERE b.fk_account = ".$object->id;
 
     	$resql = $db->query($sql);
     	if ($resql)
@@ -84,7 +84,7 @@ 
 
     	$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>';
+	    if (($nbReceipts) > 0) $head[$h][1] .= ' <span class="badge">'.($nbReceipts).'</span>';
 	    $head[$h][2] = 'statement';
 	    $h++;
 	}
@@ -92,12 +92,12 @@ 
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->bank->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/document.php?account=" . $object->id;
+    $upload_dir = $conf->bank->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/document.php?account=".$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++;
 
@@ -128,12 +128,12 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/admin/bank.php';
+	$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][0] = DOL_URL_ROOT.'/admin/chequereceipts.php';
     $head[$h][1] = $langs->trans("CheckReceiptShort");
     $head[$h][2] = 'checkreceipts';
     $h++;
@@ -178,16 +178,16 @@ 
     // 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,'various_payment');
+    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/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)$'));
-    $nbLinks=Link::count($db, $object->element, $object->id);
+	$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>';
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ' <span class="badge">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -196,7 +196,7 @@ 
 	$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;
 }
@@ -252,12 +252,12 @@ 
     if (empty($account->cle))
         $account->cle = $account->cle_rib;
 
-    dol_syslog("bank.lib::checkBanForAccount account->code_banque=" . $account->code_banque . " account->code_guichet=" . $account->code_guichet . " account->number=" . $account->number . " account->cle=" . $account->cle . " account->iban=" . $account->iban . " country_code=" . $country_code, LOG_DEBUG);
+    dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
 
     if ($country_code == 'FR') { // France rules
         $coef = array(62, 34, 3);
         // Concatenation des differents codes.
-        $rib = strtolower(trim($account->code_banque) . trim($account->code_guichet) . trim($account->number) . trim($account->cle));
+        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet).trim($account->number).trim($account->cle));
         // On remplace les eventuelles lettres par des chiffres.
         //$rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz","12345678912345678912345678");	//Ne marche pas
         $rib = strtr($rib, "abcdefghijklmnopqrstuvwxyz", "12345678912345678923456789");
@@ -282,7 +282,7 @@ 
 
     if ($country_code == 'ES') { // Spanish rules
         $CCC = strtolower(trim($account->number));
-        $rib = strtolower(trim($account->code_banque) . trim($account->code_guichet));
+        $rib = strtolower(trim($account->code_banque).trim($account->code_guichet));
         $cle_rib = strtolower(checkES($rib, $CCC));
         if ($cle_rib == strtolower($account->cle)) {
             return true;
@@ -324,7 +324,7 @@ 
         return $keycontrol;
     }
 
-    $ccc = $IentOfi . $InumCta;
+    $ccc = $IentOfi.$InumCta;
     $numbers = "1234567890";
 
     $i = 0;
@@ -356,7 +356,7 @@ 
     $sum = 0;
 
     for ($i = 0; $i < 11; $i++) {
-        $sum += $values[$i] * (int) substr($InumCta, $i, 1);//int to cast result of substr to a number
+        $sum += $values[$i] * (int) substr($InumCta, $i, 1); //int to cast result of substr to a number
     }
 
     $key = 11 - $sum % 11;

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

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?id=' . $object->id;
+	$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++;
@@ -43,14 +43,14 @@ 
 	// 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][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;
 }
\ No newline at end of file

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

Spacing +127 added lines, -127 removed lines

@@ -32,139 +32,139 @@
 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;
+	$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);
+	$bv = str_replace(' ', '', $bvrb);
 
 	// Make control
-	$report=0;
-	while (dol_strlen($bv)>1)
+	$report = 0;
+	while (dol_strlen($bv) > 1)
 	{
-		$match=substr($bv,0,1);
-		$report=$tableau[$report][$match];
-		$bv=substr($bv,1);
+		$match = substr($bv, 0, 1);
+		$report = $tableau[$report][$match];
+		$bv = substr($bv, 1);
 	}
-	$controle=$tableau[$report][10];
+	$controle = $tableau[$report][10];
 
-	return ($controle==$bv);
+	return ($controle == $bv);
 }

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

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

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

dolibarr/htdocs/core/lib/geturl.lib.php

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

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

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

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

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

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

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