lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2011-09-20 14:14:58 +00:00
parent 551e1f81bf
commit 25cf224f0b
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/comm/contact.php
View File

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

5
htdocs/comm/fiche.php
View File

@ -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 ";

5
htdocs/compta/clients.php
View File

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

7
htdocs/fourn/facture/index.php
View File

@ -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))."%'";

2
htdocs/main.inc.php
View File

@ -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).'"';

2
htdocs/societe/societe.php
View File

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