alxarafe / alixar

dolibarr/htdocs/core/ajax/fileupload.php

Indentation +3 added lines, -3 removed lines

@@ -51,14 +51,14 @@
 header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
 
 switch ($_SERVER['REQUEST_METHOD']) {
-	case 'OPTIONS':
-		break;
+    case 'OPTIONS':
+        break;
     case 'HEAD':
     case 'GET':
         $upload_handler->get();
         break;
     case 'POST':
-    	if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+        if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
             $upload_handler->delete();
         } else {
             $upload_handler->post();

Braces +14 added lines, -4 removed lines

@@ -21,10 +21,20 @@
  *       \brief      File to return Ajax response on file upload
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
 
 
 

Spacing +8 added lines, -8 removed lines

@@ -21,16 +21,16 @@ 
  *       \brief      File to return Ajax response on file upload
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php';
 
 error_reporting(E_ALL | E_STRICT);
@@ -39,11 +39,11 @@ 
 //print_r($_GET);
 //print 'upload_dir='.GETPOST('upload_dir');
 
-$fk_element = GETPOST('fk_element','int');
-$element = GETPOST('element','alpha');
+$fk_element = GETPOST('fk_element', 'int');
+$element = GETPOST('element', 'alpha');
 
 
-$upload_handler = new FileUpload(null,$fk_element,$element);
+$upload_handler = new FileUpload(null, $fk_element, $element);
 
 header('Pragma: no-cache');
 header('Cache-Control: no-store, no-cache, must-revalidate');

dolibarr/htdocs/core/ajax/bankconciliate.php

Indentation +8 added lines, -8 removed lines

@@ -49,8 +49,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext')
 {
-	// Increase date
-	$al = new AccountLine($db);
+    // Increase date
+    $al = new AccountLine($db);
     $al->datev_next(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -61,8 +61,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
-	// Decrease date
-	$al =new AccountLine($db);
+    // Decrease date
+    $al =new AccountLine($db);
     $al->datev_previous(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -73,8 +73,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext')
 {
-	// Increase date
-	$al = new AccountLine($db);
+    // Increase date
+    $al = new AccountLine($db);
     $al->dateo_next(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 
@@ -85,8 +85,8 @@ 
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
-	// Decrease date
-	$al =new AccountLine($db);
+    // Decrease date
+    $al =new AccountLine($db);
     $al->dateo_previous(GETPOST('rowid','int'));
     $al->fetch(GETPOST('rowid','int'));
 

Braces +16 added lines, -5 removed lines

@@ -20,11 +20,22 @@
  *       \brief      File to set data for bank concilation
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
 

Spacing +21 added lines, -21 removed lines

@@ -20,21 +20,21 @@ 
  *       \brief      File to set data for bank concilation
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -54,10 +54,10 @@ 
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->datev_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+    $al->datev_next(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
     exit;
 }
@@ -65,11 +65,11 @@ 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
 	// Decrease date
-	$al =new AccountLine($db);
-    $al->datev_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al = new AccountLine($db);
+    $al->datev_previous(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
     exit;
 }
@@ -78,10 +78,10 @@ 
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->dateo_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+    $al->dateo_next(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
     exit;
 }
@@ -89,11 +89,11 @@ 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
 	// Decrease date
-	$al =new AccountLine($db);
-    $al->dateo_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al = new AccountLine($db);
+    $al->dateo_previous(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
     exit;
 }

dolibarr/htdocs/core/ajax/price.php

Indentation +16 added lines, -16 removed lines

@@ -42,25 +42,25 @@
 // Load original field value
 if (! empty($output) && isset($amount) && isset($tva_tx))
 {
-	$return=array();
-	$price='';
+    $return=array();
+    $price='';
 
-	if (is_numeric($amount) && $amount != '')
-	{
-		if ($output == 'price_ttc') {
+    if (is_numeric($amount) && $amount != '')
+    {
+        if ($output == 'price_ttc') {
 
-			$price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
-			$return['price_ht'] = $amount;
-			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
-		}
-		else if ($output == 'price_ht') {
+            $price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
+            $return['price_ht'] = $amount;
+            $return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
+        }
+        else if ($output == 'price_ht') {
 
-			$price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
-			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
-			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
-		}
-	}
+            $price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
+            $return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
+            $return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
+        }
+    }
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

Braces +14 added lines, -6 removed lines

@@ -20,10 +20,19 @@ 
  *       \brief      File to get ht and ttc
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -55,8 +64,7 @@ 
 			$price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
-		}
-		else if ($output == 'price_ht') {
+		} else if ($output == 'price_ht') {
 
 			$price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');

Spacing +13 added lines, -13 removed lines

@@ -20,19 +20,19 @@ 
  *       \brief      File to get ht and ttc
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-$output		= GETPOST('output','alpha');
-$amount		= price2num(GETPOST('amount','alpha'));
-$tva_tx		= str_replace('*','',GETPOST('tva_tx','alpha'));
+$output		= GETPOST('output', 'alpha');
+$amount		= price2num(GETPOST('amount', 'alpha'));
+$tva_tx		= str_replace('*', '', GETPOST('tva_tx', 'alpha'));
 
 /*
  * View
@@ -43,22 +43,22 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($output) && isset($amount) && isset($tva_tx))
+if (!empty($output) && isset($amount) && isset($tva_tx))
 {
-	$return=array();
-	$price='';
+	$return = array();
+	$price = '';
 
 	if (is_numeric($amount) && $amount != '')
 	{
 		if ($output == 'price_ttc') {
 
-			$price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
+			$price = price2num($amount * (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
 		}
 		else if ($output == 'price_ht') {
 
-			$price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
+			$price = price2num($amount / (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
 			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
 		}

dolibarr/htdocs/core/ajax/vatrates.php

Indentation +18 added lines, -18 removed lines

@@ -43,28 +43,28 @@
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
-	$form = new Form($db);
-	$soc = new Societe($db);
+    $form = new Form($db);
+    $soc = new Societe($db);
 
-	$soc->fetch($id);
+    $soc->fetch($id);
 
-	if ($action == 'getSellerVATRates')
-	{
-		$seller = $mysoc;
-		$buyer = $soc;
-	}
-	else
-	{
-		$buyer = $mysoc;
-		$seller = $soc;
-	}
+    if ($action == 'getSellerVATRates')
+    {
+        $seller = $mysoc;
+        $buyer = $soc;
+    }
+    else
+    {
+        $buyer = $mysoc;
+        $seller = $soc;
+    }
 
-	$return=array();
+    $return=array();
 
-	$return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
-	$return['num']		= $form->num;
-	$return['error']	= $form->error;
+    $return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
+    $return['num']		= $form->num;
+    $return['error']	= $form->error;
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

Braces +11 added lines, -5 removed lines

@@ -20,9 +20,16 @@ 
  *       \brief      File to load vat rates combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -55,8 +62,7 @@ 
 	{
 		$seller = $mysoc;
 		$buyer = $soc;
-	}
-	else
+	} else
 	{
 		$buyer = $mysoc;
 		$seller = $soc;

Spacing +13 added lines, -13 removed lines

@@ -20,20 +20,20 @@ 
  *       \brief      File to load vat rates combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$htmlname	= GETPOST('htmlname','alpha');
-$selected	= (GETPOST('selected')?GETPOST('selected'):'-1');
-$productid	= (GETPOST('productid','int')?GETPOST('productid','int'):0);
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$htmlname	= GETPOST('htmlname', 'alpha');
+$selected	= (GETPOST('selected') ?GETPOST('selected') : '-1');
+$productid = (GETPOST('productid', 'int') ?GETPOST('productid', 'int') : 0);
 
 /*
  * View
@@ -44,7 +44,7 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($id) && ! empty($action) && ! empty($htmlname))
+if (!empty($id) && !empty($action) && !empty($htmlname))
 {
 	$form = new Form($db);
 	$soc = new Societe($db);
@@ -62,10 +62,10 @@ 
 		$seller = $soc;
 	}
 
-	$return=array();
+	$return = array();
 
-	$return['value']	= $form->load_tva('tva_tx',$selected,$seller,$buyer,$productid,0,'',true);
-	$return['num']		= $form->num;
+	$return['value']	= $form->load_tva('tva_tx', $selected, $seller, $buyer, $productid, 0, '', true);
+	$return['num'] = $form->num;
 	$return['error']	= $form->error;
 
 	echo json_encode($return);

dolibarr/htdocs/core/ajax/contacts.php

Indentation +7 added lines, -7 removed lines

@@ -43,15 +43,15 @@
 // Load original field value
 if (! empty($id) && ! empty($action) && ! empty($htmlname))
 {
-	$form = new Form($db);
+    $form = new Form($db);
 
-	$return=array();
-	if (empty($showempty)) $showempty=0;
+    $return=array();
+    if (empty($showempty)) $showempty=0;
 
-	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
-	$return['num']		= $form->num;
-	$return['error']	= $form->error;
+    $return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
+    $return['num']		= $form->num;
+    $return['error']	= $form->error;
 
-	echo json_encode($return);
+    echo json_encode($return);
 }
 

Braces +13 added lines, -4 removed lines

@@ -21,9 +21,16 @@ 
  *       \brief      File to load contacts combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -49,7 +56,9 @@ 
 	$form = new Form($db);
 
 	$return=array();
-	if (empty($showempty)) $showempty=0;
+	if (empty($showempty)) {
+	    $showempty=0;
+	}
 
 	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
 	$return['num']		= $form->num;

Spacing +13 added lines, -13 removed lines

@@ -21,19 +21,19 @@ 
  *       \brief      File to load contacts combobox
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$htmlname	= GETPOST('htmlname','alpha');
-$showempty	= GETPOST('showempty','int');
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$htmlname = GETPOST('htmlname', 'alpha');
+$showempty = GETPOST('showempty', 'int');
 
 /*
  * View
@@ -44,15 +44,15 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($id) && ! empty($action) && ! empty($htmlname))
+if (!empty($id) && !empty($action) && !empty($htmlname))
 {
 	$form = new Form($db);
 
-	$return=array();
-	if (empty($showempty)) $showempty=0;
+	$return = array();
+	if (empty($showempty)) $showempty = 0;
 
-	$return['value']	= $form->selectcontacts($id,'',$htmlname,$showempty,'','',0,'',true);
-	$return['num']		= $form->num;
+	$return['value']	= $form->selectcontacts($id, '', $htmlname, $showempty, '', '', 0, '', true);
+	$return['num'] = $form->num;
 	$return['error']	= $form->error;
 
 	echo json_encode($return);

dolibarr/htdocs/core/ajax/saveinplace.php

Indentation +164 added lines, -164 removed lines

@@ -58,175 +58,175 @@
 // Load original field value
 if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
 {
-	$ext_element		= GETPOST('ext_element','alpha',2);
-	$field				= substr($field, 8); // remove prefix val_
-	$type				= GETPOST('type','alpha',2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
-	$loadmethod			= GETPOST('loadmethod','alpha',2);
-	$savemethod			= GETPOST('savemethod','alpha',2);
-	$savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
-	$newelement			= $element;
-
-	$view='';
-	$format='text';
-	$return=array();
-	$error=0;
-
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
-	{
-		$element = $regs[1];
-		$subelement = $regs[2];
-	}
-
-	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $newelement = 'adherent';
-	else if ($element == 'order_supplier') {
-		$newelement = 'fournisseur';
-		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
-		$newelement = 'fournisseur';
-		$subelement = 'facture';
-	}
-	else $newelement = $element;
-
-	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
-	$feature = $newelement;
-	$feature2 = $subelement;
-	$object_id = $fk_element;
-	if ($feature == 'expedition' || $feature == 'shipping')
-	{
-		$feature = 'commande';
-		$object_id = 0;
-	}
-	if ($feature == 'shipping') $feature = 'commande';
-	if ($feature == 'payment') { $feature = 'facture'; }
-	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
-	//var_dump(GETPOST('action','aZ09'));
-	//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
-	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
-	//var_dump($user->rights);
-	/*
+    $ext_element		= GETPOST('ext_element','alpha',2);
+    $field				= substr($field, 8); // remove prefix val_
+    $type				= GETPOST('type','alpha',2);
+    $value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
+    $loadmethod			= GETPOST('loadmethod','alpha',2);
+    $savemethod			= GETPOST('savemethod','alpha',2);
+    $savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
+    $newelement			= $element;
+
+    $view='';
+    $format='text';
+    $return=array();
+    $error=0;
+
+    if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+    {
+        $element = $regs[1];
+        $subelement = $regs[2];
+    }
+
+    if ($element == 'propal') $newelement = 'propale';
+    else if ($element == 'fichinter') $newelement = 'ficheinter';
+    else if ($element == 'product') $newelement = 'produit';
+    else if ($element == 'member') $newelement = 'adherent';
+    else if ($element == 'order_supplier') {
+        $newelement = 'fournisseur';
+        $subelement = 'commande';
+    }
+    else if ($element == 'invoice_supplier') {
+        $newelement = 'fournisseur';
+        $subelement = 'facture';
+    }
+    else $newelement = $element;
+
+    $_POST['action']='update';	// Hack so restrictarea will test permissions on write too
+    $feature = $newelement;
+    $feature2 = $subelement;
+    $object_id = $fk_element;
+    if ($feature == 'expedition' || $feature == 'shipping')
+    {
+        $feature = 'commande';
+        $object_id = 0;
+    }
+    if ($feature == 'shipping') $feature = 'commande';
+    if ($feature == 'payment') { $feature = 'facture'; }
+    if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
+    //var_dump(GETPOST('action','aZ09'));
+    //var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
+    $check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
+    //var_dump($user->rights);
+    /*
 	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write)
 		|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
 		|| ($element == 'payment' && $user->rights->facture->paiement)
 		|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	*/
 
-	if ($check_access)
-	{
-		// Clean parameters
-		$newvalue = trim($value);
-
-		if ($type == 'numeric')
-		{
-			$newvalue = price2num($newvalue);
-
-			// Check parameters
-			if (! is_numeric($newvalue))
-			{
-				$error++;
-				$return['error'] = $langs->trans('ErrorBadValue');
-			}
-		}
-		else if ($type == 'datepicker')
-		{
-			$timestamp	= GETPOST('timestamp','int',2);
-			$format		= 'date';
-			$newvalue	= ($timestamp / 1000);
-		}
-		else if ($type == 'select')
-		{
-			$loadmethodname	= 'load_cache_'.$loadmethod;
-			$loadcachename	= 'cache_'.$loadmethod;
-			$loadviewname	= 'view_'.$loadmethod;
-
-			$form = new Form($db);
-			if (method_exists($form, $loadmethodname))
-			{
-				$ret = $form->$loadmethodname();
-				if ($ret > 0)
-				{
-					$loadcache = $form->$loadcachename;
-					$value = $loadcache[$newvalue];
-
-					if (! empty($form->$loadviewname))
-					{
-						$loadview = $form->$loadviewname;
-						$view = $loadview[$newvalue];
-					}
-				}
-				else
-				{
-					$error++;
-					$return['error'] = $form->error;
-				}
-			}
-			else
-			{
-				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
-				{
-					$module = $regs[1];
-					$subelement = $regs[2];
-				}
-
-				dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
-				$classname = 'Actions'.ucfirst($subelement);
-				$object = new $classname($db);
-				$ret = $object->$loadmethodname();
-				if ($ret > 0)
-				{
-					$loadcache = $object->$loadcachename;
-					$value = $loadcache[$newvalue];
-
-					if (! empty($object->$loadviewname))
-					{
-						$loadview = $object->$loadviewname;
-						$view = $loadview[$newvalue];
-					}
-				}
-				else
-				{
-					$error++;
-					$return['error'] = $object->error;
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
-
-			// Specific for add_object_linked()
-			// TODO add a function for variable treatment
-			$object->ext_fk_element = $newvalue;
-			$object->ext_element = $ext_element;
-			$object->fk_element = $fk_element;
-			$object->element = $element;
-
-			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
-			if ($ret > 0)
-			{
-				if ($type == 'numeric') $value = price($newvalue);
-				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
-
-				$return['value'] = $value;
-				$return['view'] = (! empty($view) ? $view : $value);
-			}
-			else
-			{
-				$return['error'] = $object->error;
-			}
-		}
-
-		echo json_encode($return);
-	}
-	else
-	{
-		echo $langs->trans('NotEnoughPermissions');
-	}
+    if ($check_access)
+    {
+        // Clean parameters
+        $newvalue = trim($value);
+
+        if ($type == 'numeric')
+        {
+            $newvalue = price2num($newvalue);
+
+            // Check parameters
+            if (! is_numeric($newvalue))
+            {
+                $error++;
+                $return['error'] = $langs->trans('ErrorBadValue');
+            }
+        }
+        else if ($type == 'datepicker')
+        {
+            $timestamp	= GETPOST('timestamp','int',2);
+            $format		= 'date';
+            $newvalue	= ($timestamp / 1000);
+        }
+        else if ($type == 'select')
+        {
+            $loadmethodname	= 'load_cache_'.$loadmethod;
+            $loadcachename	= 'cache_'.$loadmethod;
+            $loadviewname	= 'view_'.$loadmethod;
+
+            $form = new Form($db);
+            if (method_exists($form, $loadmethodname))
+            {
+                $ret = $form->$loadmethodname();
+                if ($ret > 0)
+                {
+                    $loadcache = $form->$loadcachename;
+                    $value = $loadcache[$newvalue];
+
+                    if (! empty($form->$loadviewname))
+                    {
+                        $loadview = $form->$loadviewname;
+                        $view = $loadview[$newvalue];
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $return['error'] = $form->error;
+                }
+            }
+            else
+            {
+                $module = $subelement = $ext_element;
+                if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+                {
+                    $module = $regs[1];
+                    $subelement = $regs[2];
+                }
+
+                dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
+                $classname = 'Actions'.ucfirst($subelement);
+                $object = new $classname($db);
+                $ret = $object->$loadmethodname();
+                if ($ret > 0)
+                {
+                    $loadcache = $object->$loadcachename;
+                    $value = $loadcache[$newvalue];
+
+                    if (! empty($object->$loadviewname))
+                    {
+                        $loadview = $object->$loadviewname;
+                        $view = $loadview[$newvalue];
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $return['error'] = $object->error;
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+
+            // Specific for add_object_linked()
+            // TODO add a function for variable treatment
+            $object->ext_fk_element = $newvalue;
+            $object->ext_element = $ext_element;
+            $object->fk_element = $fk_element;
+            $object->element = $element;
+
+            $ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
+            if ($ret > 0)
+            {
+                if ($type == 'numeric') $value = price($newvalue);
+                else if ($type == 'textarea') $value = dol_nl2br($newvalue);
+
+                $return['value'] = $value;
+                $return['view'] = (! empty($view) ? $view : $value);
+            }
+            else
+            {
+                $return['error'] = $object->error;
+            }
+        }
+
+        echo json_encode($return);
+    }
+    else
+    {
+        echo $langs->trans('NotEnoughPermissions');
+    }
 }
 

Braces +43 added lines, -30 removed lines

@@ -20,10 +20,19 @@ 
  *       \brief      File to save field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -81,19 +90,23 @@ 
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $newelement = 'adherent';
-	else if ($element == 'order_supplier') {
+	if ($element == 'propal') {
+	    $newelement = 'propale';
+	} else if ($element == 'fichinter') {
+	    $newelement = 'ficheinter';
+	} else if ($element == 'product') {
+	    $newelement = 'produit';
+	} else if ($element == 'member') {
+	    $newelement = 'adherent';
+	} else if ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
+	} else if ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
+	} else {
+	    $newelement = $element;
 	}
-	else $newelement = $element;
 
 	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
@@ -104,7 +117,9 @@ 
 		$feature = 'commande';
 		$object_id = 0;
 	}
-	if ($feature == 'shipping') $feature = 'commande';
+	if ($feature == 'shipping') {
+	    $feature = 'commande';
+	}
 	if ($feature == 'payment') { $feature = 'facture'; }
 	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
 	//var_dump(GETPOST('action','aZ09'));
@@ -133,14 +148,12 @@ 
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		}
-		else if ($type == 'datepicker')
+		} else if ($type == 'datepicker')
 		{
 			$timestamp	= GETPOST('timestamp','int',2);
 			$format		= 'date';
 			$newvalue	= ($timestamp / 1000);
-		}
-		else if ($type == 'select')
+		} else if ($type == 'select')
 		{
 			$loadmethodname	= 'load_cache_'.$loadmethod;
 			$loadcachename	= 'cache_'.$loadmethod;
@@ -160,14 +173,12 @@ 
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$return['error'] = $form->error;
 				}
-			}
-			else
+			} else
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
@@ -190,8 +201,7 @@ 
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$return['error'] = $object->error;
@@ -201,7 +211,9 @@ 
 
 		if (! $error)
 		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+			if ((isset($object) && ! is_object($object)) || empty($savemethod)) {
+			    $object = new GenericObject($db);
+			}
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -213,21 +225,22 @@ 
 			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
-				if ($type == 'numeric') $value = price($newvalue);
-				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
+				if ($type == 'numeric') {
+				    $value = price($newvalue);
+				} else if ($type == 'textarea') {
+				    $value = dol_nl2br($newvalue);
+				}
 
 				$return['value'] = $value;
 				$return['view'] = (! empty($view) ? $view : $value);
-			}
-			else
+			} else
 			{
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
-	}
-	else
+	} else
 	{
 		echo $langs->trans('NotEnoughPermissions');
 	}

Spacing +36 added lines, -36 removed lines

@@ -20,21 +20,21 @@ 
  *       \brief      File to save field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
-$field			= GETPOST('field','alpha',2);
-$element		= GETPOST('element','alpha',2);
-$table_element	= GETPOST('table_element','alpha',2);
-$fk_element		= GETPOST('fk_element','alpha',2);
+$field = GETPOST('field', 'alpha', 2);
+$element = GETPOST('element', 'alpha', 2);
+$table_element = GETPOST('table_element', 'alpha', 2);
+$fk_element = GETPOST('fk_element', 'alpha', 2);
 
 /* Example:
 field:editval_ref_customer (8 first chars will removed to know name of property)
@@ -59,23 +59,23 @@ 
 //print_r($_POST);
 
 // Load original field value
-if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
-	$ext_element		= GETPOST('ext_element','alpha',2);
+	$ext_element = GETPOST('ext_element', 'alpha', 2);
 	$field				= substr($field, 8); // remove prefix val_
-	$type				= GETPOST('type','alpha',2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
-	$loadmethod			= GETPOST('loadmethod','alpha',2);
-	$savemethod			= GETPOST('savemethod','alpha',2);
-	$savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
+	$type = GETPOST('type', 'alpha', 2);
+	$value				= ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
+	$loadmethod			= GETPOST('loadmethod', 'alpha', 2);
+	$savemethod			= GETPOST('savemethod', 'alpha', 2);
+	$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
 	$newelement			= $element;
 
-	$view='';
-	$format='text';
-	$return=array();
-	$error=0;
+	$view = '';
+	$format = 'text';
+	$return = array();
+	$error = 0;
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 	{
 		$element = $regs[1];
 		$subelement = $regs[2];
@@ -95,7 +95,7 @@ 
 	}
 	else $newelement = $element;
 
-	$_POST['action']='update';	// Hack so restrictarea will test permissions on write too
+	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
 	$feature2 = $subelement;
 	$object_id = $fk_element;
@@ -128,7 +128,7 @@ 
 			$newvalue = price2num($newvalue);
 
 			// Check parameters
-			if (! is_numeric($newvalue))
+			if (!is_numeric($newvalue))
 			{
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
@@ -136,15 +136,15 @@ 
 		}
 		else if ($type == 'datepicker')
 		{
-			$timestamp	= GETPOST('timestamp','int',2);
-			$format		= 'date';
-			$newvalue	= ($timestamp / 1000);
+			$timestamp = GETPOST('timestamp', 'int', 2);
+			$format = 'date';
+			$newvalue = ($timestamp / 1000);
 		}
 		else if ($type == 'select')
 		{
-			$loadmethodname	= 'load_cache_'.$loadmethod;
-			$loadcachename	= 'cache_'.$loadmethod;
-			$loadviewname	= 'view_'.$loadmethod;
+			$loadmethodname = 'load_cache_'.$loadmethod;
+			$loadcachename = 'cache_'.$loadmethod;
+			$loadviewname = 'view_'.$loadmethod;
 
 			$form = new Form($db);
 			if (method_exists($form, $loadmethodname))
@@ -155,7 +155,7 @@ 
 					$loadcache = $form->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (! empty($form->$loadviewname))
+					if (!empty($form->$loadviewname))
 					{
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
@@ -170,7 +170,7 @@ 
 			else
 			{
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
 					$module = $regs[1];
 					$subelement = $regs[2];
@@ -185,7 +185,7 @@ 
 					$loadcache = $object->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (! empty($object->$loadviewname))
+					if (!empty($object->$loadviewname))
 					{
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
@@ -199,9 +199,9 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+			if ((isset($object) && !is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -210,14 +210,14 @@ 
 			$object->fk_element = $fk_element;
 			$object->element = $element;
 
-			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
+			$ret = $object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
 				if ($type == 'numeric') $value = price($newvalue);
 				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
 
 				$return['value'] = $value;
-				$return['view'] = (! empty($view) ? $view : $value);
+				$return['view'] = (!empty($view) ? $view : $value);
 			}
 			else
 			{

dolibarr/htdocs/core/ajax/extraparams.php

Indentation +22 added lines, -22 removed lines

@@ -43,35 +43,35 @@
 
 if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
 {
-	$value = GETPOST('value','alpha');
-	$params=array();
+    $value = GETPOST('value','alpha');
+    $params=array();
 
-	dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
+    dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
 
-	$classpath = $subelement = $element;
+    $classpath = $subelement = $element;
 
-	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+    // For compatibility
+    if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
+    else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
+    else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
+    else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
+    else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
+    else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
+    else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
+    else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
-	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
+    dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+    if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
+    else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
+    else $classname = ucfirst($subelement);
 
-	$object	= new $classname($db);
-	$object->fetch($id);
+    $object	= new $classname($db);
+    $object->fetch($id);
 
-	$params[$htmlelement] = array($type => $value);
-	$object->extraparams = array_merge($object->extraparams, $params);
+    $params[$htmlelement] = array($type => $value);
+    $object->extraparams = array_merge($object->extraparams, $params);
 
-	$result=$object->setExtraParameters();
+    $result=$object->setExtraParameters();
 }
 

Spacing +23 added lines, -23 removed lines

@@ -20,17 +20,17 @@ 
  *	\brief      File to return Ajax response on set extra parameters of elements
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 include '../../main.inc.php';
 
-$id = GETPOST('id','int');
-$element = GETPOST('element','alpha');
-$htmlelement = GETPOST('htmlelement','alpha');
+$id = GETPOST('id', 'int');
+$element = GETPOST('element', 'alpha');
+$htmlelement = GETPOST('htmlelement', 'alpha');
 $type = GETPOST('type', 'alpha');
 
 /*
@@ -41,37 +41,37 @@ 
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
+if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
 {
-	$value = GETPOST('value','alpha');
-	$params=array();
+	$value = GETPOST('value', 'alpha');
+	$params = array();
 
 	dol_syslog("AjaxSetExtraParameters id=".$id." element=".$element." htmlelement=".$htmlelement." type=".$type." value=".$value, LOG_DEBUG);
 
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; }
+	else if ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; }
+	else if ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; }
+	else if ($element == 'contract') { $classpath = $subelement = 'contrat'; }
+	else if ($element == 'shipping') { $classpath = $subelement = 'expedition'; }
+	else if ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
+	else if ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
+	else if ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
+	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; }
+	else if ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; }
 	else $classname = ucfirst($subelement);
 
-	$object	= new $classname($db);
+	$object = new $classname($db);
 	$object->fetch($id);
 
 	$params[$htmlelement] = array($type => $value);
 	$object->extraparams = array_merge($object->extraparams, $params);
 
-	$result=$object->setExtraParameters();
+	$result = $object->setExtraParameters();
 }
 

Braces +20 added lines, -16 removed lines

@@ -20,11 +20,22 @@ 
  *	\brief      File to return Ajax response on set extra parameters of elements
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 include '../../main.inc.php';
 
@@ -51,20 +62,13 @@ 
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; } else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; } else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; } else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; } else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; } else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; } else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; } else {
+	    $classname = ucfirst($subelement);
+	}
 
 	$object	= new $classname($db);
 	$object->fetch($id);

dolibarr/htdocs/core/ajax/box.php

Indentation +16 added lines, -16 removed lines

@@ -53,28 +53,28 @@
 // Add a box
 if ($boxid > 0 && $zone !='' && $userid > 0)
 {
-	$tmp=explode('-',$boxorder);
-	$nbboxonleft=substr_count($tmp[0],',');
-	$nbboxonright=substr_count($tmp[1],',');
-	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
+    $tmp=explode('-',$boxorder);
+    $nbboxonleft=substr_count($tmp[0],',');
+    $nbboxonright=substr_count($tmp[1],',');
+    print $nbboxonleft.'-'.$nbboxonright;
+    if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
     else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
 if ($boxorder && $zone != '' &&  $userid > 0)
 {
-	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
-	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
+    // boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
+    dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
-	if ($result > 0)
-	{
-	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
-	    {
-	       setEventMessages($langs->trans("BoxAdded"), null);
-	    }
-	}
+    $result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+    if ($result > 0)
+    {
+        $langs->load("boxes");
+        if (! GETPOST('closing'))
+        {
+            setEventMessages($langs->trans("BoxAdded"), null);
+        }
+    }
 }
 

Braces +24 added lines, -7 removed lines

@@ -21,11 +21,22 @@ 
  *       \brief      File to return Ajax response on Box move or close
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -60,8 +71,14 @@ 
 	$nbboxonleft=substr_count($tmp[0],',');
 	$nbboxonright=substr_count($tmp[1],',');
 	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
-    else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
+	if ($nbboxonleft > $nbboxonright) {
+	    $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);
+	}
+	// Insert id of new box into list
+    else {
+        $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);
+    }
+    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move

Spacing +20 added lines, -20 removed lines

@@ -21,23 +21,23 @@ 
  *       \brief      File to return Ajax response on Box move or close
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-$boxid=GETPOST('boxid','int');
-$boxorder=GETPOST('boxorder');
-$userid=GETPOST('userid');
-$zone=GETPOST('zone','int');
-$userid=GETPOST('userid','int');
+$boxid = GETPOST('boxid', 'int');
+$boxorder = GETPOST('boxorder');
+$userid = GETPOST('userid');
+$zone = GETPOST('zone', 'int');
+$userid = GETPOST('userid', 'int');
 
 
 /*
@@ -54,27 +54,27 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Add a box
-if ($boxid > 0 && $zone !='' && $userid > 0)
+if ($boxid > 0 && $zone != '' && $userid > 0)
 {
-	$tmp=explode('-',$boxorder);
-	$nbboxonleft=substr_count($tmp[0],',');
-	$nbboxonright=substr_count($tmp[1],',');
+	$tmp = explode('-', $boxorder);
+	$nbboxonleft = substr_count($tmp[0], ',');
+	$nbboxonright = substr_count($tmp[1], ',');
 	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
-    else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
+	if ($nbboxonleft > $nbboxonright) $boxorder = preg_replace('/B:/', 'B:'.$boxid.',', $boxorder); // Insert id of new box into list
+    else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
-if ($boxorder && $zone != '' &&  $userid > 0)
+if ($boxorder && $zone != '' && $userid > 0)
 {
 	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
 	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
 	if ($result > 0)
 	{
 	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
+	    if (!GETPOST('closing'))
 	    {
 	       setEventMessages($langs->trans("BoxAdded"), null);
 	    }

dolibarr/htdocs/core/menus/standard/eldy_menu.php

Indentation +211 added lines, -211 removed lines

@@ -27,14 +27,14 @@ 
  */
 class MenuManager
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $type_user;									// Put 0 for internal users, 1 for external users
-	var $atarget="";                                // To store default target to use onto links
-	var $name="eldy";
+    var $type_user;									// Put 0 for internal users, 1 for external users
+    var $atarget="";                                // To store default target to use onto links
+    var $name="eldy";
 
     var $menu_array;
     var $menu_array_after;
@@ -45,12 +45,12 @@ 
     /**
      *  Constructor
      *
-	 *  @param	DoliDB		$db     	Database handler
+     *  @param	DoliDB		$db     	Database handler
      *  @param	int			$type_user	Type of user
      */
     function __construct($db, $type_user)
     {
-    	$this->type_user=$type_user;
+        $this->type_user=$type_user;
         $this->db=$db;
     }
 
@@ -58,49 +58,49 @@ 
     /**
      * Load this->tabMenu
      *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
+     * @param	string	$forcemainmenu		To force mainmenu to load
+     * @param	string	$forceleftmenu		To force leftmenu to load
      * @return	void
      */
     function loadMenu($forcemainmenu='',$forceleftmenu='')
     {
-		// On sauve en session le menu principal choisi
-		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+        // On sauve en session le menu principal choisi
+        if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
+        if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
 
-		// Read mainmenu and leftmenu that define which menu to show
+        // Read mainmenu and leftmenu that define which menu to show
         if (isset($_GET["mainmenu"]))
         {
-        	// On sauve en session le menu principal choisi
-        	$mainmenu=$_GET["mainmenu"];
-        	$_SESSION["mainmenu"]=$mainmenu;
-        	$_SESSION["leftmenuopened"]="";
+            // On sauve en session le menu principal choisi
+            $mainmenu=$_GET["mainmenu"];
+            $_SESSION["mainmenu"]=$mainmenu;
+            $_SESSION["leftmenuopened"]="";
         }
         else
-       {
-        	// On va le chercher en session si non defini par le lien
-        	$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
+        {
+            // On va le chercher en session si non defini par le lien
+            $mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
         }
         if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
 
         if (isset($_GET["leftmenu"]))
         {
-        	// On sauve en session le menu principal choisi
-        	$leftmenu=$_GET["leftmenu"];
-        	$_SESSION["leftmenu"]=$leftmenu;
-
-        	if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
-        	{
-        		//$leftmenu="";
-        		$_SESSION["leftmenuopened"]="";
-        	}
-        	else
-        	{
-        		$_SESSION["leftmenuopened"]=$leftmenu;
-        	}
+            // On sauve en session le menu principal choisi
+            $leftmenu=$_GET["leftmenu"];
+            $_SESSION["leftmenu"]=$leftmenu;
+
+            if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+            {
+                //$leftmenu="";
+                $_SESSION["leftmenuopened"]="";
+            }
+            else
+            {
+                $_SESSION["leftmenuopened"]=$leftmenu;
+            }
         } else {
-        	// On va le chercher en session si non defini par le lien
-        	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+            // On va le chercher en session si non defini par le lien
+            $leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
         }
         if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
 
@@ -125,38 +125,38 @@ 
      */
     function showmenu($mode, $moredata=null)
     {
-    	global $conf, $langs, $user;
+        global $conf, $langs, $user;
 
-    	//var_dump($this->tabMenu);
+        //var_dump($this->tabMenu);
 
         require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
         if ($this->type_user == 1)
         {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
-        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+            $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
+            $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
         }
 
-		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
         $this->menu=new Menu();
 
         if (empty($conf->global->MAIN_MENU_INVERT))
         {
-        	if ($mode == 'top')  print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
-        	if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
+            if ($mode == 'top')  print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+            if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
         }
         else
-		{
-        	$conf->global->MAIN_SHOW_LOGO=0;
-        	if ($mode == 'top')  print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
-        	if ($mode == 'left') print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
-		}
-
-		if ($mode == 'topnb')
-		{
-		    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
-		    return $this->menu->getNbOfVisibleMenuEntries();
-		}
+        {
+            $conf->global->MAIN_SHOW_LOGO=0;
+            if ($mode == 'top')  print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
+            if ($mode == 'left') print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        }
+
+        if ($mode == 'topnb')
+        {
+            print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
+            return $this->menu->getNbOfVisibleMenuEntries();
+        }
 
         if ($mode == 'jmobile')     // Used to get menu in xml ul/li
         {
@@ -165,170 +165,170 @@ 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
             $lastlevel = array();
-        	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
-
-        		if ($val['enabled'] == 1)
-        		{
-        			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-        			$substitarray['__USERID__'] = $user->id;	// For backward compatibility
-        			$val['url'] = make_substitutions($val['url'], $substitarray);
-
-					$relurl=dol_buildpath($val['url'],1);
-					$canonurl=preg_replace('/\?.*$/','',$val['url']);
-
-        			print '<a class="alilevel0" href="#">';
-
-					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
-
-					print $val['titre'];
-        			print '</a>'."\n";
-
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu=$val['mainmenu'];
-        			$tmpleftmenu='all';
-        			$submenu=new Menu();
-	        		print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
-	        		// Note: $submenu contains menu entry with substitution not yet done
-        		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+            print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
+            foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+            {
+                print '<ul class="ulmenu" data-inset="true">';
+                print '<li class="lilevel0">';
+
+                if ($val['enabled'] == 1)
+                {
+                    $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+                    $substitarray['__USERID__'] = $user->id;	// For backward compatibility
+                    $val['url'] = make_substitutions($val['url'], $substitarray);
+
+                    $relurl=dol_buildpath($val['url'],1);
+                    $canonurl=preg_replace('/\?.*$/','',$val['url']);
+
+                    print '<a class="alilevel0" href="#">';
+
+                    // Add font-awesome
+                    if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+
+                    print $val['titre'];
+                    print '</a>'."\n";
+
+                    // Search submenu fot this mainmenu entry
+                    $tmpmainmenu=$val['mainmenu'];
+                    $tmpleftmenu='all';
+                    $submenu=new Menu();
+                    print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+                    // Note: $submenu contains menu entry with substitution not yet done
+                    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-	        		$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-
-        			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-        			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
-					{
-        				// We add sub entry
-        				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
-        				print '<a href="'.$relurl.'">';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-        				{
-        					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				}
-        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-        				print '</a>';
-        				print '</li>'."\n";
-        			}
-
-        			if ($val['level']==0)
-        			{
-        			    if ($val['enabled'])
-        			    {
-        			        $lastlevel[0]='enabled';
-        			    }
-        			    else if ($showmenu)                 // Not enabled but visible (so greyed)
-        			    {
-        			        $lastlevel[0]='greyed';
-        			    }
-        			    else
-        			    {
-        			        $lastlevel[0]='hidden';
-        			    }
-        			}
-
-        			$lastlevel2 = array();
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-       				{
-						$showmenu=true;
-						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
-
-						// If at least one parent is not enabled, we do not show any menu of all children
-						if ($val2['level'] > 0)
-						{
-						    $levelcursor = $val2['level']-1;
-						    while ($levelcursor >= 0)
-						    {
+                    $nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
+                    $canonrelurl=preg_replace('/\?.*$/','',$relurl);
+                    $canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+                    //var_dump($canonrelurl);
+                    //var_dump($canonnexturl);
+                    print '<ul>'."\n";
+                    if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
+                        || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+                    {
+                        // We add sub entry
+                        print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+                        print '<a href="'.$relurl.'">';
+                        if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+                        {
+                            if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
+                            else print $langs->trans("Dashboard");
+                        }
+                        else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+                        print '</a>';
+                        print '</li>'."\n";
+                    }
+
+                    if ($val['level']==0)
+                    {
+                        if ($val['enabled'])
+                        {
+                            $lastlevel[0]='enabled';
+                        }
+                        else if ($showmenu)                 // Not enabled but visible (so greyed)
+                        {
+                            $lastlevel[0]='greyed';
+                        }
+                        else
+                        {
+                            $lastlevel[0]='hidden';
+                        }
+                    }
+
+                    $lastlevel2 = array();
+                        foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+                        {
+                        $showmenu=true;
+                        if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+
+                        // If at least one parent is not enabled, we do not show any menu of all children
+                        if ($val2['level'] > 0)
+                        {
+                            $levelcursor = $val2['level']-1;
+                            while ($levelcursor >= 0)
+                            {
                                 if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
                                 $levelcursor--;
-						    }
-						}
-
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-       					{
-       						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-       						$substitarray['__USERID__'] = $user->id;	// For backward compatibility
-       						$val2['url'] = make_substitutions($val2['url'], $substitarray);		// Make also substitution of __(XXX)__ and __[XXX]__
-
-       						if (! preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-       						{
-       							$relurl2=dol_buildpath($val2['url'],1);
-       						}
-       						else
-       						{
-       							$relurl2=$val2['url'];
-       						}
-	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
-	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
-
-	        				$disabled='';
-	        				if (! $val2['enabled'])
-	        				{
-	        				    $disabled=" vsmenudisabled";
-	        				}
-
-	        				print str_pad('',$val2['level']+1);
-	        				print '<li class="lilevel'.($val2['level']+1);
-	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
-	        				print $disabled.'">';	 // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']]='enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']]='greyed';
-	        					}
-	        				}
-	        				else
-	        				{
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']]='enabled';
-	        				    }
-	        				    else
-	        				    {
-	        				        $lastlevel2[$val2['level']]='greyed';
-	        				    }
-	        				}
+                            }
+                        }
+
+                            if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+                            {
+                                $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+                                $substitarray['__USERID__'] = $user->id;	// For backward compatibility
+                                $val2['url'] = make_substitutions($val2['url'], $substitarray);		// Make also substitution of __(XXX)__ and __[XXX]__
+
+                                if (! preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
+                                {
+                                    $relurl2=dol_buildpath($val2['url'],1);
+                                }
+                                else
+                                {
+                                    $relurl2=$val2['url'];
+                                }
+                            $canonurl2=preg_replace('/\?.*$/','',$val2['url']);
+                            //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+                            if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+
+                            $disabled='';
+                            if (! $val2['enabled'])
+                            {
+                                $disabled=" vsmenudisabled";
+                            }
+
+                            print str_pad('',$val2['level']+1);
+                            print '<li class="lilevel'.($val2['level']+1);
+                            if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+                            print $disabled.'">';	 // ui-btn to highlight on clic
+                            if ($relurl2)
+                            {
+                                if ($val2['enabled'])	// Allowed
+                                {
+                                    print '<a href="'.$relurl2.'"';
+                                    //print ' data-ajax="false"';
+                                    print '>';
+                                    $lastlevel2[$val2['level']]='enabled';
+                                }
+                                else					// Not allowed but visible (greyed)
+                                {
+                                    print '<a href="#" class="vsmenudisabled">';
+                                    $lastlevel2[$val2['level']]='greyed';
+                                }
+                            }
+                            else
+                            {
+                                if ($val2['enabled'])	// Allowed
+                                {
+                                    $lastlevel2[$val2['level']]='enabled';
+                                }
+                                else
+                                {
+                                    $lastlevel2[$val2['level']]='greyed';
+                                }
+                            }
                             //var_dump($val2['level']);
-	        				//var_dump($lastlevel2);
+                            //var_dump($lastlevel2);
                             print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else
-	        						print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-       				}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
+                            if ($relurl2)
+                            {
+                                if ($val2['enabled'])	// Allowed
+                                    print '</a>';
+                                else
+                                    print '</a>';
+                            }
+                            print '</li>'."\n";
+                            }
+                        }
+                    //var_dump($submenu);
+                    print '</ul>';
+                }
+                if ($val['enabled'] == 2)
+                {
+                    print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+                }
+                print '</li>';
+                print '</ul>'."\n";
+            }
         }
 
         unset($this->menu);

Spacing +75 added lines, -75 removed lines

@@ -32,9 +32,9 @@ 
      */
     public $db;
 
-	var $type_user;									// Put 0 for internal users, 1 for external users
-	var $atarget="";                                // To store default target to use onto links
-	var $name="eldy";
+	var $type_user; // Put 0 for internal users, 1 for external users
+	var $atarget = ""; // To store default target to use onto links
+	var $name = "eldy";
 
     var $menu_array;
     var $menu_array_after;
@@ -50,8 +50,8 @@ 
      */
     function __construct($db, $type_user)
     {
-    	$this->type_user=$type_user;
-        $this->db=$db;
+    	$this->type_user = $type_user;
+        $this->db = $db;
     }
 
 
@@ -62,53 +62,53 @@ 
    	 * @param	string	$forceleftmenu		To force leftmenu to load
      * @return	void
      */
-    function loadMenu($forcemainmenu='',$forceleftmenu='')
+    function loadMenu($forcemainmenu = '', $forceleftmenu = '')
     {
 		// On sauve en session le menu principal choisi
-		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];
+		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"] = $_GET["idmenu"];
 
 		// Read mainmenu and leftmenu that define which menu to show
         if (isset($_GET["mainmenu"]))
         {
         	// On sauve en session le menu principal choisi
-        	$mainmenu=$_GET["mainmenu"];
-        	$_SESSION["mainmenu"]=$mainmenu;
-        	$_SESSION["leftmenuopened"]="";
+        	$mainmenu = $_GET["mainmenu"];
+        	$_SESSION["mainmenu"] = $mainmenu;
+        	$_SESSION["leftmenuopened"] = "";
         }
         else
        {
         	// On va le chercher en session si non defini par le lien
-        	$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
+        	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
         }
-        if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+        if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
 
         if (isset($_GET["leftmenu"]))
         {
         	// On sauve en session le menu principal choisi
-        	$leftmenu=$_GET["leftmenu"];
-        	$_SESSION["leftmenu"]=$leftmenu;
+        	$leftmenu = $_GET["leftmenu"];
+        	$_SESSION["leftmenu"] = $leftmenu;
 
-        	if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+        	if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
         	{
         		//$leftmenu="";
-        		$_SESSION["leftmenuopened"]="";
+        		$_SESSION["leftmenuopened"] = "";
         	}
         	else
         	{
-        		$_SESSION["leftmenuopened"]=$leftmenu;
+        		$_SESSION["leftmenuopened"] = $leftmenu;
         	}
         } else {
         	// On va le chercher en session si non defini par le lien
-        	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+        	$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
         }
-        if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+        if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
 
         require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-        $tabMenu=array();
-        $menuArbo = new Menubase($this->db,'eldy');
+        $tabMenu = array();
+        $menuArbo = new Menubase($this->db, 'eldy');
         $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
-        $this->tabMenu=$tabMenu;
+        $this->tabMenu = $tabMenu;
         //var_dump($tabMenu);
 
         //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
@@ -123,7 +123,7 @@ 
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
      */
-    function showmenu($mode, $moredata=null)
+    function showmenu($mode, $moredata = null)
     {
     	global $conf, $langs, $user;
 
@@ -133,40 +133,40 @@ 
 
         if ($this->type_user == 1)
         {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
-        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
         }
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu=new Menu();
+        $this->menu = new Menu();
 
         if (empty($conf->global->MAIN_MENU_INVERT))
         {
-        	if ($mode == 'top')  print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
-        	if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
+        	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+        	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
         }
         else
 		{
-        	$conf->global->MAIN_SHOW_LOGO=0;
-        	if ($mode == 'top')  print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
-        	if ($mode == 'left') print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	$conf->global->MAIN_SHOW_LOGO = 0;
+        	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+        	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
 		}
 
 		if ($mode == 'topnb')
 		{
-		    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
+		    print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
         if ($mode == 'jmobile')     // Used to get menu in xml ul/li
         {
-            print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
+            print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
             $lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+        	foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
         		print '<ul class="ulmenu" data-inset="true">';
         		print '<li class="lilevel0">';
@@ -174,11 +174,11 @@ 
         		if ($val['enabled'] == 1)
         		{
         			$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-        			$substitarray['__USERID__'] = $user->id;	// For backward compatibility
+        			$substitarray['__USERID__'] = $user->id; // For backward compatibility
         			$val['url'] = make_substitutions($val['url'], $substitarray);
 
-					$relurl=dol_buildpath($val['url'],1);
-					$canonurl=preg_replace('/\?.*$/','',$val['url']);
+					$relurl = dol_buildpath($val['url'], 1);
+					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
         			print '<a class="alilevel0" href="#">';
 
@@ -189,25 +189,25 @@ 
         			print '</a>'."\n";
 
         			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu=$val['mainmenu'];
-        			$tmpleftmenu='all';
-        			$submenu=new Menu();
-	        		print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+        			$tmpmainmenu = $val['mainmenu'];
+        			$tmpleftmenu = 'all';
+        			$submenu = new Menu();
+	        		print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
 	        		// Note: $submenu contains menu entry with substitution not yet done
         		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-	        		$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+	        		$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-        			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-        			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 					{
         				// We add sub entry
-        				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+        				print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
         				print '<a href="'.$relurl.'">';
         				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
         				{
@@ -219,35 +219,35 @@ 
         				print '</li>'."\n";
         			}
 
-        			if ($val['level']==0)
+        			if ($val['level'] == 0)
         			{
         			    if ($val['enabled'])
         			    {
-        			        $lastlevel[0]='enabled';
+        			        $lastlevel[0] = 'enabled';
         			    }
         			    else if ($showmenu)                 // Not enabled but visible (so greyed)
         			    {
-        			        $lastlevel[0]='greyed';
+        			        $lastlevel[0] = 'greyed';
         			    }
         			    else
         			    {
-        			        $lastlevel[0]='hidden';
+        			        $lastlevel[0] = 'hidden';
         			    }
         			}
 
         			$lastlevel2 = array();
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+       				foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
-						$showmenu=true;
-						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+						$showmenu = true;
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
 
 						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
 						{
-						    $levelcursor = $val2['level']-1;
+						    $levelcursor = $val2['level'] - 1;
 						    while ($levelcursor >= 0)
 						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
                                 $levelcursor--;
 						    }
 						}
@@ -255,31 +255,31 @@ 
        					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
        					{
        						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-       						$substitarray['__USERID__'] = $user->id;	// For backward compatibility
-       						$val2['url'] = make_substitutions($val2['url'], $substitarray);		// Make also substitution of __(XXX)__ and __[XXX]__
+       						$substitarray['__USERID__'] = $user->id; // For backward compatibility
+       						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-       						if (! preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
+       						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
-       							$relurl2=dol_buildpath($val2['url'],1);
+       							$relurl2 = dol_buildpath($val2['url'], 1);
        						}
        						else
        						{
-       							$relurl2=$val2['url'];
+       							$relurl2 = $val2['url'];
        						}
-	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
+	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+	        				if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
 
-	        				$disabled='';
-	        				if (! $val2['enabled'])
+	        				$disabled = '';
+	        				if (!$val2['enabled'])
 	        				{
-	        				    $disabled=" vsmenudisabled";
+	        				    $disabled = " vsmenudisabled";
 	        				}
 
-	        				print str_pad('',$val2['level']+1);
-	        				print '<li class="lilevel'.($val2['level']+1);
-	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
-	        				print $disabled.'">';	 // ui-btn to highlight on clic
+	        				print str_pad('', $val2['level'] + 1);
+	        				print '<li class="lilevel'.($val2['level'] + 1);
+	        				if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+	        				print $disabled.'">'; // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -287,23 +287,23 @@ 
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
-		        					$lastlevel2[$val2['level']]='enabled';
+		        					$lastlevel2[$val2['level']] = 'enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']]='greyed';
+				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
 	        				}
 	        				else
 	        				{
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
-	        				        $lastlevel2[$val2['level']]='enabled';
+	        				        $lastlevel2[$val2['level']] = 'enabled';
 	        				    }
 	        				    else
 	        				    {
-	        				        $lastlevel2[$val2['level']]='greyed';
+	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
                             //var_dump($val2['level']);

Braces +83 added lines, -42 removed lines

@@ -65,8 +65,12 @@ 
     function loadMenu($forcemainmenu='',$forceleftmenu='')
     {
 		// On sauve en session le menu principal choisi
-		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+		if (isset($_GET["mainmenu"])) {
+		    $_SESSION["mainmenu"]=$_GET["mainmenu"];
+		}
+		if (isset($_GET["idmenu"])) {
+		    $_SESSION["idmenu"]=$_GET["idmenu"];
+		}
 
 		// Read mainmenu and leftmenu that define which menu to show
         if (isset($_GET["mainmenu"]))
@@ -75,13 +79,14 @@ 
         	$mainmenu=$_GET["mainmenu"];
         	$_SESSION["mainmenu"]=$mainmenu;
         	$_SESSION["leftmenuopened"]="";
-        }
-        else
+        } else
        {
         	// On va le chercher en session si non defini par le lien
         	$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
         }
-        if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+        if (! empty($forcemainmenu)) {
+            $mainmenu=$forcemainmenu;
+        }
 
         if (isset($_GET["leftmenu"]))
         {
@@ -89,12 +94,13 @@ 
         	$leftmenu=$_GET["leftmenu"];
         	$_SESSION["leftmenu"]=$leftmenu;
 
-        	if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+        	if ($_SESSION["leftmenuopened"]==$leftmenu) {
+        	    // To collapse
         	{
         		//$leftmenu="";
         		$_SESSION["leftmenuopened"]="";
         	}
-        	else
+        	} else
         	{
         		$_SESSION["leftmenuopened"]=$leftmenu;
         	}
@@ -102,7 +108,9 @@ 
         	// On va le chercher en session si non defini par le lien
         	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
         }
-        if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+        if (! empty($forceleftmenu)) {
+            $leftmenu=$forceleftmenu;
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
         $tabMenu=array();
@@ -142,14 +150,21 @@ 
 
         if (empty($conf->global->MAIN_MENU_INVERT))
         {
-        	if ($mode == 'top')  print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
-        	if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
-        }
-        else
+        	if ($mode == 'top') {
+        	    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	}
+        	if ($mode == 'left') {
+        	    print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
+        	}
+        } else
 		{
         	$conf->global->MAIN_SHOW_LOGO=0;
-        	if ($mode == 'top')  print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
-        	if ($mode == 'left') print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	if ($mode == 'top') {
+        	    print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
+        	}
+        	if ($mode == 'left') {
+        	    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	}
 		}
 
 		if ($mode == 'topnb')
@@ -158,17 +173,22 @@ 
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+        if ($mode == 'jmobile') {
+            // Used to get menu in xml ul/li
         {
-            print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
+            print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
+        }
+        // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
             $lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+        	foreach($this->menu->liste as $key => $val) {
+        	    // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
         		print '<ul class="ulmenu" data-inset="true">';
+        	}
         		print '<li class="lilevel0">';
 
         		if ($val['enabled'] == 1)
@@ -183,7 +203,9 @@ 
         			print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+					    print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
 					print $val['titre'];
         			print '</a>'."\n";
@@ -209,12 +231,16 @@ 
         				// We add sub entry
         				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
         				print '<a href="'.$relurl.'">';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {
+        				    // No translation
         				{
         					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
+        				} else {
+        				        print $langs->trans("Dashboard");
+        				    }
+        				} else {
+        				    print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				}
-        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
@@ -224,22 +250,26 @@ 
         			    if ($val['enabled'])
         			    {
         			        $lastlevel[0]='enabled';
-        			    }
-        			    else if ($showmenu)                 // Not enabled but visible (so greyed)
+        			    } else if ($showmenu) {
+        			        // Not enabled but visible (so greyed)
         			    {
         			        $lastlevel[0]='greyed';
         			    }
-        			    else
+        			    } else
         			    {
         			        $lastlevel[0]='hidden';
         			    }
         			}
 
         			$lastlevel2 = array();
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+       				foreach($submenu->liste as $key2 => $val2) {
+       				    // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
 						$showmenu=true;
-						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+       				}
+						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+						    $showmenu=false;
+						}
 
 						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
@@ -247,28 +277,33 @@ 
 						    $levelcursor = $val2['level']-1;
 						    while ($levelcursor >= 0)
 						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                if ($lastlevel2[$levelcursor] != 'enabled') {
+                                    $showmenu=false;
+                                }
                                 $levelcursor--;
 						    }
 						}
 
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+       					if ($showmenu) {
+       					    // Visible (option to hide when not allowed is off or allowed)
        					{
        						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+       					}
        						$substitarray['__USERID__'] = $user->id;	// For backward compatibility
        						$val2['url'] = make_substitutions($val2['url'], $substitarray);		// Make also substitution of __(XXX)__ and __[XXX]__
 
        						if (! preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2=dol_buildpath($val2['url'],1);
-       						}
-       						else
+       						} else
        						{
        							$relurl2=$val2['url'];
        						}
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) {
+	        				    $relurl2='';
+	        				}
 
 	        				$disabled='';
 	        				if (! $val2['enabled'])
@@ -278,30 +313,34 @@ 
 
 	        				print str_pad('',$val2['level']+1);
 	        				print '<li class="lilevel'.($val2['level']+1);
-	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				if ($val2['level']==0) {
+	        				    print ' ui-btn-icon-right ui-btn';
+	        				}
+	        				// ui-btn to highlight on clic
 	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
-	        					if ($val2['enabled'])	// Allowed
+	        					if ($val2['enabled']) {
+	        					    // Allowed
 	        					{
 	        						print '<a href="'.$relurl2.'"';
+	        					}
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']]='enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
-	        				}
-	        				else
+	        				} else
 	        				{
-	        				    if ($val2['enabled'])	// Allowed
+	        				    if ($val2['enabled']) {
+	        				        // Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']]='enabled';
 	        				    }
-	        				    else
+	        				    } else
 	        				    {
 	        				        $lastlevel2[$val2['level']]='greyed';
 	        				    }
@@ -311,10 +350,12 @@ 
                             print $val2['titre'];
 	        				if ($relurl2)
 	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else
+	        					if ($val2['enabled']) {
+	        					    // Allowed
 	        						print '</a>';
+	        					} else {
+	        						        						print '</a>';
+	        					}
 	        				}
 	        				print '</li>'."\n";
        					}