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

Fix: broken features

Browse Source
This commit is contained in:
Regis Houssin 2012-09-17 16:16:48 +02:00
parent 7167edb244
commit c42cf7ce78
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/user/index.php
View File

@ -81,9 +81,9 @@ else
if (!empty($socid)) $sql.= " AND u.fk_societe = ".$socid; if (!empty($socid)) $sql.= " AND u.fk_societe = ".$socid;
if ($search_user) 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); $sql.=$db->order($sortfield,$sortorder);
$result = $db->query($sql); $result = $db->query($sql);
@ -130,6 +130,7 @@ if ($result)
$companystatic->canvas=$obj->canvas; $companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1); print $companystatic->getNomUrl(1);
} }
// Multicompany enabled
else if (! empty($conf->multicompany->enabled)) else if (! empty($conf->multicompany->enabled))
{ {
if (! $obj->entity) if (! $obj->entity)
@ -138,9 +139,10 @@ if ($result)
} }
else else
{ {
// FIXME Should add here a hook. Disabled for the moment because $mc is not defined. // $mc is defined in conf.class.php if multicompany enabled.
//$mc->getInfo($obj->entity); // remove constante MAIN_MODULE_MULTICOMPANY if you have an error.
//print $mc->label; $mc->getInfo($obj->entity);
print $mc->label;
} }
} }
else if ($obj->ldap_sid) else if ($obj->ldap_sid)