Fix: Si on modifie des droits, on les recharge de suite

htdocs/comm/mailing/cibles.php

@@ -231,7 +231,17 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
                         print $modulename;
                         print "</td>";
                         */
-                        print '<td align="center">'.($obj->getNbOfRecipients()).'</td>';
+                        $nbofrecipient=$obj->getNbOfRecipients();
+                        print '<td align="center">';
+                        if ($nbofrecipient >= 0)
+                        {
+                        	print $nbofrecipient;
+                        }
+                        else
+                        {
+                        	print $langs->trans("Error").' '.img_error($obj->error);
+                        }
+                        print '</td>';
 
                         print '<td align="center">';
                         $filter=$obj->formFilter();

htdocs/includes/modules/mailings/modules_mailings.php

@@ -81,6 +81,7 @@ class MailingTargets
         }
         else
         {
+        	$this->error=$this->db->error();
             return -1;
         }
     }

htdocs/lib/ldap.lib.php

@@ -59,7 +59,7 @@ function ldap_prepare_head()
 		$h++;
 	}
 	
-	if ($conf->global->LDAP_CONTACT_ACTIVE)
+	if ($conf->societe->enabled && $conf->global->LDAP_CONTACT_ACTIVE)
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
 		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
@@ -67,7 +67,7 @@ function ldap_prepare_head()
 		$h++;
 	}
 	
-	if ($conf->global->LDAP_MEMBER_ACTIVE)
+	if ($conf->adherent->enabled && $conf->global->LDAP_MEMBER_ACTIVE)
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
 		$head[$h][1] = $langs->trans("LDAPMembersSynchro");

htdocs/user.class.php

@@ -277,18 +277,20 @@ class User
             if ($perms)    $whereforadd.=" OR (module='$module' AND perms='lire' AND subperms IS NULL)";
         }
         else {
+            // On a pas demandé un droit en particulier mais une liste de droits
+            // sur la base d'un nom de module de de perms
             // Where pour la liste des droits à ajouter
             if ($allmodule) $whereforadd="module='$allmodule'";
             if ($allperms)  $whereforadd=" AND perms='$allperms'";
         }
 
-        // Ajout des droits de la liste whereforadd
+        // Ajout des droits trouvés grace au critere whereforadd
         if ($whereforadd)
         {
             //print "$module-$perms-$subperms";
             $sql = "SELECT id";
             $sql.= " FROM ".MAIN_DB_PREFIX."rights_def";
-            $sql.= " WHERE $whereforadd";
+            $sql.= " WHERE ".$whereforadd;
 
             $result=$this->db->query($sql);
             if ($result)
@@ -369,12 +371,13 @@ class User
             if ($perms=='lire')    $wherefordel.=" OR (module='$module')";
         }
         else {
+            // On a demandé suppression d'un droit sur la base d'un nom de module ou perms
             // Where pour la liste des droits à supprimer
             if ($allmodule) $wherefordel="module='$allmodule'";
             if ($allperms)  $wherefordel=" AND perms='$allperms'";
         }
 
-        // Suppression des droits de la liste wherefordel
+        // Suppression des droits selon critere defini dans wherefordel
         if ($wherefordel)
         {
             //print "$module-$perms-$subperms";
@@ -416,10 +419,21 @@ class User
 
     }
 
