diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index 6c051ec03d8..b49615a87ff 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -125,7 +125,7 @@ print "
"; */ if (defined("ADHERENT_USE_MAILMAN") && ADHERENT_USE_MAILMAN == 1) { - $lien=''; + $lien=img_tick().' '; $lien.=''.$langs->trans("Disable").''; // Edition des varibales globales rattache au theme Mailman $constantes=array('ADHERENT_MAILMAN_LISTS', @@ -151,7 +151,7 @@ print "
\n"; */ if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE == 1) { - $lien=''; + $lien=img_tick().' '; $lien.=''.$langs->trans("Disable").''; // Edition des varibales globales rattache au theme Mailman $constantes=array('ADHERENT_BANK_USE_AUTO', @@ -175,7 +175,7 @@ print "
\n"; $var=!$var; if (defined("ADHERENT_USE_SPIP") && ADHERENT_USE_SPIP == 1) { - $lien=''; + $lien=img_tick().' '; $lien.=''.$langs->trans("Disable").''; // Edition des varibales globales rattache au theme Mailman $constantes=array('ADHERENT_USE_SPIP_AUTO', @@ -201,7 +201,7 @@ print "
\n"; $var=!$var; if (defined("ADHERENT_USE_GLASNOST") && ADHERENT_USE_GLASNOST == 1) { - $lien=''; + $lien=img_tick().' '; $lien.=''.$langs->trans("Disable").''; // Edition des varibales globales rattache au theme Mailman $constantes=array('ADHERENT_USE_GLASNOST_AUTO', diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php index 35b6ed5acbe..ff90118848a 100644 --- a/htdocs/admin/boutique.php +++ b/htdocs/admin/boutique.php @@ -110,7 +110,7 @@ foreach ($modules as $key => $value) if ($const_value == 1) { - print ''; + print img_tick(); } else { @@ -121,11 +121,11 @@ foreach ($modules as $key => $value) if ($const_value == 1) { - print 'Désactiver'; + print ''.$langs->trans("Disable").''; } else { - print 'Activer'; + print ''.$langs->trans("Activate").''; } print ''; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 196556024f8..ef0759551c8 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -101,13 +101,13 @@ if ($handle) if ($commande_addon_var == "$file") { print ''; - print ''; + print img_tick(); print ' '; } else { print ' '; - print 'activer'; + print ''.$langs->trans("Activate").''; } print ''; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index c83ce16a099..5c458f17d0a 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -186,22 +186,22 @@ if(is_dir($dir)) { if (in_array($name, $def)) { - print ''; + print img_tick(); print "\n"; - print 'désactiver'; + print ''.$langs->trans("Disable").''; } else { print " "; print "\n"; - print 'activer'; + print ''.$langs->trans("Activate").''; } print ''; if ($expedition_default == "$name") { - print ''; + print img_tick(); } else { @@ -262,22 +262,22 @@ if(is_dir($dir)) { if (in_array($name, $def)) { - print ''; + print img_tick(); print "\n"; - print 'désactiver'; + print ''.$langs->trans("Disable").''; } else { print " "; print "\n"; - print 'activer'; + print ''.$langs->trans("Activate").''; } print ''; if ($expedition_addon_var_pdf == "$name") { - print ''; + print img_tick(); } else { @@ -286,7 +286,7 @@ if(is_dir($dir)) { print "\n"; - print 'activer'; + print ''.$langs->trans("Activate").''; print ''; } diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index bde5cf60458..de76846e956 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -141,7 +141,7 @@ while (($file = readdir($handle))!==false) print ''; if ($facture_addon_var == "$file") { - print ''; + print img_tick(); print ''; print ' '; } @@ -161,7 +161,7 @@ print ''; print "
"; print_titre("Date des factures"); -print ''; +print '
'; print ''; print ''; print ''; @@ -175,15 +175,15 @@ print '\n"; @@ -233,7 +233,7 @@ while (($file = readdir($handle))!==false) if ($facture_addon_var_pdf == "$name") { - print ''; + print img_tick(); print '\n \n"; } else @@ -229,7 +229,7 @@ while (($file = readdir($handle))!==false) if (in_array($name, $def)) { - print ''; + print img_tick(); print "\n \n \n"; } else @@ -164,7 +164,7 @@ if ($handle) if ($codecompta_addon_var == "$file") { print ''; } else diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index f7cae02aeb5..a4d79cc864c 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -519,6 +519,17 @@ function img_up($alt = "default") return ''.$alt.''; } + +/** + \brief Affiche logo tick +*/ +function img_tick($alt = "default") +{ + global $conf,$langs; + if ($alt=="default") $alt=$langs->trans("Active"); + return ''.$alt.''; +} + /** \brief fonction de login \remarks il faut changer le code html dans la fonction pour changer le design diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index eab5dfcbccd..f6322ce4008 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -22,7 +22,8 @@ * $Source$ */ -/** \file htdocs/user/group/perms.php +/** + \file htdocs/user/group/perms.php \brief Onglet user et permissions de la fiche utilisateur \version $Revision$ */ @@ -35,22 +36,22 @@ $langs->load("users"); $form = new Form($db); -$action=isset($_GET["action"])?$_GET["action"]:$_POST["action"]; +$module=isset($_GET["module"])?$_GET["module"]:$_POST["module"]; /** * Actions */ -if ($_GET["subaction"] == 'addrights' && $user->admin) +if ($_GET["action"] == 'addrights' && $user->admin) { - $editgroup = new Usergroup($db,$_GET["id"]); - $editgroup->addrights($_GET["rights"]); + $editgroup = new Usergroup($db,$_GET["id"]); + $editgroup->addrights($_GET["rights"]); } -if ($_GET["subaction"] == 'delrights' && $user->admin) +if ($_GET["action"] == 'delrights' && $user->admin) { - $editgroup = new Usergroup($db,$_GET["id"]); - $editgroup->delrights($_GET["rights"]); + $editgroup = new Usergroup($db,$_GET["id"]); + $editgroup->delrights($_GET["rights"]); } @@ -65,120 +66,159 @@ llxHeader('',$langs->trans("Permissions")); if ($_GET["id"]) { - $fgroup = new Usergroup($db, $_GET["id"]); - $fgroup->fetch($_GET["id"]); - $fgroup->getrights($_GET["id"]); - - /* - * Affichage onglets - */ - - $h = 0; - - $head[$h][0] = DOL_URL_ROOT.'/user/group/fiche.php?id='.$fgroup->id; - $head[$h][1] = $langs->trans("GroupCard"); - $h++; - - $head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$fgroup->id; - $head[$h][1] = $langs->trans("GroupRights"); - $hselected=$h; - $h++; + $fgroup = new Usergroup($db, $_GET["id"]); + $fgroup->fetch($_GET["id"]); + $fgroup->getrights($_GET["id"]); - - dolibarr_fiche_head($head, $hselected, $langs->trans("Group").": ".$fgroup->nom); + /* + * Affichage onglets + */ - // Lecture des droits du groupe - $sql = "SELECT r.id, r.libelle, r.module "; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r"; - $sql .= ", ".MAIN_DB_PREFIX."usergroup_rights as ugr"; - $sql .= " WHERE ugr.fk_id = r.id AND ugr.fk_usergroup = ".$fgroup->id; + $h = 0; - $result=$db->query($sql); - - $perms = array(); + $head[$h][0] = DOL_URL_ROOT.'/user/group/fiche.php?id='.$fgroup->id; + $head[$h][1] = $langs->trans("GroupCard"); + $h++; - if ($result) + $head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$fgroup->id; + $head[$h][1] = $langs->trans("GroupRights"); + $hselected=$h; + $h++; + + + dolibarr_fiche_head($head, $hselected, $langs->trans("Group").": ".$fgroup->nom); + + // 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 ugr"; + $sql .= " WHERE ugr.fk_id = r.id AND ugr.fk_usergroup = ".$fgroup->id; + + $result=$db->query($sql); + + + + if ($result) { - $num = $db->num_rows(); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($i); + $num = $db->num_rows($result); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($result); - array_push($perms,$obj->id); + array_push($permsgroup,$obj->id); - $i++; - } - $db->free(); + $i++; + } + $db->free($result); } - else + else { - dolibarr_print_error($db); + dolibarr_print_error($db); } - - - /* - * Ecran ajout/suppression permission - */ - print '
'.$langs->trans("Description").''.$langs->trans("Activated").''; if (defined("FAC_FORCE_DATE_VALIDATION") && FAC_FORCE_DATE_VALIDATION == "1") { - print ''; + print img_tick(); print ''; - print ''.$langs->trans("Désactiver").''; + print ''.$langs->trans("Disable").''; } else { print ' '; print ''; - print ''.$langs->trans("Activate").''; + print ''.$langs->trans("Enable").''; } print "
'; print ' '; } diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index df9169480b0..ca790455412 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -101,7 +101,7 @@ while (($file = readdir($handle))!==false) if ($ficheinter_addon_var_pdf == "$name") { - print ''; + print img_tick(); } else { diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 56380b96fb3..e68d7403bde 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -248,7 +248,7 @@ foreach ($orders as $key => $value) if ($const_value == 1) { - print ''; + print img_tick(); } else { diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 41c5b0dcf52..ab327a84c8c 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -89,7 +89,7 @@ if ($result) if ($obj->bydefault == 1) { - print ''; + print img_tick(); print ''; print ''.img_edit_remove().''; } diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index 9ec71ce9a6a..157e81546e7 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -151,7 +151,7 @@ if ($handle) if ($propale_addon_var == "$file") { print " "; - print "theme."/img/tick.png\" border=\"0\">"; + print img_tick(); print " "; print ''.$langs->trans("Disable").''; } @@ -244,7 +244,7 @@ while (($file = readdir($handle))!==false) if ($propale_addon_var_pdf == "$name") { - print ''; + print img_tick(); } else { diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index e3e4f846f50..2416a478c16 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -110,7 +110,7 @@ if ($handle) if ($codeclient_addon_var == "$file") { print " \n"; - print ''; + print img_tick(); print " '; - print ''; + print img_tick(); print ' 
'; - print ''; - - $sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC"; - - if ($db->query($sql)) + // Charge les modules soumis a permissions + $dir = DOL_DOCUMENT_ROOT . "/includes/modules/"; + $handle=opendir($dir); + $modules = array(); + while (($file = readdir($handle))!==false) { - $num = $db->num_rows(); - $i = 0; - $var = True; - while ($i < $num) - { - $obj = $db->fetch_object($i); - if ($oldmod <> $obj->module) - { - $oldmod = $obj->module; - $var = !$var; - } - print ''; + 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 ( $user->admin ) - { - if (in_array($obj->id, $perms)) - { - print ''; - print ''; - } - else - { - print ''; - print ''; - } - - print ''; - print ''; - } - else - { - if (in_array($obj->id, $perms)) - { - print ''; - print ''; - print ''; - } - } - - - $i++; - } + if ($modName) + { + include_once("../../includes/modules/$file"); + $objMod = new $modName($db); + if ($objMod->rights_class) { + $modules[$objMod->rights_class]=$modName; + //print "modules[".$objMod->rights_class."]=$modName;"; + } + } + } } - print '
  '.$langs->trans("Permissions").''.$langs->trans("Module").'
 '; - print ''.img_edit_remove().''; - print ''; - print ''.img_edit_add().''; - print ' '.$obj->libelle . ''.$obj->module . '
  '.$obj->libelle . ''.$obj->module . '
'; + + /* + * Ecran ajout/suppression permission + */ + + + print ''; + print ''; + if ($user->admin) print ''; + print ''; + print ''; + print ''; + print ''; + + $sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC"; + + $result=$db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $i = 0; + $var = True; + while ($i < $num) + { + $obj = $db->fetch_object($result); + if ($oldmod <> $obj->module) + { + $oldmod = $obj->module; + $var = !$var; + print ''; + + // Recupère objet module + $modName=$modules[$obj->module]; + $file = $modName.".class.php"; + include_once("../../includes/modules/$file"); + $objMod = new $modName($db); + + $picto=($objMod->picto?$objMod->picto:'generic'); + } + else + { + print ''; + } + + if (in_array($obj->id, $permsgroup)) + { + // Own permission by group + if ($user->admin) + { + print ''; + } + print ''; + } + else + { + // Do not own permission + if ($user->admin) + { + print ''; + } + print ''; + } + + print ''; + + print ''; + + print ''; + + $i++; + } + } + print '
  '.$langs->trans("Permissions").''.$langs->trans("Module").'
'.img_edit_remove($langs->trans("Remove")).''; + print img_tick(); + print ''.img_edit_add($langs->trans("Add")).' '.$obj->libelle . ''.img_object('',$picto).' '.$objMod->getName(); + print '
'; } - + $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index a9d714c2bff..b1a164853e6 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -22,7 +22,8 @@ * $Source$ */ -/** \file htdocs/user/perms.php +/** + \file htdocs/user/perms.php \brief Onglet user et permissions de la fiche utilisateur \version $Revision$ */ @@ -35,22 +36,22 @@ $langs->load("users"); $form = new Form($db); -$action=isset($_GET["action"])?$_GET["action"]:$_POST["action"]; +$module=isset($_GET["module"])?$_GET["module"]:$_POST["module"]; /** * Actions */ -if ($_GET["subaction"] == 'addrights' && $user->admin) +if ($_GET["action"] == 'addrights' && $user->admin) { - $edituser = new User($db,$_GET["id"]); - $edituser->addrights($_GET["rights"]); + $edituser = new User($db,$_GET["id"]); + $edituser->addrights($_GET["rights"]); } -if ($_GET["subaction"] == 'delrights' && $user->admin) +if ($_GET["action"] == 'delrights' && $user->admin) { - $edituser = new User($db,$_GET["id"]); - $edituser->delrights($_GET["rights"]); + $edituser = new User($db,$_GET["id"]); + $edituser->delrights($_GET["rights"]); } @@ -66,126 +67,196 @@ llxHeader('',$langs->trans("Permissions")); if ($_GET["id"]) { - $fuser = new User($db, $_GET["id"]); - $fuser->fetch(); - $fuser->getrights(); - - /* - * Affichage onglets - */ - - $h = 0; - - $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("UserCard"); - $h++; - - $head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("UserRights"); - $hselected=$h; - $h++; - - if ($conf->bookmark4u->enabled) + $fuser = new User($db, $_GET["id"]); + $fuser->fetch(); + $fuser->getrights(); + + /* + * Affichage onglets + */ + + $h = 0; + + $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserCard"); + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserRights"); + $hselected=$h; + $h++; + + if ($conf->bookmark4u->enabled) { - $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("Bookmark4u"); - $h++; + $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("Bookmark4u"); + $h++; } - - dolibarr_fiche_head($head, $hselected, $langs->trans("User").": ".$fuser->fullname); - // Lecture des droits de l'utilisateur - $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; + dolibarr_fiche_head($head, $hselected, $langs->trans("User").": ".$fuser->fullname); - $result=$db->query($sql); - - $perms = array(); + // Lecture des droits utilisateurs + $permsuser = array(); - if ($result) + $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(); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($i); - - array_push($perms,$obj->id); - - $i++; - } - $db->free(); + $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 + else { - dolibarr_print_error($db); + dolibarr_print_error($db); } - - /* - * Ecran ajout/suppression permission - */ + // 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; - print ''; - print ''; - - $sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC"; - - if ($db->query($sql)) + $result=$db->query($sql); + if ($result) { - $num = $db->num_rows(); - $i = 0; - $var = True; - while ($i < $num) - { - $obj = $db->fetch_object($i); - if ($oldmod <> $obj->module) - { - $oldmod = $obj->module; - $var = !$var; - } - print ''; - - if ( $user->admin ) - { - if (in_array($obj->id, $perms)) - { - print ''; - print ''; - } - else - { - print ''; - print ''; - } - - print ''; - print ''; - } - else - { - if (in_array($obj->id, $perms)) - { - print ''; - print ''; - print ''; - } - } - - - $i++; - } + $num = $db->num_rows($result); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($result); + array_push($permsgroup,$obj->id); + $i++; + } + $db->free($result); } - print '
  '.$langs->trans("Permissions").''.$langs->trans("Module").'
 '; - print ''.img_edit_remove().''; - print ''; - print ''.img_edit_add().''; - print ' '.$obj->libelle . ''.$obj->module . '
  '.$obj->libelle . ''.$obj->module . '
'; + else + { + dolibarr_print_error($db); + } + + + // 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) + { + include_once("../includes/modules/$file"); + $objMod = new $modName($db); + if ($objMod->rights_class) { + $modules[$objMod->rights_class]=$modName; + //print "modules[".$objMod->rights_class."]=$modName;"; + } + } + } + } + + /* + * Ecran ajout/suppression permission + */ + + print ''; + print ''; + if ($user->admin) print ''; + print ''; + print ''; + print ''; + print ''; + + $sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC"; + + $result=$db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $i = 0; + $var = True; + while ($i < $num) + { + $obj = $db->fetch_object($result); + if ($oldmod <> $obj->module) + { + $oldmod = $obj->module; + $var = !$var; + print ''; + + // Recupère objet module + $modName=$modules[$obj->module]; + $file = $modName.".class.php"; + include_once("../includes/modules/$file"); + $objMod = new $modName($db); + + $picto=($objMod->picto?$objMod->picto:'generic'); + } + else + { + print ''; + } + + if (in_array($obj->id, $permsuser)) + { + // Own permission by user + if ($user->admin) + { + print ''; + } + print ''; + } + else if (in_array($obj->id, $permsgroup)) { + // Own permission by group + if ($user->admin) + { + print ''; + } + print ''; + } + else + { + // Do not own permission + if ($user->admin) + { + print ''; + } + print ''; + } + + print ''; + + print ''; + + print ''; + + $i++; + } + } + print '
  '.$langs->trans("Permissions").''.$langs->trans("Module").'
'.img_edit_remove($langs->trans("Remove")).''; + print img_tick(); + print ''.$langs->trans("Group").''; + print img_tick(); + print ''.img_edit_add($langs->trans("Add")).' '.$obj->libelle . ''.img_object('',$picto).' '.$objMod->getName(); + print '
'; } - + $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$");