diff --git a/core/trunk/core/class/SecurityControler.php b/core/trunk/core/class/SecurityControler.php
index 0ab6f9c593193c5be16994f835e99a8234073551..c8f3c00e5f7571c53415173cd092cd6c36aae5b7 100644
--- a/core/trunk/core/class/SecurityControler.php
+++ b/core/trunk/core/class/SecurityControler.php
@@ -39,6 +39,7 @@ define("_CODE_INCREMENT",1);
// Loads the required class
try {
+ require_once("core/core_tables.php");
require_once("core/class/class_db.php");
require_once("core/class/users_controler.php");
require_once("core/class/Security.php");
@@ -77,7 +78,7 @@ class SecurityControler
$db = new dbquery();
$db->connect();
- self::$security_table = $_SESSION['tablename']['security'];
+ self::$security_table = SECURITY_TABLE;
self::$db=$db;
}
diff --git a/core/trunk/core/class/ServiceControler.php b/core/trunk/core/class/ServiceControler.php
index b156e0b0685a85ba8afde3305d1851c75756dd1e..bc4ee8f646b3de507d6baa83dce049e4adb765a3 100644
--- a/core/trunk/core/class/ServiceControler.php
+++ b/core/trunk/core/class/ServiceControler.php
@@ -71,7 +71,7 @@ class ServiceControler
$db = new dbquery();
$db->connect();
- self::$usergroups_services_table = $_SESSION['tablename']['usergroup_services'];
+ self::$usergroups_services_table = USERGROUPS_SERVICES_TABLE;
self::$db=$db;
}
diff --git a/core/trunk/core/class/class_core_tools.php b/core/trunk/core/class/class_core_tools.php
index d8482a9e1426419cf5848d6d69b016b576a03b99..8d0d4f6e95f21f6518685f63df0c47b67982fca2 100644
--- a/core/trunk/core/class/class_core_tools.php
+++ b/core/trunk/core/class/class_core_tools.php
@@ -382,6 +382,7 @@ class core_tools extends functions
{
$tmp .= "&reinit=true";
}
+ $tmp = htmlentities ( $tmp,ENT_COMPAT, 'UTF-8', true); // Encodes
?>
<li id="<?php echo $menu[$i]['style'];?>" onmouseover="this.className='on';" onmouseout="this.className='';"><a href="#" onclick="window.open('<?php echo $tmp;?>', '<?php if($menu[$i]['target'] <> ''){echo $menu[$i]['target'];}else{echo '_self';}?>');"><span><span class="menu_item"><?php echo trim($menu[$i]['libconst']);?></span></span></a></li>
<?php
@@ -390,9 +391,9 @@ class core_tools extends functions
// Menu items always displayed
echo '<li id="account" onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">
- <a href="'.$_SESSION['config']['businessappurl'].'index.php?page=modify_user&admin=users&reinit=true"><span><span class="menu_item">'._MY_INFO.'</span></span></a></li>';
+ <a href="'.$_SESSION['config']['businessappurl'].'index.php?page=modify_user&admin=users&reinit=true"><span><span class="menu_item">'._MY_INFO.'</span></span></a></li>';
echo '<li id="logout" onmouseover="this.className=\'on\';" onmouseout="this.className=\'\';">
- <a href="'.$_SESSION['config']['businessappurl'].'index.php?display=true&page=logout&coreurl='.$_SESSION['config']['coreurl'].'&logout=true"><span><span class="menu_item">'._LOGOUT.'</span></span></a></li>';
+ <a href="'.$_SESSION['config']['businessappurl'].'index.php?display=true&page=logout&coreurl='.$_SESSION['config']['coreurl'].'&logout=true"><span><span class="menu_item">'._LOGOUT.'</span></span></a></li>';
}
/**
@@ -1331,7 +1332,7 @@ class core_tools extends functions
{
$_SESSION['error'] = _SERVICE.' '._UNKNOWN.' : '.$id_service;
?>
- <script type="text/javascript" language="javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
+ <script type="text/javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
<?php
exit();
}
@@ -1365,7 +1366,7 @@ class core_tools extends functions
{
$_SESSION['error'] = _ADMIN_SERVICE.' '._UNKNOWN;
?>
- <script type="text/javascript" language="javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
+ <script type="text/javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
<?php
exit();
}
@@ -1383,7 +1384,7 @@ class core_tools extends functions
$label = $this->retrieve_label_service($id_service);
$_SESSION['error'] = _NO_RIGHTS_ON.' : '.$label;
?>
- <script type="text/javascript" language="javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
+ <script type="text/javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
<?php
exit();
}
@@ -1433,7 +1434,7 @@ class core_tools extends functions
{
$_SESSION['error'] = _SERVICE.' '._UNKNOWN.' : '.$id_service;
?>
- <script type="text/javascript" language="javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
+ <script type="text/javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
<?php
exit();
@@ -1468,7 +1469,7 @@ class core_tools extends functions
{
$_SESSION['error'] = _SERVICE.' '._UNKNOWN.' : '.$id_service;
?>
- <script type="text/javascript" language="javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
+ <script type="text/javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
<?php
exit();
@@ -1487,7 +1488,7 @@ class core_tools extends functions
$label = $this->retrieve_label_service($id_service);
$_SESSION['error'] = _NO_RIGHTS_ON.' : '.$label;
?>
- <script type="text/javascript" language="javascript">window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
+ <script type="text/javascript" >window.top.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php';</script>
<?php
exit();
}
diff --git a/core/trunk/core/class/class_functions.php b/core/trunk/core/class/class_functions.php
index 6e1c72752726d23a6d42aa268af139c4966485ed..a5159c235478d56ffdb81ba3f311b8c437a0ea03 100644
--- a/core/trunk/core/class/class_functions.php
+++ b/core/trunk/core/class/class_functions.php
@@ -496,7 +496,7 @@ class functions
{
if(empty($_SESSION['location_bar']['level2']['path']))
{
- ?><script language="javascript" type="text/javascript">
+ ?><script type="text/javascript">
var bar = window.document.getElementById('ariane');
if(bar != null)
{
@@ -512,7 +512,7 @@ class functions
{
if(empty($_SESSION['location_bar']['level3']['path']))
{
- ?><script language="javascript" type="text/javascript">
+ ?><script type="text/javascript">
var bar = window.document.getElementById('ariane');
if(bar != null)
{
@@ -530,7 +530,7 @@ class functions
{
if(empty($_SESSION['location_bar']['level4']['path']))
{
- ?><script language="javascript" type="text/javascript">
+ ?><script type="text/javascript">
var bar = window.document.getElementById('ariane');
if(bar != null)
{
@@ -553,7 +553,7 @@ class functions
}
else
{
- ?><script language="javascript" type="text/javascript">
+ ?><script type="text/javascript">
var bar = window.document.getElementById('ariane');
if(bar != null)
{
diff --git a/core/trunk/core/class/usergroups.php b/core/trunk/core/class/usergroups.php
index f9b3f564106d16bc85adbe6699d62e6963112ec3..c2ed55f138e4c2c7a977f2bf00143081e1268bc5 100644
--- a/core/trunk/core/class/usergroups.php
+++ b/core/trunk/core/class/usergroups.php
@@ -19,7 +19,7 @@
*/
/**
-* @brief Contains the Usergroup Object (herits of the BaseObject class)
+* @brief Contains the usergroups Object (herits of the BaseObject class)
*
*
* @file
@@ -38,14 +38,14 @@ try {
/**
-* @brief Usergroup Object, herits of the BaseObject class
+* @brief usergroups Object, herits of the BaseObject class
*
* @ingroup core
*/
class usergroups extends BaseObject
{
/**
- * Returns the string representing the Usergroup object
+ * Returns the string representing the usergroups object
*
* @return string The usergroup label (group_desc field in the usergroups table)
*/
diff --git a/core/trunk/core/class/usergroups_controler.php b/core/trunk/core/class/usergroups_controler.php
index 0dc1ff4c8b2ea39715bcbd3ca82a1f98704e5493..b8f9ac142a2ddf541b3d624e0ac2372481bce0e7 100644
--- a/core/trunk/core/class/usergroups_controler.php
+++ b/core/trunk/core/class/usergroups_controler.php
@@ -236,7 +236,6 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
* Saves in the database a usergroups object
*
* @param $group usergroups object to be saved
- * @param $mode string Saving mode : add or up
* @return bool true if the save is complete, false otherwise
*/
public function save($group)
diff --git a/core/trunk/core/class/users.php b/core/trunk/core/class/users.php
index 030a6b34bc33cf9492d44d04c69e043cec215b4a..403a5f07caaafb5bb7af2d20dc4dbf2d5e67a925 100644
--- a/core/trunk/core/class/users.php
+++ b/core/trunk/core/class/users.php
@@ -19,7 +19,7 @@
*/
/**
-* @brief Contains the User Object (herits of the BaseObject class)
+* @brief Contains the users Object (herits of the BaseObject class)
*
*
* @file
@@ -37,7 +37,7 @@ try {
}
/**
-* @brief User Object, herits of the BaseObject class
+* @brief users Object, herits of the BaseObject class
*
* @ingroup core
*/
@@ -45,7 +45,7 @@ class users extends BaseObject
{
/**
- * Returns the string representing the User object
+ * Returns the string representing the users object
*
* @return string The user label (lastname, firstname and user_id)
*/
diff --git a/core/trunk/core/class/users_controler.php b/core/trunk/core/class/users_controler.php
index ef882d42f63499044988026992cd818849ec92d2..bdf7d36850b1e347a6f649869c4b8e965fc2554b 100644
--- a/core/trunk/core/class/users_controler.php
+++ b/core/trunk/core/class/users_controler.php
@@ -19,7 +19,7 @@
*/
/**
-* @brief Contains the controler of the User Object (create, save, modify, etc...)
+* @brief Contains the controler of the users object (create, save, modify, etc...)
*
*
* @file
@@ -47,10 +47,10 @@ try {
}
/**
-* @brief Controler of the User Object
+* @brief Controler of the users object
*
*<ul>
-* <li>Get an user object from an id</li>
+* <li>Get an users object from an id</li>
* <li>Save in the database a user</li>
* <li>Manage the operation on the users related tables in the database (insert, select, update, delete)</li>
*</ul>
@@ -59,12 +59,12 @@ try {
class users_controler extends ObjectControler implements ObjectControlerIF
{
/**
- * Returns an User Object based on a user identifier
+ * Returns an users object based on a user identifier
*
* @param $user_id string User identifier
* @param $comp_where string where clause arguments (must begin with and or or)
* @param $can_be_disabled bool if true gets the user even if it is disabled in the database (false by default)
- * @return User object with properties from the database or null
+ * @return users object with properties from the database or null
*/
public function get($user_id, $comp_where = '', $can_be_disabled = false)
{
@@ -108,10 +108,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
}
/**
- * Saves in the database a User object
+ * Saves in the database a users object
*
- * @param $group User object to be saved
- * @param $mode string Saving mode : add or up
+ * @param $group users object to be saved
* @return bool true if the save is complete, false otherwise
*/
public function save($user)
@@ -130,9 +129,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
}
/**
- * Inserts in the database (users table) a User object
+ * Inserts in the database (users table) a users object
*
- * @param $user User object
+ * @param $user users object
* @return bool true if the insertion is complete, false otherwise
*/
private function insert($user)
@@ -141,9 +140,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
}
/**
- * Updates a user in the database (users table) with a User object
+ * Updates a user in the database (users table) with a users object
*
- * @param $user User object
+ * @param $user users object
* @return bool true if the update is complete, false otherwise
*/
private function update($user)
@@ -247,7 +246,7 @@ class users_controler extends ObjectControler implements ObjectControlerIF
/**
* Disables a given user
*
- * @param $user Object User Object
+ * @param $user users object
* @return bool true if the disabling is complete, false otherwise
*/
public function disable($user)
@@ -260,7 +259,7 @@ class users_controler extends ObjectControler implements ObjectControlerIF
/**
* Enables a given user
*
- * @param $user bject User Object
+ * @param $user users object
* @return bool true if the enabling is complete, false otherwise
*/
public function enable($user)
diff --git a/core/trunk/core/core_tables.php b/core/trunk/core/core_tables.php
index 63ddd95ee5f1261b1b36f8a1a7ab9c8fd24d5d4d..271d325bcc45381175b9e3e3640acb165aa30d37 100644
--- a/core/trunk/core/core_tables.php
+++ b/core/trunk/core/core_tables.php
@@ -11,6 +11,7 @@ define( 'HISTORY_BATCH_TABLE', 'history_batch');
define( 'PARAM_TABLE', 'parameters');
define( 'RESGROUPS_TABLE', 'resgroups');
define( 'RESGROUP_CONTENT_TABLE', 'resgroup_content');
+define( 'SECURITY_TABLE', 'security');
define( 'STATUS_TABLE', 'status');
define( 'USERGROUPS_TABLE', 'usergroups');
define( 'USERGROUP_CONTENT_TABLE', 'usergroup_content');