-  /**
+
-   *    \brief      Charge dans l'objet user, la liste des permissions auxquelles l'utilisateur a droit
+	/**
-   *    \param      module    nom du module dont il faut récupérer les droits ('' par defaut signifie tous les droits)
+	*    \brief      Vide la tableau des droits de l'utilisateur
-   */
+	*/
+	function clearrights()
+    {
+		$this->rights='';
+		$this->all_permissions_are_loaded=false;
+	}
+
+
+	/**
+	*    \brief      Charge dans l'objet user, la liste des permissions auxquelles l'utilisateur a droit
+	*    \param      module    nom du module dont il faut récupérer les droits ('' par defaut signifie tous les droits)
+	*/
 	function getrights($module='')
     {
         if ($this->all_permissions_are_loaded)
@@ -435,6 +449,7 @@ class User
         $sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as r";
         $sql .= " WHERE r.id = ur.fk_id AND ur.fk_user= ".$this->id." AND r.perms IS NOT NULL";
 
+		dolibarr_syslog('User.class::getrights this->id='.$this->id.' module='.$module);
         $result = $this->db->query($sql);
         if ($result)
         {

htdocs/user/perms.php

@@ -33,11 +33,13 @@ require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 
 $langs->load("users");
 
-
 $form = new Form($db);
 
 $module=isset($_GET["module"])?$_GET["module"]:$_POST["module"];
 
+if (! isset($_GET["id"])) access_forbidden();
+
+
 // Defini si peux modifier utilisateurs et permisssions
 $caneditperms=($user->admin || $user->rights->user->user->creer);
 
@@ -50,16 +52,31 @@ if ($_GET["action"] == 'addrights' && $caneditperms)
 {
     $edituser = new User($db,$_GET["id"]);
     $edituser->addrights($_GET["rights"],$module);
+
+	// Si on a touché à ces propres droits, on recharge
+	if ($_GET["id"] == $user->id)
+	{
+		$user->clearrights();
+		$user->getrights();
+	}
 }
 
 if ($_GET["action"] == 'delrights' && $caneditperms)
 {
     $edituser = new User($db,$_GET["id"]);
     $edituser->delrights($_GET["rights"],$module);
+
+	// Si on a touché à ces propres droits, on recharge
+	if ($_GET["id"] == $user->id)
+	{
+		$user->clearrights();
+		$user->getrights();
+	}
 }
 
 
 
+
 llxHeader('',$langs->trans("Permissions"));
 
 
@@ -69,220 +86,217 @@ llxHeader('',$langs->trans("Permissions"));
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($_GET["id"])
+$fuser = new User($db, $_GET["id"]);
+$fuser->fetch();
+$fuser->getrights();
+
+/*
+ * Affichage onglets
+ */
+$head = user_prepare_head($fuser);
+
+dolibarr_fiche_head($head, 'rights', $langs->trans("User").": ".$fuser->fullname);
+
+
+$db->begin();
+
+// Charge les modules soumis a permissions
+$dir = DOL_DOCUMENT_ROOT . "/includes/modules/";
+$handle=opendir($dir);
+$modules = array();
+while (($file = readdir($handle))!==false)
 {
-    $fuser = new User($db, $_GET["id"]);
+    if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, strlen($file) - 10) == '.class.php')
-    $fuser->fetch();
-    $fuser->getrights();
-
-	/*
-	 * Affichage onglets
-	 */
-	$head = user_prepare_head($fuser);
-
-	dolibarr_fiche_head($head, 'rights', $langs->trans("User").": ".$fuser->fullname);
-
-
-    $db->begin();
-
-    // Charge les modules soumis a permissions
-    $dir = DOL_DOCUMENT_ROOT . "/includes/modules/";
-    $handle=opendir($dir);
-    $modules = array();
-    while (($file = readdir($handle))!==false)
     {
-        if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, strlen($file) - 10) == '.class.php')
+        $modName = substr($file, 0, strlen($file) - 10);
+
+        if ($modName)
         {
-            $modName = substr($file, 0, strlen($file) - 10);
+            include_once("../includes/modules/$file");
-    
+            $objMod = new $modName($db);
-            if ($modName)
+            if ($objMod->rights_class) {
-            {
-                include_once("../includes/modules/$file");
-                $objMod = new $modName($db);
-                if ($objMod->rights_class) {
 
-                    $ret=$objMod->insert_permissions();
+                $ret=$objMod->insert_permissions();
 
-                    $modules[$objMod->rights_class]=$objMod;
+                $modules[$objMod->rights_class]=$objMod;
-                    //print "modules[".$objMod->rights_class."]=$objMod;";
+                //print "modules[".$objMod->rights_class."]=$objMod;";
-                }
             }
         }
     }
