From 25cf224f0b22c450e0cedea21098c49ff159c5df Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 20 Sep 2011 14:14:58 +0000
Subject: [PATCH] Fix: uniformize code
---
htdocs/comm/contact.php | 9 +++++----
htdocs/comm/fiche.php | 5 ++++-
htdocs/compta/clients.php | 5 ++++-
htdocs/fourn/facture/index.php | 7 +++++--
htdocs/main.inc.php | 2 +-
htdocs/societe/societe.php | 2 +-
6 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 098067793cd..b50770dc5fe 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -1,7 +1,8 @@
<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003 Eric Seigne <erics@rycks.com>
- * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2003 Eric Seigne <erics@rycks.com>
+ * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -112,7 +113,7 @@ if (trim($_GET["search_societe"]))
if ($_GET["contactname"]) // acces a partir du module de recherche
{
- $sql.= " AND ( p.name like '%".strtolower($_GET[contactname])."%' OR lower(p.firstname) like '%".strtolower($_GET[contactname])."%') ";
+ $sql.= " AND ( p.name like '%".strtolower($_GET["contactname"])."%' OR lower(p.firstname) like '%".strtolower($_GET["contactname"])."%') ";
$sortfield = "p.name";
$sortorder = "ASC";
}
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 4c0049d8cb0..67396ee432e 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -53,6 +53,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id > 0) $socid=$user->societe_id;
$result = restrictedArea($user,'societe',$socid,'');
+$mode=GETPOST("mode");
+$modesearch=GETPOST("mode_search");
+
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -138,7 +141,7 @@ $form = new Form($db);
if ($mode == 'search')
{
- if ($mode-search == 'soc')
+ if ($modesearch == 'soc')
{
$sql = "SELECT s.rowid";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index da534537bed..dcb76232589 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -42,6 +42,9 @@ accessforbidden();
$langs->load("companies");
+$mode=GETPOST("mode");
+$modesearch=GETPOST("mode_search");
+
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -75,7 +78,7 @@ if ($action == 'note')
}
if ($mode == 'search') {
- if ($mode-search == 'soc') {
+ if ($modesearch == 'soc') {
$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
$sql.= " WHERE lower(s.nom) like '%".$db->escape(strtolower($socname))."%'";
$sql.= " AND s.entity = ".$conf->entity;
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 73b7bbb0b41..74403679d83 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -44,6 +44,9 @@ if ($user->societe_id > 0)
$socid = $user->societe_id;
}
+$mode=GETPOST("mode");
+$modesearch=GETPOST("mode_search");
+
$page=$_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
@@ -64,9 +67,9 @@ $year =$_GET['year'];
* Actions
*/
-if ($_POST["mode"] == 'search')
+if ($mode == 'search')
{
- if ($_POST["mode-search"] == 'soc')
+ if ($modesearch == 'soc')
{
$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
$sql.= " WHERE s.nom like '%".$db->escape(strtolower($socname))."%'";
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a8fb10c3f5b..1d9c15f5e17 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1587,7 +1587,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$
$ret.='<form action="'.$urlaction.'" method="post">';
$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$ret.='<input type="hidden" name="mode" value="search">';
- $ret.='<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">';
+ $ret.='<input type="hidden" name="mode_search" value="'.$htmlmodesearch.'">';
$ret.='<input type="text" class="flat" ';
if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index 17cb1021f7c..589e26003fe 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -48,7 +48,7 @@ $search_idprof4=trim(GETPOST('search_idprof4'));
$search_sale=trim(GETPOST("search_sale"));
$search_categ=trim(GETPOST("search_categ"));
$mode=GETPOST("mode");
-$modesearch=GETPOST("mode-search");
+$modesearch=GETPOST("mode_search");
$sortfield=GETPOST("sortfield");
$sortorder=GETPOST("sortorder");
--
GitLab