From ff5d7ee8245a2e2844cfcf6212390901860b7333 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 23 Mar 2010 21:17:18 +0000 Subject: [PATCH] move file class user to user directory --- htdocs/adherents/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/fiche.php | 2 +- htdocs/user/info.php | 2 +- htdocs/user/note.php | 2 +- htdocs/{ => user}/user.class.php | 0 scripts/company/sync_contacts_dolibarr2ldap.php | 2 +- scripts/user/sync_users_dolibarr2ldap.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename htdocs/{ => user}/user.class.php (100%) diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php index 94a8170cd0a..dc82864fb41 100644 --- a/htdocs/adherents/adherent.class.php +++ b/htdocs/adherents/adherent.class.php @@ -497,7 +497,7 @@ class Adherent extends CommonObject { if ($this->user_id > 0 && ! $nosyncuser) { - require_once(DOL_DOCUMENT_ROOT."/user.class.php"); + require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); dol_syslog("Adherent::update update linked user"); @@ -767,7 +767,7 @@ class Adherent extends CommonObject if ($this->user_id && ! $nosyncuser) { - require_once(DOL_DOCUMENT_ROOT."/user.class.php"); + require_once(DOL_DOCUMENT_ROOT."/user/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 e89992464b5..6a2b02cea30 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.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/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 613948cb111..c31877a637c 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.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/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 dc67576c037..39f961e7f4b 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -29,7 +29,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/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 2fbabad6058..8d45dc594e5 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -1924,7 +1924,7 @@ class Form { if ($selected) { - require_once(DOL_DOCUMENT_ROOT ."/user.class.php"); + require_once(DOL_DOCUMENT_ROOT ."/user/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 98d779cff51..6cb62014f26 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.class.php"); + include_once(DOL_DOCUMENT_ROOT ."/user/user.class.php"); $createuser=new User($db); $createuser->id=0; diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 6f7941d15ec..ccf1083cb55 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -215,7 +215,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) } // Chargement des includes principaux de librairies communes -if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user.class.php"); // Need 500ko memory +if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/user.class.php"); // Need 500ko memory if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/translate.class.php"); if (! defined('NOREQUIRESOC')) require_once(DOL_DOCUMENT_ROOT ."/societe.class.php"); if (! defined('NOREQUIREDB')) require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 599adc55ff7..47939b38d91 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.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/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 55c0831034c..32f49551692 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.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); $langs->load("users"); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index b1e9947b7f4..99081a1f9d0 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.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/user/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/htdocs/user.class.php b/htdocs/user/user.class.php similarity index 100% rename from htdocs/user.class.php rename to htdocs/user/user.class.php diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index d14734ab583..27fea75014b 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.php"); -require_once(DOL_DOCUMENT_ROOT."/user.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/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 d4aff47f4b1..9f6964ab3ec 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.class.php"); +require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); $error=0;