-
-    $db->commit();
-    
-    // Lecture des droits utilisateurs
-    $permsuser = array();
-
-    $sql  = "SELECT r.id, r.libelle, r.module";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-    $sql .= " ".MAIN_DB_PREFIX."user_rights as ur";
-    $sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id;
-
-    $result=$db->query($sql);
-    if ($result)
-    {
-        $num = $db->num_rows($result);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
-            array_push($permsuser,$obj->id);
-            $i++;
-        }
-        $db->free($result);
-    }
-    else
-    {
-        dolibarr_print_error($db);
-    }
-
-    // Lecture des droits groupes
-    $permsgroup = array();
-
-    $sql  = "SELECT r.id, r.libelle, r.module";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-    $sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
-    $sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu";
-    $sql .= " WHERE gr.fk_id = r.id AND gr.fk_usergroup = gu.fk_usergroup AND gu.fk_user = ".$fuser->id;
-
-    $result=$db->query($sql);
-    if ($result)
-    {
-        $num = $db->num_rows($result);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
-            array_push($permsgroup,$obj->id);
-            $i++;
-        }
-        $db->free($result);
-    }
-    else
-    {
-        dolibarr_print_error($db);
-    }
-
-
-    /*
-     * Ecran ajout/suppression permission
-     */
-
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Module").'</td>';
-    if ($caneditperms) print '<td width="24">&nbsp</td>';
-    print '<td align="center" width="24">&nbsp;</td>';
-    print '<td>'.$langs->trans("Permissions").'</td>';
-    print '</tr>';
-
-    $sql ="SELECT r.id, r.libelle, r.module";
-    $sql.=" FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql.=" WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
-    $sql.=" ORDER BY r.module, r.id";
-
-    $result=$db->query($sql);
-    if ($result)
-    {
-        $num = $db->num_rows($result);
-        $i = 0;
-        $var = True;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
-
-            // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
-            if (! $modules[$obj->module]) 
-            {
-                $i++;
-                continue;
-            }
-
-            if ($oldmod <> $obj->module)
-            {
-                $oldmod = $obj->module;
-                $var = !$var;
-
-                // Rupture détectée, on récupère objMod
-                $objMod=$modules[$obj->module];
-                $picto=($objMod->picto?$objMod->picto:'generic');
-
-                if ($caneditperms && ($obj->module != 'user' || ! $fuser->admin))
-                {
-                    // On affiche ligne pour modifier droits
-                    print '<tr '. $bc[$var].'>';
-                    print '<td>'.img_object('',$picto).' '.$objMod->getName();
-                    print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';    
-                    print '<td align="center" nowrap>';
-                    print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
-                    print '/';
-                    print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
-                    print '</td>';
-                    print '<td colspan="2">&nbsp;</td>';
-                    print '</tr>';
-                }
-            }
-
-            print '<tr '. $bc[$var].'>';
-
-            print '<td>'.img_object('',$picto).' '.$objMod->getName();
-            print '</td>';    
-
-            if ($fuser->admin && $obj->module == 'user')
-            {
-                // Permission own because admin
-                if ($caneditperms)
-                {
-                    print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
-                }
-                print '<td align="center" nowrap>';
-                print img_tick();
-                print '</td>';
-            }
-            else if (in_array($obj->id, $permsuser))
-            {
-                // Permission own by user
-                if ($caneditperms)
-                {
-                    print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-                }
-                print '<td align="center">';
-                print img_tick();
-                print '</td>';
-            }
-            else if (in_array($obj->id, $permsgroup)) {
-                // Permission own by group
-                if ($caneditperms) 
-                {
-                    print '<td align="center">'.$langs->trans("Group").'</td>';
-                }
-                print '<td align="center" nowrap>';
-                print img_tick();
-                print '</td>';
-            }
-            else
-            {
-                // Do not own permission
-                if ($caneditperms)
-                {
-                    print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-                }
-                print '<td>&nbsp</td>';
-            }
-
-            $perm_libelle=(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle);
-            print '<td>'.$perm_libelle. '</td>';
-
-            print '</tr>';
-
-            $i++;
-        }
-    }
-    print '</table>';
 }
 
