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

multi-company module enhancement

Browse Source
This commit is contained in:
Regis Houssin 2011-08-19 09:26:41 +00:00
parent 7f9c2040cd
commit c5691093e4
3 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.form.class.php
View File

@ -31,7 +31,7 @@
* \file htdocs/core/class/html.form.class.php * \file htdocs/core/class/html.form.class.php
* \ingroup core * \ingroup core
* \brief File of class with all html predefined components * \brief File of class with all html predefined components
* \version $Id: html.form.class.php,v 1.197 2011/08/19 07:22:17 hregis Exp $ * \version $Id: html.form.class.php,v 1.198 2011/08/19 09:26:41 hregis Exp $
*/ */
@ -845,7 +845,7 @@ class Form
$out.= '>'; $out.= '>';
} }
$out.= $userstatic->getFullName($langs); $out.= $userstatic->getFullName($langs);
if($conf->entity==0 && !$conf->global->MULTICOMPANY_MODE_TRANVERSAL) if($conf->entity==0 && !$conf->global->MULTICOMPANY_TRANSVERSE_MODE)
$out.=" (".$obj->label.")"; $out.=" (".$obj->label.")";
//if ($obj->admin) $out.= ' *'; //if ($obj->admin) $out.= ' *';
@ -3554,7 +3554,7 @@ class Form
$out.= '>'; $out.= '>';
$out.= $obj->nom; $out.= $obj->nom;
if($conf->entity==0 && !$conf->global->MULTICOMPANY_MODE_TRANVERSAL) if($conf->entity==0 && !$conf->global->MULTICOMPANY_TRANSVERSE_MODE)
$out.= " (".$obj->label.")"; $out.= " (".$obj->label.")";
$out.= '</option>'; $out.= '</option>';

35
htdocs/user/fiche.php
View File

