From 9bcf643cdc4cf9e62a2288a04a6fb63cbd55fda9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Thu, 6 May 2010 18:06:19 +0000 Subject: [PATCH] According to new tree directory --- htdocs/admin/ldap_groups.php | 2 +- htdocs/admin/ldap_users.php | 2 +- htdocs/user/{group => class}/usergroup.class.php | 0 htdocs/user/fiche.php | 2 +- htdocs/user/group/fiche.php | 2 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/group/perms.php | 2 +- scripts/user/sync_groups_dolibarr2ldap.php | 2 +- test/UserGroupTest.php | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename htdocs/user/{group => class}/usergroup.class.php (100%) diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 7a85e46413f..7539fea7c43 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 975d447b3ef..21e18592773 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/user/group/usergroup.class.php b/htdocs/user/class/usergroup.class.php similarity index 100% rename from htdocs/user/group/usergroup.class.php rename to htdocs/user/class/usergroup.class.php diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index c99c4d93fed..81839fc75d1 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -29,7 +29,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 77e7ea7af5a..c13c465ef1b 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); // Defini si peux lire/modifier utilisateurs et permisssions diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index bace973610d..ef68d55cb4b 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -25,7 +25,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/user/group/usergroup.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index f8457deec82..e2cb6026451 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/user/group/usergroup.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); $langs->load("users"); diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index 52453c0114e..752dd24c9bb 100644 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -45,7 +45,7 @@ $version='$Revision$'; require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); $error=0; diff --git a/test/UserGroupTest.php b/test/UserGroupTest.php index 2f2adc4b74e..5ee3a241fd5 100644 --- a/test/UserGroupTest.php +++ b/test/UserGroupTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver require_once 'PHPUnit/Framework.php'; require_once dirname(__FILE__).'/../htdocs/master.inc.php'; -require_once dirname(__FILE__).'/../htdocs/user/group/usergroup.class.php'; +require_once dirname(__FILE__).'/../htdocs/user/class/usergroup.class.php'; if (empty($user->id)) { -- GitLab