forked from Wavyzz/dolibarr
according to new tree directory
This commit is contained in:
@@ -497,7 +497,7 @@ class Adherent extends CommonObject
|
|||||||
{
|
{
|
||||||
if ($this->user_id > 0 && ! $nosyncuser)
|
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");
|
dol_syslog("Adherent::update update linked user");
|
||||||
|
|
||||||
@@ -766,7 +766,7 @@ class Adherent extends CommonObject
|
|||||||
|
|
||||||
if ($this->user_id && ! $nosyncuser)
|
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
|
// This member is linked with a user, so we also update users informations
|
||||||
// if this is an update.
|
// if this is an update.
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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."/user/group/usergroup.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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."/user/group/usergroup.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
require("../../main.inc.php");
|
require("../../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.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."/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/cactioncomm.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/html.formactions.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/html.formactions.class.php");
|
||||||
|
|||||||
@@ -1954,7 +1954,7 @@ class Form
|
|||||||
{
|
{
|
||||||
if ($selected)
|
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();
|
//$this->load_cache_contacts();
|
||||||
//print $this->cache_contacts[$selected];
|
//print $this->cache_contacts[$selected];
|
||||||
$theuser=new User($this->db);
|
$theuser=new User($this->db);
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ if ($_POST["action"] == "set" || preg_match('/upgrade/i',$_POST["action"]))
|
|||||||
$conf->setValues($db);
|
$conf->setValues($db);
|
||||||
|
|
||||||
// Create user
|
// 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=new User($db);
|
||||||
$createuser->id=0;
|
$createuser->id=0;
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Chargement des includes principaux de librairies communes
|
// 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('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('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");
|
if (! defined('NOREQUIREDB')) require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require("../main.inc.php");
|
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."/user/group/usergroup.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.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/images.lib.php");
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.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");
|
$langs->load("users");
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
require("../main.inc.php");
|
require("../main.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.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');
|
||||||
|
|
||||||
$action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:"");
|
$action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:"");
|
||||||
$id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:"");
|
$id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:"");
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ $version='$Revision$';
|
|||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.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");
|
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
|
||||||
|
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ $version='$Revision$';
|
|||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.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;
|
$error=0;
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ global $conf,$user,$langs,$db;
|
|||||||
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
|
//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
|
||||||
require_once 'PHPUnit/Framework.php';
|
require_once 'PHPUnit/Framework.php';
|
||||||
require_once dirname(__FILE__).'/../htdocs/master.inc.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))
|
if (empty($user->id))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user