From aa9e608e258ca30af25847d1e2eb6b0a175d405d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 May 2010 23:56:12 +0000 Subject: [PATCH] Fix: Can not update user if in mode monouser. Fix: Postgresql compatibility --- htdocs/admin/tools/listsessions.php | 4 ++-- htdocs/lib/admin.lib.php | 6 ++++-- htdocs/user/fiche.php | 9 ++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 8e7b86ed21c..193c2adda28 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -176,7 +176,7 @@ if ($savehandler == 'files') // Login print ''.$sessionentry['login'].''; - + // ID print ''; if ("$key" == session_id()) print $form->textwithpicto($key,$langs->trans("YourSession")); diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index 3f745d415cc..f3269ba40b6 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -297,7 +297,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1) * \brief Effacement d'une constante dans la base de donnees * \sa dolibarr_get_const, dolibarr_sel_const * \param db Handler d'acces base - * \param name Nom ou rowid de la constante + * \param name Name of constant or rowid of line * \param entity Multi company id, -1 for all entities * \return int <0 if KO, >0 if OK */ @@ -306,7 +306,9 @@ function dolibarr_del_const($db, $name, $entity=1) global $conf; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; - $sql.=" WHERE (".$db->decrypt('name')." = '".addslashes($name)."' OR rowid = '".addslashes($name)."')"; + $sql.= " WHERE (".$db->decrypt('name')." = '".addslashes($name)."'"; + if (is_numeric($name)) $sql.= " OR rowid = '".addslashes($name)."'"; + $sql.= ")"; if ($entity >= 0) $sql.= " AND entity = ".$entity; dol_syslog("admin.lib::dolibarr_del_const sql=".$sql); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 81839fc75d1..5da9d3539df 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -1086,7 +1086,14 @@ else if ($caneditfield && (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || (($fuser->entity == $conf->entity) || $fuser->entity == $user->entity)) ) { - print ''.$langs->trans("Modify").''; + if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) + { + print ''.$langs->trans("Modify").''; + } + else + { + print ''.$langs->trans("Modify").''; + } } elseif ($caneditpassword && ! $fuser->ldap_sid && (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || ($fuser->entity == $conf->entity)) )