From a17e797f7e3e20715a759214f2357f187cc9d08d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 21 Aug 2011 10:01:36 +0000 Subject: [PATCH] Fix: avoid warning --- htdocs/admin/const.php | 10 +++++----- htdocs/core/class/html.form.class.php | 14 +++++++------- htdocs/lib/functions.lib.php | 10 +++++----- htdocs/main.inc.php | 4 ++-- htdocs/user/class/user.class.php | 4 ++-- htdocs/user/class/usergroup.class.php | 10 +++++----- htdocs/user/fiche.php | 24 ++++++++++++------------ htdocs/user/group/fiche.php | 20 ++++++++++---------- htdocs/user/group/index.php | 10 +++++----- htdocs/user/home.php | 14 +++++++------- htdocs/user/index.php | 12 ++++++------ 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index bf80fe1b12e..2738f01daf8 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -21,7 +21,7 @@ * \file htdocs/admin/const.php * \ingroup setup * \brief Admin page to define miscellaneous constants - * \version $Id: const.php,v 1.70 2011/07/31 22:23:21 eldy Exp $ + * \version $Id: const.php,v 1.71 2011/08/21 10:01:37 hregis Exp $ */ require("../main.inc.php"); @@ -143,7 +143,7 @@ print ''; print ''.$langs->trans("Name").''; print ''.$langs->trans("Value").''; print ''.$langs->trans("Comment").''; -if ($conf->multicompany->enabled && !$user->entity) print ''.$langs->trans("Entity").''; +if (! empty($conf->multicompany->enabled) && !$user->entity) print ''.$langs->trans("Entity").''; print ''.$langs->trans("Action").''; print "\n"; @@ -165,7 +165,7 @@ print ''; print ''; print ''; // Limit to superadmin -if ($conf->multicompany->enabled && !$user->entity) +if (! empty($conf->multicompany->enabled) && !$user->entity) { print ''; print ''; @@ -231,7 +231,7 @@ if ($result) print ''; // Entity limit to superadmin - if ($conf->multicompany->enabled && !$user->entity) + if (! empty($conf->multicompany->enabled) && !$user->entity) { print ''; print ''; @@ -279,5 +279,5 @@ print "\n"; $db->close(); -llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.70 $'); +llxFooter('$Date: 2011/08/21 10:01:37 $ - $Revision: 1.71 $'); ?> diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 993f879b49b..7246ce1c960 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -31,7 +31,7 @@ * \file htdocs/core/class/html.form.class.php * \ingroup core * \brief File of class with all html predefined components - * \version $Id: html.form.class.php,v 1.203 2011/08/21 00:20:44 hregis Exp $ + * \version $Id: html.form.class.php,v 1.204 2011/08/21 10:01:37 hregis Exp $ */ @@ -799,12 +799,12 @@ class Form // On recherche les utilisateurs $sql = "SELECT u.rowid, u.name, u.firstname, u.login, u.admin, u.entity"; - if($conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= ", e.label"; } $sql.= " FROM ".MAIN_DB_PREFIX ."user as u"; - if($conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."entity as e on e.rowid=u.entity"; if ($force_entity) $sql.= " WHERE u.entity IN (0,".$force_entity.")"; @@ -856,7 +856,7 @@ class Form } $out.= $userstatic->getFullName($langs); - if($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { if ($obj->admin && ! $obj->entity) $out.=" (".$langs->trans("AllEntities").")"; else $out.=" (".$obj->label.")"; @@ -3535,12 +3535,12 @@ class Form // On recherche les groupes $sql = "SELECT ug.rowid, ug.nom "; - if($conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= ", e.label"; } $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as ug "; - if($conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e on e.rowid=ug.entity"; if ($force_entity) $sql.= " WHERE ug.entity IN (0,".$force_entity.")"; @@ -3580,7 +3580,7 @@ class Form $out.= '>'; $out.= $obj->nom; - if($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) { $out.= " (".$obj->label.")"; } diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 6465f5f6962..dc7216dce93 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -28,7 +28,7 @@ * \file htdocs/lib/functions.lib.php * \brief A set of functions for Dolibarr * This file contains all frequently used functions. - * \version $Id: functions.lib.php,v 1.562 2011/08/20 20:53:31 eldy Exp $ + * \version $Id: functions.lib.php,v 1.563 2011/08/21 10:01:37 hregis Exp $ */ // For compatibility during upgrade @@ -2224,7 +2224,7 @@ function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='' $sql = "SELECT dbt.".$dbt_select; $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt"; $sql.= " WHERE dbt.".$dbt_select." = ".$objectid; - if (($feature == 'user' || $feature == 'usergroup') && $conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= " AND dbt.entity IS NOT NULL"; } @@ -2252,7 +2252,7 @@ function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='' $sql.= " AND s.entity IN (0,".(! empty($conf->entities[$dbtablename]) ? $conf->entities[$dbtablename] : $conf->entity).")"; } // If multicompany and internal users with all permissions, check user is in correct entity - else if ($conf->multicompany->enabled) + else if (! empty($conf->multicompany->enabled)) { $sql = "SELECT s.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -2281,7 +2281,7 @@ function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='' $sql.= " AND dbt.entity IN (0,".(! empty($conf->entities[$dbtablename]) ? $conf->entities[$dbtablename] : $conf->entity).")"; } // If multicompany and internal users with all permissions, check user is in correct entity - else if ($conf->multicompany->enabled) + else if (! empty($conf->multicompany->enabled)) { $sql = "SELECT dbt.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt"; @@ -2324,7 +2324,7 @@ function restrictedArea($user, $features='societe', $objectid=0, $dbtablename='' $sql.= " AND sc.fk_user = ".$user->id; } // If multicompany and internal users with all permissions, check user is in correct entity - else if ($conf->multicompany->enabled) + else if (! empty($conf->multicompany->enabled)) { $sql = "SELECT dbt.".$dbt_select; $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt"; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7cb493d775b..720e7e34033 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -25,7 +25,7 @@ * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.767 2011/08/19 15:06:28 cdelambert Exp $ + * \version $Id: main.inc.php,v 1.768 2011/08/21 10:01:38 hregis Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @@ -539,7 +539,7 @@ if (! defined('NOLOGIN')) $_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:''; $_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:''; $_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM; - if ($conf->multicompany->enabled) $_SESSION["dol_entity"]=$conf->entity; + if (! empty($conf->multicompany->enabled)) $_SESSION["dol_entity"]=$conf->entity; dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"].' Session id='.session_id()); $db->begin(); diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index edb47c90851..1987f61acfc 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -25,7 +25,7 @@ /** * \file htdocs/user/class/user.class.php * \brief Fichier de la classe utilisateur - * \version $Id: user.class.php,v 1.52 2011/08/21 00:20:43 hregis Exp $ + * \version $Id: user.class.php,v 1.53 2011/08/21 10:01:37 hregis Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); @@ -146,7 +146,7 @@ class User extends CommonObject $sql.= " u.openid as openid"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; - if($conf->multicompany->enabled && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1) { $sql.= " WHERE u.entity IS NOT NULL"; } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index ee556e991a2..8a81d7c5318 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -21,7 +21,7 @@ * \file htdocs/user/class/usergroup.class.php * \brief Fichier de la classe des groupes d'utilisateur * \author Rodolphe Qiedeville - * \version $Id: usergroup.class.php,v 1.15 2011/08/21 00:20:43 hregis Exp $ + * \version $Id: usergroup.class.php,v 1.16 2011/08/21 10:01:37 hregis Exp $ */ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); @@ -130,7 +130,7 @@ class UserGroup extends CommonObject $sql.= " WHERE ug.fk_usergroup = g.rowid"; $sql.= " AND ug.fk_user = ".$userid; - if($conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= " AND g.entity IS NOT NULL"; } @@ -182,7 +182,7 @@ class UserGroup extends CommonObject $sql.= " WHERE ug.fk_user = u.rowid"; $sql.= " AND ug.fk_usergroup = ".$this->id; - if($conf->multicompany->enabled && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity) { $sql.= " AND u.entity IS NOT NULL"; } @@ -523,7 +523,7 @@ class UserGroup extends CommonObject $now=dol_now(); $entity=$conf->entity; - if($conf->multicompany->enabled && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1) { $entity=$this->entity; } @@ -578,7 +578,7 @@ class UserGroup extends CommonObject $error=0; $entity=$conf->entity; - if($conf->multicompany->enabled && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1) { $entity=$this->entity; } diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 82e0553ecb0..0c97cd7880c 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -24,7 +24,7 @@ /** * \file htdocs/user/fiche.php * \brief Tab of user card - * \version $Id: fiche.php,v 1.280 2011/08/21 00:20:44 hregis Exp $ + * \version $Id: fiche.php,v 1.281 2011/08/21 10:01:37 hregis Exp $ */ require("../main.inc.php"); @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -if ($conf->multicompany->enabled) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); // Define value to know what current user can do on users $canadduser=($user->admin || $user->rights->user->user->creer); @@ -51,7 +51,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) } //Multicompany in mode transversal -if($conf->multicompany->enabled && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) +if(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) { accessforbidden(); } @@ -666,7 +666,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print ''; print $form->selectyesno('admin',$_POST["admin"],1); - if ($conf->multicompany->enabled && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) + if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { if ($conf->use_javascript_ajax) { @@ -704,7 +704,7 @@ if (($action == 'create') || ($action == 'adduserldap')) } //Multicompany - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { @@ -1039,7 +1039,7 @@ else print ''."\n"; // Multicompany - if ($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) + if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { print ''.$langs->trans("Entity").''; if ($fuser->admin && ! $fuser->entity) @@ -1295,7 +1295,7 @@ else print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity); print '   '; // Multicompany - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) { @@ -1325,7 +1325,7 @@ else print ''; print ''; print ''; - if($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { print ''; } @@ -1350,7 +1350,7 @@ else print img_object($langs->trans("ShowGroup"),"group").' '.$group->nom; } print ''; - if($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) + if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { $mc = new ActionsMulticompany($db); $mc->getInfo($group->usergroup_entity); @@ -1507,7 +1507,7 @@ else { print $form->selectyesno('admin',$fuser->admin,1); - if ($conf->multicompany->enabled && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) + if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { if ($conf->use_javascript_ajax) { @@ -1563,7 +1563,7 @@ else } //Multicompany - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { if(empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { @@ -1776,7 +1776,7 @@ else $db->close(); -llxFooter('$Date: 2011/08/21 00:20:44 $ - $Revision: 1.280 $'); +llxFooter('$Date: 2011/08/21 10:01:37 $ - $Revision: 1.281 $'); diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 89bcbe02d05..b4673f69b58 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -21,13 +21,13 @@ /** * \file htdocs/user/group/fiche.php * \brief Onglet groupes utilisateurs - * \version $Id: fiche.php,v 1.76 2011/08/21 00:20:44 hregis Exp $ + * \version $Id: fiche.php,v 1.77 2011/08/21 10:01:37 hregis Exp $ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); -if($conf->multicompany->enabled) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); // Defini si peux lire/modifier utilisateurs et permisssions $canreadperms=($user->admin || $user->rights->user->user->lire); @@ -52,7 +52,7 @@ $userid=GETPOST("user","int"); // Security check $result = restrictedArea($user, 'user', $_GET["id"], 'usergroup', 'user'); -if($conf->multicompany->enabled && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) +if(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) { accessforbidden(); } @@ -220,7 +220,7 @@ if ($action == 'create') print ''; // Multicompany - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { @@ -307,7 +307,7 @@ else print "\n"; // Multicompany - if ($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) + if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { $mc = new ActionsMulticompany($db); $mc->getInfo($object->entity); @@ -376,7 +376,7 @@ else print $form->select_dolusers('','user',1,$exclude,0,'','',$object->entity); print '   '; // Multicompany - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) { @@ -407,7 +407,7 @@ else print ''; print ''; print ''; - if($conf->multicompany->enabled && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1) { print ''; } @@ -431,7 +431,7 @@ else print ''; print ''; print ''; - if($conf->multicompany->enabled && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1) { $mc = new ActionsMulticompany($db); $mc->getInfo($useringroup->usergroup_entity); @@ -474,7 +474,7 @@ else print "\n"; // Multicompany - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) { @@ -518,5 +518,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/21 00:20:44 $ - $Revision: 1.76 $'); +llxFooter('$Date: 2011/08/21 10:01:37 $ - $Revision: 1.77 $'); ?> diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 2e43ed37c7b..72f7aa51729 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -22,7 +22,7 @@ * \file htdocs/user/group/index.php * \ingroup core * \brief Page of user groups - * \version $Id: index.php,v 1.29 2011/08/20 09:03:38 hregis Exp $ + * \version $Id: index.php,v 1.30 2011/08/21 10:01:37 hregis Exp $ */ require("../../main.inc.php"); @@ -59,7 +59,7 @@ print_fiche_titre($langs->trans("ListOfGroups")); $sql = "SELECT g.rowid, g.nom, g.entity, g.datec, COUNT(ugu.rowid) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid"; -if($conf->multicompany->enabled && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) +if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) { $sql.= " WHERE g.entity IS NOT NULL"; } @@ -86,7 +86,7 @@ if ($resql) print ''; print_liste_field_titre($langs->trans("Group"),$_SERVER["PHP_SELF"],"g.nom",$param,"","",$sortfield,$sortorder); //multicompany - if($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) { print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],"g.entity",$param,"",'align="center"',$sortfield,$sortorder); } @@ -107,7 +107,7 @@ if ($resql) } print ""; //multicompany - if($conf->multicompany->enabled && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) + if(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) { dol_include_once("/multicompany/class/actions_multicompany.class.php"); $mc = new ActionsMulticompany($db); @@ -129,6 +129,6 @@ else $db->close(); -llxFooter('$Date: 2011/08/20 09:03:38 $ - $Revision: 1.29 $'); +llxFooter('$Date: 2011/08/21 10:01:37 $ - $Revision: 1.30 $'); ?> diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 474f960a137..e4aa6bca03b 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -19,7 +19,7 @@ /** * \file htdocs/user/home.php * \brief Home page of users and groups management - * \version $Id: home.php,v 1.51 2011/08/20 09:03:38 hregis Exp $ + * \version $Id: home.php,v 1.52 2011/08/21 10:01:37 hregis Exp $ */ require("../main.inc.php"); @@ -100,7 +100,7 @@ $sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.fk_societe, u.d $sql.= " s.nom, s.canvas"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; -if($conf->multicompany->enabled && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) +if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) { $sql.= " WHERE u.entity IS NOT NULL"; } @@ -146,7 +146,7 @@ if ($resql) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } - else if ($conf->multicompany->enabled) + else if (! empty($conf->multicompany->enabled)) { if ($obj->admin && ! $obj->entity) { @@ -197,7 +197,7 @@ if ($canreadperms) $sql = "SELECT g.rowid, g.nom, g.note, g.entity, g.datec"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g"; - if($conf->multicompany->enabled && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) + if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) { $sql.= " WHERE g.entity IS NOT NULL"; } @@ -212,7 +212,7 @@ if ($canreadperms) if ($resql) { $colspan=2; - if ($conf->multicompany->enabled) $colspan++; + if (! empty($conf->multicompany->enabled)) $colspan++; $num = $db->num_rows($resql); print '
'.$langs->trans("Groups").''.$langs->trans("Entity").'
'.$langs->trans("Login").''.$langs->trans("Lastname").''.$langs->trans("Firstname").''.$langs->trans("Entity").''.ucfirst(stripslashes($useringroup->lastname)).''.ucfirst(stripslashes($useringroup->firstname)).'
'; print ''; @@ -231,7 +231,7 @@ if ($canreadperms) print img_picto($langs->trans("GlobalGroup"),'redstar'); } print ""; - if ($conf->multicompany->enabled) + if (! empty($conf->multicompany->enabled)) { $mc = new ActionsMulticompany($db); $mc->getInfo($obj->entity); @@ -259,5 +259,5 @@ print '
'.$langs->trans("LastGroupsCreated",($num ? $num : $max)).'
'; $db->close(); -llxFooter('$Date: 2011/08/20 09:03:38 $ - $Revision: 1.51 $'); +llxFooter('$Date: 2011/08/21 10:01:37 $ - $Revision: 1.52 $'); ?> diff --git a/htdocs/user/index.php b/htdocs/user/index.php index adc733a752f..aee1b3bc505 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -21,11 +21,11 @@ * \file htdocs/user/index.php * \ingroup core * \brief Page of users - * \version $Id: index.php,v 1.54 2011/08/19 22:15:23 hregis Exp $ + * \version $Id: index.php,v 1.55 2011/08/21 10:01:36 hregis Exp $ */ require("../main.inc.php"); -if($conf->multicompany->enabled) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); if (! $user->rights->user->user->lire && ! $user->admin) accessforbidden(); @@ -69,7 +69,7 @@ $sql.= " u.ldap_sid, u.statut, u.entity,"; $sql.= " s.nom, s.canvas"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid"; -if($conf->multicompany->enabled && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) +if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity))) { $sql.= " WHERE u.entity IS NOT NULL"; } @@ -110,7 +110,7 @@ if ($result) print ""; print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''; - if ($conf->multicompany->enabled && $obj->admin && ! $obj->entity) + if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) { print img_picto($langs->trans("SuperAdministrator"),'redstar'); } @@ -129,7 +129,7 @@ if ($result) $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1); } - else if ($conf->multicompany->enabled) + else if (! empty($conf->multicompany->enabled)) { if ($obj->admin && ! $obj->entity) { @@ -174,5 +174,5 @@ else $db->close(); -llxFooter('$Date: 2011/08/19 22:15:23 $ - $Revision: 1.54 $'); +llxFooter('$Date: 2011/08/21 10:01:36 $ - $Revision: 1.55 $'); ?>