@ -24,7 +24,7 @@
/** /**
* \file htdocs/user/fiche.php * \file htdocs/user/fiche.php
* \brief Tab of user card * \brief Tab of user card
* \version $Id: fiche.php,v 1.277 2011/08/19 09:26:10 hregis Exp $ * \version $Id: fiche.php,v 1.278 2011/08/19 09:26:41 hregis Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -51,7 +51,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
} }
//Multicompany in mode transversal //Multicompany in mode transversal
if($conf->multicompany->enabled && $conf->entity > 0 && $conf->global->MULTICOMPANY_MODE_TRANVERSAL) if($conf->multicompany->enabled && $conf->entity > 0 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
accessforbidden(); accessforbidden();
} }
@ -203,7 +203,7 @@ if ($_POST["action"] == 'add' && $canadduser)
$edituser->note = $_POST["note"]; $edituser->note = $_POST["note"];
$edituser->ldap_sid = $_POST["ldap_sid"]; $edituser->ldap_sid = $_POST["ldap_sid"];
// If multicompany is off, admin users must all be on entity 0. // If multicompany is off, admin users must all be on entity 0.
$edituser->entity = (empty($_POST["entity"]) || empty($conf->multicompany->enabled) ? 0 : $_POST["entity"]); $edituser->entity = ( ! empty($_POST["admin"]) && (! empty($_POST["superadmin"]) || empty($_POST["entity"]) || empty($conf->multicompany->enabled)) ? 0 : $_POST["entity"]);
$db->begin(); $db->begin();
@ -243,8 +243,8 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
$edituser = new User($db); $edituser = new User($db);
$edituser->fetch($_GET["id"]); $edituser->fetch($_GET["id"]);
if ($action == 'addgroup') $edituser->SetInGroup($group,($conf->global->MULTICOMPANY_MODE_TRANVERSAL?$_POST["entity"]:$editgroup->entity)); if ($action == 'addgroup') $edituser->SetInGroup($group,($conf->global->MULTICOMPANY_TRANSVERSE_MODE?GETPOST("entity"):$editgroup->entity));
if ($action == 'removegroup') $edituser->RemoveFromGroup($group,($conf->global->MULTICOMPANY_MODE_TRANVERSAL?$_GET["entity"]:$editgroup->entity)); if ($action == 'removegroup') $edituser->RemoveFromGroup($group,($conf->global->MULTICOMPANY_TRANSVERSE_MODE?GETPOST("entity"):$editgroup->entity));
if ($result > 0) if ($result > 0)
{ {
@ -299,7 +299,7 @@ if ($action == 'update' && ! $_POST["cancel"])
$edituser->webcal_login = $_POST["webcal_login"]; $edituser->webcal_login = $_POST["webcal_login"];
$edituser->phenix_login = $_POST["phenix_login"]; $edituser->phenix_login = $_POST["phenix_login"];
$edituser->phenix_pass = $_POST["phenix_pass"]; $edituser->phenix_pass = $_POST["phenix_pass"];
$edituser->entity = ( empty($_POST["entity"]) ? 0 : $_POST["entity"]); $edituser->entity = ( (! empty($_POST["superadmin"]) && ! empty($_POST["admin"]) || empty($_POST["entity"])) ? 0 : $_POST["entity"]);
if (GETPOST('deletephoto')) $edituser->photo=''; if (GETPOST('deletephoto')) $edituser->photo='';
if (! empty($_FILES['photo']['name'])) $edituser->photo = dol_sanitizeFileName($_FILES['photo']['name']); if (! empty($_FILES['photo']['name'])) $edituser->photo = dol_sanitizeFileName($_FILES['photo']['name']);
@ -666,7 +666,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<td>'; print '<td>';
print $form->selectyesno('admin',$_POST["admin"],1); print $form->selectyesno('admin',$_POST["admin"],1);
/*if (! empty($conf->multicompany->enabled) && ! $user->entity) if (! empty($conf->multicompany->enabled) && ! $user->entity && ! $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
@ -688,14 +688,14 @@ if (($action == 'create') || ($action == 'adduserldap'))
$checked=($_POST["superadmin"]?' checked':''); $checked=($_POST["superadmin"]?' checked':'');
$disabled=($_POST["superadmin"]?'':' disabled'); $disabled=($_POST["superadmin"]?'':' disabled');
print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator"); print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator");
}*/ }
print "</td></tr>\n"; print "</td></tr>\n";
} }
//Multicompany //Multicompany
if ($conf->multicompany->enabled) if ($conf->multicompany->enabled)
{ {
if ($conf->entity == 0 && !$conf->global->MULTICOMPANY_MODE_TRANVERSAL) if ($conf->entity == 0 && ! $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
@ -1259,7 +1259,7 @@ else
if (! empty($groupslist)) if (! empty($groupslist))
{ {
if( !($conf->multicompany->enabled && $conf->global->MULTICOMPANY_MODE_TRANVERSAL)) if( !($conf->multicompany->enabled && $conf->global->MULTICOMPANY_TRANSVERSE_MODE))
{ {
foreach($groupslist as $groupforuser) foreach($groupslist as $groupforuser)
{ {
@ -1282,7 +1282,7 @@ else
// Multicompany // Multicompany
if ($conf->multicompany->enabled) if ($conf->multicompany->enabled)
{ {
if ($conf->entity == 0 && $conf->global->MULTICOMPANY_MODE_TRANVERSAL) if ($conf->entity == 0 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
print '</td><td valign="top">'.$langs->trans("Entity").'</td>'; print '</td><td valign="top">'.$langs->trans("Entity").'</td>';
@ -1489,7 +1489,7 @@ else
{ {
print $form->selectyesno('admin',$fuser->admin,1); print $form->selectyesno('admin',$fuser->admin,1);
/*if (! empty($conf->multicompany->enabled) && ! $user->entity) if (! empty($conf->multicompany->enabled) && ! $user->entity && ! $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
@ -1517,14 +1517,14 @@ else
$checked=(($fuser->admin && ! $fuser->entity) ? ' checked' : ''); $checked=(($fuser->admin && ! $fuser->entity) ? ' checked' : '');
print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator"); print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
}*/ }
} }
else else
{ {
$yn = yn($fuser->admin); $yn = yn($fuser->admin);
print '<input type="hidden" name="admin" value="'.$fuser->admin.'">'; print '<input type="hidden" name="admin" value="'.$fuser->admin.'">';
//if (! empty($conf->multicompany->enabled) && ! $fuser->entity) print $html->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning'); if (! empty($conf->multicompany->enabled) && ! $fuser->entity) print $html->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
//else print $yn; else print $yn;
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -1532,7 +1532,7 @@ else
//Multicompany //Multicompany
if ($conf->multicompany->enabled) if ($conf->multicompany->enabled)
{ {
if ($conf->entity == 0 && !$conf->global->MULTICOMPANY_MODE_TRANVERSAL) if ($conf->entity == 0 && ! $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
@ -1563,6 +1563,7 @@ else
} }
print '</td></tr>'; print '</td></tr>';
} }
// Tel pro // Tel pro
print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>';
print '<td>'; print '<td>';
@ -1742,7 +1743,7 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/08/19 09:26:10 $ - $Revision: 1.277 $'); llxFooter('$Date: 2011/08/19 09:26:41 $ - $Revision: 1.278 $');

18
htdocs/user/group/fiche.php
View File

@ -21,7 +21,7 @@
/** /**
* \file htdocs/user/group/fiche.php * \file htdocs/user/group/fiche.php
* \brief Onglet groupes utilisateurs * \brief Onglet groupes utilisateurs
* \version $Id: fiche.php,v 1.72 2011/08/19 09:26:10 hregis Exp $ * \version $Id: fiche.php,v 1.73 2011/08/19 09:26:42 hregis Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -47,7 +47,7 @@ $langs->load("other");
// Security check // Security check
$result = restrictedArea($user, 'user', $_GET["id"], 'usergroup', 'user'); $result = restrictedArea($user, 'user', $_GET["id"], 'usergroup', 'user');
if($conf->multicompany->enabled && $conf->entity > 0 && $conf->global->MULTICOMPANY_MODE_TRANVERSAL) if($conf->multicompany->enabled && $conf->entity > 0 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
accessforbidden(); accessforbidden();
} }
@ -136,8 +136,8 @@ if ($action == 'adduser' || $action =='removeuser')
$edituser = new User($db); $edituser = new User($db);
$edituser->fetch($userid); $edituser->fetch($userid);
if ($action == 'adduser') $result=$edituser->SetInGroup($object->id,($conf->global->MULTICOMPANY_MODE_TRANVERSAL?$_POST["entity"]:$object->entity)); if ($action == 'adduser') $result=$edituser->SetInGroup($object->id,($conf->global->MULTICOMPANY_TRANSVERSE_MODE?$_POST["entity"]:$object->entity));
if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,($conf->global->MULTICOMPANY_MODE_TRANVERSAL?$_GET["entity"]:$object->entity)); if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,($conf->global->MULTICOMPANY_TRANSVERSE_MODE?$_GET["entity"]:$object->entity));
if ($result > 0) if ($result > 0)
{ {
@ -221,7 +221,7 @@ if ($action == 'create')
// Multicompany // Multicompany
if ($conf->multicompany->enabled) if ($conf->multicompany->enabled)
{ {
if ($conf->entity == 0 && !$conf->global->MULTICOMPANY_MODE_TRANVERSAL) if ($conf->entity == 0 && !$conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
@ -360,7 +360,7 @@ else
if (! empty($userslist)) if (! empty($userslist))
{ {
if( !($conf->multicompany->enabled && $conf->global->MULTICOMPANY_MODE_TRANVERSAL)) if( !($conf->multicompany->enabled && $conf->global->MULTICOMPANY_TRANSVERSE_MODE))
{ {
foreach($userslist as $useringroup) foreach($userslist as $useringroup)
{ {
@ -382,7 +382,7 @@ else
// Multicompany // Multicompany
if ($conf->multicompany->enabled) if ($conf->multicompany->enabled)
{ {
if ($conf->entity == 0 && $conf->global->MULTICOMPANY_MODE_TRANVERSAL) if ($conf->entity == 0 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
print '</td><td valign="top">'.$langs->trans("Entity").'</td>'; print '</td><td valign="top">'.$langs->trans("Entity").'</td>';
@ -478,7 +478,7 @@ else
// Multicompany // Multicompany
if ($conf->multicompany->enabled) if ($conf->multicompany->enabled)
{ {
if ($conf->entity == 0 && !$conf->global->MULTICOMPANY_MODE_TRANVERSAL) if ($conf->entity == 0 && !$conf->global->MULTICOMPANY_TRANSVERSE_MODE)
{ {
$mc = new ActionsMulticompany($db); $mc = new ActionsMulticompany($db);
print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
@ -520,5 +520,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/08/19 09:26:10 $ - $Revision: 1.72 $'); llxFooter('$Date: 2011/08/19 09:26:42 $ - $Revision: 1.73 $');
?> ?>