+$db->commit();
+
+// Lecture des droits utilisateurs
+$permsuser = array();
+
+$sql  = "SELECT r.id, r.libelle, r.module";
+$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+$sql .= " ".MAIN_DB_PREFIX."user_rights as ur";
+$sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id;
+
+$result=$db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($result);
+        array_push($permsuser,$obj->id);
+        $i++;
+    }
+    $db->free($result);
+}
+else
+{
+    dolibarr_print_error($db);
+}
+
+// Lecture des droits groupes
+$permsgroup = array();
+
+$sql  = "SELECT r.id, r.libelle, r.module";
+$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+$sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr,";
+$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu";
+$sql .= " WHERE gr.fk_id = r.id AND gr.fk_usergroup = gu.fk_usergroup AND gu.fk_user = ".$fuser->id;
+
+$result=$db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($result);
+        array_push($permsgroup,$obj->id);
+        $i++;
+    }
+    $db->free($result);
+}
+else
+{
+    dolibarr_print_error($db);
+}
+
+
+/*
+ * Ecran ajout/suppression permission
+ */
+
+print '<table width="100%" class="noborder">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Module").'</td>';
+if ($caneditperms) print '<td width="24">&nbsp</td>';
+print '<td align="center" width="24">&nbsp;</td>';
+print '<td>'.$langs->trans("Permissions").'</td>';
+print '</tr>';
+
+$sql ="SELECT r.id, r.libelle, r.module";
+$sql.=" FROM ".MAIN_DB_PREFIX."rights_def as r";
+$sql.=" WHERE r.libelle NOT LIKE 'tou%'";    // On ignore droits "tous"
+$sql.=" ORDER BY r.module, r.id";
+
+$result=$db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+    $var = True;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($result);
+
+        // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
+        if (! $modules[$obj->module]) 
+        {
+            $i++;
+            continue;
+        }
+
+        if ($oldmod <> $obj->module)
+        {
+            $oldmod = $obj->module;
+            $var = !$var;
+
+            // Rupture détectée, on récupère objMod
+            $objMod=$modules[$obj->module];
+            $picto=($objMod->picto?$objMod->picto:'generic');
+
+            if ($caneditperms && ($obj->module != 'user' || ! $fuser->admin))
+            {
+                // On affiche ligne pour modifier droits
+                print '<tr '. $bc[$var].'>';
+                print '<td>'.img_object('',$picto).' '.$objMod->getName();
+                print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';    
+                print '<td align="center" nowrap>';
+                print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+                print '/';
+                print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+                print '</td>';
+                print '<td colspan="2">&nbsp;</td>';
+                print '</tr>';
+            }
+        }
+
+        print '<tr '. $bc[$var].'>';
+
+        print '<td>'.img_object('',$picto).' '.$objMod->getName();
+        print '</td>';    
+
+        if ($fuser->admin && $obj->module == 'user')
+        {
+            // Permission own because admin
+            if ($caneditperms)
+            {
+                print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
+            }
+            print '<td align="center" nowrap>';
+            print img_tick();
+            print '</td>';
+        }
+        else if (in_array($obj->id, $permsuser))
+        {
+            // Permission own by user
+            if ($caneditperms)
+            {
+                print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+            }
+            print '<td align="center">';
+            print img_tick();
+            print '</td>';
+        }
+        else if (in_array($obj->id, $permsgroup)) {
+            // Permission own by group
+            if ($caneditperms) 
+            {
+                print '<td align="center">'.$langs->trans("Group").'</td>';
+            }
+            print '<td align="center" nowrap>';
+            print img_tick();
+            print '</td>';
+        }
+        else
+        {
+            // Do not own permission
+            if ($caneditperms)
+            {
+                print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+            }
+            print '<td>&nbsp</td>';
+        }
+
+        $perm_libelle=(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle);
+        print '<td>'.$perm_libelle. '</td>';
+
+        print '</tr>';
+
+        $i++;
+    }
+}
+print '</table>';
+
 $db->close();
 
 llxFooter('$Date$ - $Revision$');