From ed9144957a75391e3722a75720d832cce0de1e11 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Thu, 29 Apr 2010 15:23:21 +0000
Subject: [PATCH] according to new tree directory

---
 htdocs/adherents/class/adherent.class.php       | 4 ++--
 htdocs/admin/ldap_groups.php                    | 2 +-
 htdocs/admin/ldap_users.php                     | 2 +-
 htdocs/comm/action/fiche.php                    | 2 +-
 htdocs/html.form.class.php                      | 2 +-
 htdocs/install/etape5.php                       | 2 +-
 htdocs/master.inc.php                           | 2 +-
 htdocs/user/{ => class}/user.class.php          | 0
 htdocs/user/fiche.php                           | 2 +-
 htdocs/user/info.php                            | 2 +-
 htdocs/user/note.php                            | 2 +-
 scripts/company/sync_contacts_dolibarr2ldap.php | 2 +-
 scripts/user/sync_users_dolibarr2ldap.php       | 2 +-
 test/UserTest.php                               | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
 rename htdocs/user/{ => class}/user.class.php (100%)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 88f6a3f6409..61ce837d60c 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -497,7 +497,7 @@ class Adherent extends CommonObject
 			{
 				if ($this->user_id > 0 && ! $nosyncuser)
 				{
-					require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+					require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 					dol_syslog("Adherent::update update linked user");
 
@@ -766,7 +766,7 @@ class Adherent extends CommonObject
 
 				if ($this->user_id && ! $nosyncuser)
 				{
-					require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+					require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 					// This member is linked with a user, so we also update users informations
 					// if this is an update.
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 7fb27f4044b..7a85e46413f 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.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."/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 af733fb7c45..975d447b3ef 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.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."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index b02be953e7c..b014179318e 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -29,7 +29,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formactions.class.php");
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index c11f4dbe1a5..84d6d9ccab3 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1954,7 +1954,7 @@ class Form
 		{
 			if ($selected)
 			{
-				require_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");
+				require_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php");
 				//$this->load_cache_contacts();
 				//print $this->cache_contacts[$selected];
 				$theuser=new User($this->db);
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 6cb62014f26..a5de69dc927 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -149,7 +149,7 @@ if ($_POST["action"] == "set" || preg_match('/upgrade/i',$_POST["action"]))
 			$conf->setValues($db);
 
 			// Create user
-			include_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");
+			include_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php");
 
 			$createuser=new User($db);
 			$createuser->id=0;
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 928da094f6c..2c1de700d92 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -216,7 +216,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
 }
 
 // Chargement des includes principaux de librairies communes
-if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");		// Need 500ko memory
+if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php");		// Need 500ko memory
 if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/core/class/translate.class.php");
 if (! defined('NOREQUIRESOC'))  require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php");
 if (! defined('NOREQUIREDB'))   require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
diff --git a/htdocs/user/user.class.php b/htdocs/user/class/user.class.php
similarity index 100%
rename from htdocs/user/user.class.php
rename to htdocs/user/class/user.class.php
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 24156df5fd7..e73107821fd 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -28,7 +28,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.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."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 0cb78224d79..6cbdc91f460 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -26,7 +26,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 $langs->load("users");
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index b9d939b954b..7aef7a36eb2 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php');
-require_once(DOL_DOCUMENT_ROOT.'/user/user.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
 
 $action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:"");
 $id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:"");
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index a992feb65fa..cd279ddbfa5 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -45,7 +45,7 @@ $version='$Revision$';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 $error=0;
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 686beac8aaa..cb46df3d6f0 100644
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_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/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 $error=0;
 
diff --git a/test/UserTest.php b/test/UserTest.php
index 1c21c94e8ee..5cb38c2b0a1 100644
--- a/test/UserTest.php
+++ b/test/UserTest.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/user.class.php';
+require_once dirname(__FILE__).'/../htdocs/user/class/user.class.php';
 
 if (empty($user->id))
 {
-- 
GitLab