Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with default

Browse source 
--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2013-07-04 21:12:34 +02:00
commit 25f5bccfe6
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/ryzom/tools/server/admin/common.php
View file

@ -69,7 +69,7 @@
{ {
$nel_user = null; $nel_user = null;
nt_auth_stop_session(); nt_auth_stop_session();
nt_common_redirect('index.php'); nt_common_redirect('');
exit(); exit();
} }
elseif (isset($NELTOOL['SESSION_VARS']['nelid']) && !empty($NELTOOL['SESSION_VARS']['nelid'])) elseif (isset($NELTOOL['SESSION_VARS']['nelid']) && !empty($NELTOOL['SESSION_VARS']['nelid']))
@ -138,9 +138,12 @@
if (isset($nel_user['new_login'])) if (isset($nel_user['new_login']))
{ {
$default_user_application_id = 0; $default_user_application_id = 0;
if ($nel_user['user_default_application_id'] > 0) $default_user_application_id = $nel_user['user_default_application_id']; if (isset( $nel_user['user_default_application_id']) &&($nel_user['user_default_application_id'] > 0)) {
elseif ($nel_user['group_default_application_id'] > 0) $default_user_application_id = $nel_user['group_default_application_id']; $default_user_application_id = $nel_user['user_default_application_id'];
}elseif (isset( $nel_user['group_default_application_id']) &&($nel_user['group_default_application_id'] > 0)) {
$default_user_application_id = $nel_user['group_default_application_id'];
}
if ($default_user_application_id > 0) if ($default_user_application_id > 0)
{ {
nt_common_add_debug("default application : user:". $nel_user['user_default_application_id'] ." group:". $nel_user['group_default_application_id']); nt_common_add_debug("default application : user:". $nel_user['user_default_application_id'] ." group:". $nel_user['group_default_application_id']);

4
code/ryzom/tools/server/admin/config.php
View file

@ -9,8 +9,8 @@
define('NELTOOL_DBNAME','nel_tool'); define('NELTOOL_DBNAME','nel_tool');
// site paths definitions // site paths definitions
define('NELTOOL_SITEBASE','http://open.ryzom.com/'); define('NELTOOL_SITEBASE',$_SERVER['PHP_SELF']);
define('NELTOOL_SYSTEMBASE','/home/nevrax/hg/code/ryzom/tools/server/admin/'); define('NELTOOL_SYSTEMBASE',dirname( dirname(__FILE__) ) . '/admin/');
define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/'); define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/');
define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/'); define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/');

2
code/ryzom/tools/server/admin/functions_mysql.php
View file

@ -114,7 +114,7 @@ class sql_db
} }
else else
{ {
return ( $transaction == END_TRANSACTION ) ? true : false; return ( $transaction == 'END_TRANSACTION' ) ? true : false;
} }
} }

4
code/ryzom/tools/server/admin/functions_tool_main.php
View file

@ -1,12 +1,12 @@
<?php <?php
$refresh_rates = array( /* // there values are for debug purposes only $refresh_rates = array(
array('desc' => 'Every 5 secs', array('desc' => 'Every 5 secs',
'secs' => 5, 'secs' => 5,
), ),
array('desc' => 'Every 30 secs', array('desc' => 'Every 30 secs',
'secs' => 30, 'secs' => 30,
),*/ ),
array('desc' => 'Every 1 min.', array('desc' => 'Every 1 min.',
'secs' => 60, 'secs' => 60,
), ),

2
code/ryzom/tools/server/admin/tool_preferences.php
View file

@ -9,7 +9,7 @@
$tpl->assign("tool_v_login", $nel_user['user_name']); $tpl->assign("tool_v_login", $nel_user['user_name']);
$tpl->assign("tool_v_user_id", $nel_user['user_id']); $tpl->assign("tool_v_user_id", $nel_user['user_id']);
$tpl->assign("tool_v_menu", $nel_user['user_menu_style']); $tpl->assign("tool_v_menu", $nel_user['user_menu_style']);
$tpl->assign("tool_v_application", $nel_user['user_default_application_id']); $tpl->assign("tool_v_application", isset($nel_user['user_default_application_id']) ? $nel_user['user_default_application_id']:'') ;
if (isset($NELTOOL['POST_VARS']['tool_form_user_id'])) if (isset($NELTOOL['POST_VARS']['tool_form_user_id']))
{ {

2
code/ryzom/tools/server/www/login/config.php
View file

@ -2,7 +2,7 @@
// This file contains all variables needed by other php scripts // This file contains all variables needed by other php scripts
$LogRelativePath = './'; $LogRelativePath = 'logs/';
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// Variables for nel database access // Variables for nel database access