From c42cf7ce7888450b87c116f232332249680a7e11 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 17 Sep 2012 16:16:48 +0200 Subject: [PATCH] Fix: broken features --- htdocs/user/index.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/user/index.php b/htdocs/user/index.php index b97f8809e9c..9ac5afd50aa 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -81,9 +81,9 @@ else if (!empty($socid)) $sql.= " AND u.fk_societe = ".$socid; if ($search_user) { - $sql.= " AND (u.login like '%".$search_user."%' OR u.name like '%".$search_user."%' OR u.firstname like '%".$search_user."%')"; + $sql.= " AND (u.login LIKE '%".$search_user."%' OR u.name LIKE '%".$search_user."%' OR u.firstname LIKE '%".$search_user."%')"; } -if ($sall) $sql.= " AND (u.login like '%".$db->escape($sall)."%' OR u.name like '%".$db->escape($sall)."%' OR u.firstname like '%".$db->escape($sall)."%' OR u.email like '%".$db->escape($sall)."%' OR u.note like '%".$db->escape($sall)."%')"; +if ($sall) $sql.= " AND (u.login LIKE '%".$db->escape($sall)."%' OR u.name LIKE '%".$db->escape($sall)."%' OR u.firstname LIKE '%".$db->escape($sall)."%' OR u.email LIKE '%".$db->escape($sall)."%' OR u.note LIKE '%".$db->escape($sall)."%')"; $sql.=$db->order($sortfield,$sortorder); $result = $db->query($sql); @@ -130,6 +130,7 @@ if ($result) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } + // Multicompany enabled else if (! empty($conf->multicompany->enabled)) { if (! $obj->entity) @@ -138,9 +139,10 @@ if ($result) } else { - // FIXME Should add here a hook. Disabled for the moment because $mc is not defined. - //$mc->getInfo($obj->entity); - //print $mc->label; + // $mc is defined in conf.class.php if multicompany enabled. + // remove constante MAIN_MODULE_MULTICOMPANY if you have an error. + $mc->getInfo($obj->entity); + print $mc->label; } } else if ($obj->ldap_sid)