alxarafe / alixar

dolibarr/htdocs/core/ajax/row.php

Indentation +23 added lines, -23 removed lines

@@ -43,34 +43,34 @@
 
 // Registering the location of boxes
 if ((! empty($_POST['roworder'])) && (! empty($_POST['table_element_line']))
-	&& (! empty($_POST['fk_element'])) && (! empty($_POST['element_id'])))
+    && (! empty($_POST['fk_element'])) && (! empty($_POST['element_id'])))
 {
-	$roworder=GETPOST('roworder','alpha',2);
-	$table_element_line=GETPOST('table_element_line','alpha',2);
-	$fk_element=GETPOST('fk_element','alpha',2);
-	$element_id=GETPOST('element_id','int',2);
+    $roworder=GETPOST('roworder','alpha',2);
+    $table_element_line=GETPOST('table_element_line','alpha',2);
+    $fk_element=GETPOST('fk_element','alpha',2);
+    $element_id=GETPOST('element_id','int',2);
 
-	dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
+    dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
 
-	$rowordertab = explode(',',$roworder);
-	$newrowordertab = array();
-	foreach($rowordertab as $value)
-	{
-		if (! empty($value)) $newrowordertab[] = $value;
-	}
+    $rowordertab = explode(',',$roworder);
+    $newrowordertab = array();
+    foreach($rowordertab as $value)
+    {
+        if (! empty($value)) $newrowordertab[] = $value;
+    }
 
-	$row=new GenericObject($db);
-	$row->table_element_line = $table_element_line;
-	$row->fk_element = $fk_element;
-	$row->id = $element_id;
+    $row=new GenericObject($db);
+    $row->table_element_line = $table_element_line;
+    $row->fk_element = $fk_element;
+    $row->id = $element_id;
 
-	$row->line_ajaxorder($newrowordertab);		// This update field rank or position in table row->table_element_line
+    $row->line_ajaxorder($newrowordertab);		// This update field rank or position in table row->table_element_line
 
-	// Reorder line to have position of children lines sharing same counter than parent lines
-	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
-	{
-		$result=$row->line_order(true);
-	}
+    // Reorder line to have position of children lines sharing same counter than parent lines
+    // This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
+    if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
+    {
+        $result=$row->line_order(true);
+    }
 }
 

Braces +22 added lines, -7 removed lines

@@ -22,12 +22,25 @@ 
  *                   This ajax page is called when doing an up or down drag and drop.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable 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');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disable 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');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -59,7 +72,9 @@ 
 	$newrowordertab = array();
 	foreach($rowordertab as $value)
 	{
-		if (! empty($value)) $newrowordertab[] = $value;
+		if (! empty($value)) {
+		    $newrowordertab[] = $value;
+		}
 	}
 
 	$row=new GenericObject($db);

Spacing +20 added lines, -20 removed lines

@@ -22,17 +22,17 @@ 
  *                   This ajax page is called when doing an up or down drag and drop.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable 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');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disable 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');
 
 
 // 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';
 
 
@@ -45,35 +45,35 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if ((! empty($_POST['roworder'])) && (! empty($_POST['table_element_line']))
-	&& (! empty($_POST['fk_element'])) && (! empty($_POST['element_id'])))
+if ((!empty($_POST['roworder'])) && (!empty($_POST['table_element_line']))
+	&& (!empty($_POST['fk_element'])) && (!empty($_POST['element_id'])))
 {
-	$roworder=GETPOST('roworder','alpha',2);
-	$table_element_line=GETPOST('table_element_line','alpha',2);
-	$fk_element=GETPOST('fk_element','alpha',2);
-	$element_id=GETPOST('element_id','int',2);
+	$roworder = GETPOST('roworder', 'alpha', 2);
+	$table_element_line = GETPOST('table_element_line', 'alpha', 2);
+	$fk_element = GETPOST('fk_element', 'alpha', 2);
+	$element_id = GETPOST('element_id', 'int', 2);
 
 	dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
 
-	$rowordertab = explode(',',$roworder);
+	$rowordertab = explode(',', $roworder);
 	$newrowordertab = array();
-	foreach($rowordertab as $value)
+	foreach ($rowordertab as $value)
 	{
-		if (! empty($value)) $newrowordertab[] = $value;
+		if (!empty($value)) $newrowordertab[] = $value;
 	}
 
-	$row=new GenericObject($db);
+	$row = new GenericObject($db);
 	$row->table_element_line = $table_element_line;
 	$row->fk_element = $fk_element;
 	$row->id = $element_id;
 
-	$row->line_ajaxorder($newrowordertab);		// This update field rank or position in table row->table_element_line
+	$row->line_ajaxorder($newrowordertab); // This update field rank or position in table row->table_element_line
 
 	// Reorder line to have position of children lines sharing same counter than parent lines
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande')))
 	{
-		$result=$row->line_order(true);
+		$result = $row->line_order(true);
 	}
 }
 

dolibarr/htdocs/core/ajax/security.php

Indentation +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@
 // Registering the location of boxes
 if (isset($_GET['action']) && ! empty($_GET['action']))
 {
-	if ($_GET['action'] == 'getrandompassword' && $user->admin)
-	{
+    if ($_GET['action'] == 'getrandompassword' && $user->admin)
+    {
         require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	    $generic = $_GET['generic'] ? true : false;
-		echo getRandomPassword($generic);
-	}
+        $generic = $_GET['generic'] ? true : false;
+        echo getRandomPassword($generic);
+    }
 }
 

Braces +19 added lines, -6 removed lines

