From c6c06efb55a1d7944fa26f012eaec3727801bf07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Nana?= <sebastien.nana@maarch.org>
Date: Mon, 28 Mar 2011 15:47:52 +0000
Subject: [PATCH] Fix : conformity with coding standards in progress
---
core/trunk/core/class/class_security.php | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php
index f9533750230..f0de7197c95 100644
--- a/core/trunk/core/class/class_security.php
+++ b/core/trunk/core/class/class_security.php
@@ -47,6 +47,11 @@ require_once 'core/where_targets.php';
require_once 'core/class/users_controler.php';
require_once 'apps/' . $_SESSION['config']['app_id']
. '/class/class_business_app_tools.php';
+require_once 'core/class/usergroups_controler.php';
+require_once 'core/class/ServiceControler.php';
+require_once 'apps' . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
+ . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR
+ . 'class_business_app_tools.php';
//require_once('lib/FirePHP/Init.php');
@@ -105,8 +110,6 @@ class security extends dbquery
if (isset($user)) {
if ($user->__get('enabled') == 'Y') {
- require_once 'core/class/usergroups_controler.php';
- require_once 'core/class/ServiceControler.php';
$ugc = new usergroups_controler();
$sec_controler = new SecurityControler();
$serv_controler = new ServiceControler();
@@ -234,8 +237,6 @@ class security extends dbquery
{
if($user->__get('enabled') == "Y")
{
- require_once("core/class/usergroups_controler.php");
- require_once("core/class/ServiceControler.php");
$serv_controler = new ServiceControler();
$_SESSION['user']['change_pass'] = $user->__get('change_password');
$_SESSION['user']['UserId'] = $user->__get('user_id');
@@ -264,8 +265,6 @@ class security extends dbquery
$_SESSION['user']['security'] = $tmp['security'];
$serv_controler->loadEnabledServices();
- require_once("apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_business_app_tools.php");
-
$business_app_tools = new business_app_tools();
$core_tools = new core_tools();
$business_app_tools->load_app_var_session($array);
--
GitLab