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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-08 15:50:28 +00:00
parent a972b202d2
commit b079e143a8
2 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
htdocs/user/group/perms.php
View File

@ -23,7 +23,7 @@
/**
* \file htdocs/user/group/perms.php
* \brief Onglet user et permissions de la fiche utilisateur
* \version $Id$
* \version $Id: perms.php,v 1.38 2011/07/08 15:50:28 eldy Exp $
*/
require("../../main.inc.php");
@ -42,9 +42,9 @@ $caneditperms=($user->admin || $user->rights->user->user->creer);
$advancedpermsactive=false;
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
{
$advancedpermsactive=true;
$canreadperms=($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms));
$caneditperms=($user->admin || $user->rights->user->group_advance->write);
$advancedpermsactive=true;
$canreadperms=($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms));
$caneditperms=($user->admin || $user->rights->user->group_advance->write);
}
if (! $canreadperms) accessforbidden();
@ -68,11 +68,9 @@ if ($_GET["action"] == 'delrights' && $caneditperms)
}
/* ************************************************************************** */
/* */
/* Visu et edition */
/* */
/* ************************************************************************** */
/**
* View
*/
$form = new Form($db);
@ -84,12 +82,12 @@ if ($_GET["id"])
$fgroup->fetch($_GET["id"]);
$fgroup->getrights();
/*
* Affichage onglets
*/
$head = group_prepare_head($fgroup);
$title = $langs->trans("Group");
dol_fiche_head($head, 'rights', $title, 0, 'group');
/*
* Affichage onglets
*/
$head = group_prepare_head($fgroup);
$title = $langs->trans("Group");
dol_fiche_head($head, 'rights', $title, 0, 'group');
$db->begin();
@ -97,45 +95,45 @@ if ($_GET["id"])
// Charge les modules soumis a permissions
$modules = array();
foreach ($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot . "/includes/modules/";
{
$dir = $dirroot . "/includes/modules/";
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
$handle=@opendir($dir);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
{
$modName = substr($file, 0, dol_strlen($file) - 10);
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
$handle=@opendir($dir);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
{
$modName = substr($file, 0, dol_strlen($file) - 10);
if ($modName)
{
include_once($dir."/".$file);
$objMod = new $modName($db);
// Load all lang files of module
if (isset($objMod->langfiles) && is_array($objMod->langfiles))
{
foreach($objMod->langfiles as $domain)
{
$langs->load($domain);
}
}
// Load all permissions
if ($objMod->rights_class) {
if ($modName)
{
include_once($dir."/".$file);
$objMod = new $modName($db);
// Load all lang files of module
if (isset($objMod->langfiles) && is_array($objMod->langfiles))
{
foreach($objMod->langfiles as $domain)
{
$langs->load($domain);
}
}
// Load all permissions
if ($objMod->rights_class) {
$ret=$objMod->insert_permissions(0);
$ret=$objMod->insert_permissions(0);
$modules[$objMod->rights_class]=$objMod;
//print "modules[".$objMod->rights_class."]=$objMod;";
}
}
}
}
}
}
$modules[$objMod->rights_class]=$objMod;
//print "modules[".$objMod->rights_class."]=$objMod;";
}
}
}
}
}
}
$db->commit();
@ -187,7 +185,7 @@ if ($_GET["id"])
print '<td colspan="2">'.$fgroup->nom.'';
if (! $fgroup->entity)
{
print img_redstar($langs->trans("GlobalGroup"));
print img_redstar($langs->trans("GlobalGroup"));
}
print "</td></tr>\n";
@ -243,22 +241,22 @@ if ($_GET["id"])
if ($caneditperms)
{
print '<tr '. $bc[$var].'>';
print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName();
print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
print '<td align="center" nowrap="nowrap">';
print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->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='.$fgroup->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 nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName();
print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
print '<td align="center" nowrap="nowrap">';
print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->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='.$fgroup->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].'>';
// Module
// Module
print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName().'</td>';
if (in_array($obj->id, $permsgroup))
@ -295,5 +293,5 @@ if ($_GET["id"])
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/08 15:50:28 $ - $Revision: 1.38 $');
?>

11
htdocs/user/passwordforgotten.php
View File

@ -19,8 +19,8 @@
/**
* \file htdocs/user/passwordforgotten.php
* \brief Page demande nouveau mot de passe
* \version $Id$
* \brief Page to ask a new password
* \version $Id: passwordforgotten.php,v 1.74 2011/07/08 15:52:24 eldy Exp $
*/
define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -55,7 +55,7 @@ $conf->entity = ( GETPOST('entity') ? GETPOST('entity') : 1 );
* Actions
*/
// Action modif mot de passe
// Validate new password
if ($action == 'validatenewpassword' && $username && $passwordmd5)
{
$edituser = new User($db);
@ -139,9 +139,10 @@ if ($action == 'buildnewpassword' && $username)
}
/*
* Affichage page
/**
* View
*/
$php_self = $_SERVER['PHP_SELF'];
$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';