@@ -21,12 +21,25 @@
  *                   like key to use into URL to protect them.
  */
 
-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');
+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');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>

Spacing +8 added lines, -8 removed lines

@@ -21,17 +21,17 @@ 
  *                   like key to use into URL to protect them.
  */
 
-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');
+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');
 
 
 // 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';
 
 /*
  * View
@@ -43,7 +43,7 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if (isset($_GET['action']) && ! empty($_GET['action']))
+if (isset($_GET['action']) && !empty($_GET['action']))
 {
 	if ($_GET['action'] == 'getrandompassword' && $user->admin)
 	{

dolibarr/htdocs/core/ajax/selectsearchbox.php

Indentation +24 added lines, -24 removed lines

@@ -35,11 +35,11 @@ 
     $res=@include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
     {
-    	$langs->load("other");
-    	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
-    	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
-    	exit;
+        $langs->load("other");
+        $arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+        print json_encode($arrayresult);
+        if (is_object($db)) $db->close();
+        exit;
     }
 }
 
@@ -56,85 +56,85 @@ 
 
 if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
-	$arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-	$arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-	$arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
-	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 
 // HR
 if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
 {
-	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
 }
 if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-	$arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+    $arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
 }
 
 
@@ -151,7 +151,7 @@ 
 $reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
 if (empty($reshook))
 {
-	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+    $arrayresult=array_merge($arrayresult, $hookmanager->resArray);
 }
 else $arrayresult=$hookmanager->resArray;
 

Spacing +53 added lines, -53 removed lines

@@ -24,19 +24,19 @@ 
 
 // This script is called with a POST method or as an include.
 
-if (! isset($usedbyinclude) || empty($usedbyinclude))
+if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
-    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('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN','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('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
 
-    $res=@include '../../main.inc.php';
+    $res = @include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
     {
     	$langs->load("other");
-    	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
+    	$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
     	print json_encode($arrayresult);
     	if (is_object($db)) $db->close();
     	exit;
@@ -48,93 +48,93 @@ 
 //global $hookmanager;
 $hookmanager->initHooks(array('searchform'));
 
-$search_boxvalue=GETPOST('q', 'none');
+$search_boxvalue = GETPOST('q', 'none');
 
-$arrayresult=array();
+$arrayresult = array();
 
 // Define $searchform
 
-if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
+if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
-	$arrayresult['searchintomember']=array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
+if (((!empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || !empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintothirdparty'] = array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('', 'object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
+if (!empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintocontact'] = array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('', 'object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
+if (((!empty($conf->product->enabled) && $user->rights->produit->lire) || (!empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
+if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
+if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintotasks'] = array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('', 'object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
+if (!empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-	$arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
+if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
+if (!empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-	$arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
-	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
+if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue?'?search_all='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
+if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
+if (!empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
 // HR
-if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
+if (!empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
 {
-	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintouser'] = array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('', 'object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
+if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoexpensereport'] = array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('', 'object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
-if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
+if (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-	$arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue?'&sall='.urlencode($search_boxvalue):''));
+	$arrayresult['searchintoleaves'] = array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('', 'object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
 
@@ -147,25 +147,25 @@ 
 */
 
 // Execute hook addSearchEntry
-$parameters=array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
-$reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
+$parameters = array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
+$reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
 if (empty($reshook))
 {
-	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
 }
-else $arrayresult=$hookmanager->resArray;
+else $arrayresult = $hookmanager->resArray;
 
 // This allow to keep a search entry to the top
-if(! empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
+if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
     $key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-    if(array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -10;
+    if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -10;
 }
 
 // Sort on position
 $arrayresult = dol_sort_array($arrayresult, 'position');
 
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
-if (! isset($usedbyinclude) || empty($usedbyinclude))
+if (!isset($usedbyinclude) || empty($usedbyinclude))
 {
     print json_encode($arrayresult);
     if (is_object($db)) $db->close();

Braces +29 added lines, -11 removed lines

@@ -26,11 +26,22 @@ 
 
 if (! isset($usedbyinclude) || empty($usedbyinclude))
 {
-    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('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN','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('NOREDIRECTBYMAINTOLOGIN')) {
+        define('NOREDIRECTBYMAINTOLOGIN','1');
+    }
 
     $res=@include '../../main.inc.php';
     if ($res == 'ERROR_NOT_LOGGED')
@@ -38,7 +49,9 @@ 
     	$langs->load("other");
     	$arrayresult['jumptologin']=array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
     	print json_encode($arrayresult);
-    	if (is_object($db)) $db->close();
+    	if (is_object($db)) {
+    	    $db->close();
+    	}
     	exit;
     }
 }
@@ -152,14 +165,17 @@ 
 if (empty($reshook))
 {
 	$arrayresult=array_merge($arrayresult, $hookmanager->resArray);
+} else {
+    $arrayresult=$hookmanager->resArray;
 }
-else $arrayresult=$hookmanager->resArray;
 
 // This allow to keep a search entry to the top
 if(! empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
     $key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-    if(array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -10;
-}
+    if(array_key_exists($key, $arrayresult)) {
+        $arrayresult[$key]['position'] = -10;
+    }
+    }
 
 // Sort on position
 $arrayresult = dol_sort_array($arrayresult, 'position');
@@ -168,6 +184,8 @@ 
 if (! isset($usedbyinclude) || empty($usedbyinclude))
 {
     print json_encode($arrayresult);
-    if (is_object($db)) $db->close();
-}
+    if (is_object($db)) {
+        $db->close();
+    }
+    }
 

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
 			{