aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-26 18:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
kaetemi 2014-09-10 05:28:14 +02:00
commit d02bd5e7b6
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/web/public_php/login/config.php
View file

@ -21,7 +21,6 @@ $DBName = $cfg['db']['shard']['name'];
$RingDBUserName = $cfg['db']['ring']['user'];
$RingDBPassword = $cfg['db']['ring']['pass'];
$RingDBName = $cfg['db']['ring']['name'];
// If true, the server will add automatically unknown user in the database
// (in nel.user, nel.permission, ring.ring_user and ring.characters

4
code/web/public_php/ring/edit_session.php
View file

@ -16,10 +16,10 @@
$domainInfo = getDomainInfo($domainId);
global $DBHost, $RingDBUserName, $RingDBPassword, $RingDBName;
global $DBHost, $RingDBUserName, $RingDBPassword;
$link = mysqli_connect($DBHost, $RingDBUserName, $RingDBPassword) or die ("Can't connect to database host:$DBHost user:$RingDBUserName");
mysqli_select_db($link, $RingDBName) or die ("Can't access to the db dbname:$RingDBName");
mysqli_select_db($link, $domainInfo['ring_db_name']) or die ("Can't access to the db dbname:" . $domainInfo['ring_db_name']);
// Find out if the character has an open editing session
$query = "SELECT session_id, state ";

4
code/web/public_php/ring/invite_pioneer.php
View file

@ -42,10 +42,10 @@
if (isset($_POST["execute"]))
{
// lookup in the database to convert character name into
global $DBHost, $RingDBUserName, $RingDBPassword, $RingDBName;
global $DBHost, $RingDBUserName, $RingDBPassword;
$link = mysqli_connect($DBHost, $RingDBUserName, $RingDBPassword) or die ("Can't connect to database host:$DBHost user:$RingDBUserName");
mysqli_select_db($link, $RingDBName) or die ("Can't access to the table dbname:$RingDBName");
mysqli_select_db($link, $domainInfo['ring_db_name']) or die ("Can't access to the table dbname:" . $domainInfo['ring_db_name']);
// extract the character that have the specified name
$charName = mysqli_real_escape_string($link, $_POST['charName']);

8
code/web/public_php/ring/session_tools.php
View file

@ -107,14 +107,14 @@ function inviteOwnerInSession($charId, $domainId, $sessionId)
$RSMHost = $addr[0];
$RSMPort = $addr[1];
global $rsmProxy, $rsmSkel, $userId, $charId, $callbackClient, $RingDBName, /*$SessionId,*/ $SessionToolsResult;
global $rsmProxy, $rsmSkel, $userId, $charId, $callbackClient, /*$SessionId,*/ $SessionToolsResult;
global $DBHost, $RingDBUserName, $RingDBPassword;
$SessionId = $sessionId;
$DomainId = $domainId;
$link = mysqli_connect($DBHost, $RingDBUserName, $RingDBPassword) or die("Can't connect to ring database");
mysqli_select_db($link, $RingDBName) or die ("Can't access to the db dbname:$RingDBName");
mysqli_select_db($link, $domainInfo['ring_db_name']) or die ("Can't access to the db dbname:" . $domainInfo['ring_db_name']);
$sessionId = (int) $sessionId;
$query = "select session_type from sessions where session_id=".$sessionId;
@ -146,7 +146,7 @@ class StartSessionCb extends CRingSessionManagerWeb
{
function invokeResult($userId, $resultCode, $resultString)
{
global $rsmProxy, $rsmSkel, $userId, $charId, $callbackClient, $RingDBName, $SessionId, $DomainId, $SessionToolsResult;
global $rsmProxy, $rsmSkel, $userId, $charId, $callbackClient, $SessionId, $DomainId, $SessionToolsResult;
if ($resultCode != 0)
{
@ -170,7 +170,7 @@ class InviteOwnerCb extends CRingSessionManagerWeb
{
function invokeResult($userId, $resultCode, $resultString)
{
global $rsmProxy, $rsmSkel, $userId, $charId, $callbackClient, $RingDBName, $SessionId, $DomainId, $SessionToolsResult;
global $rsmProxy, $rsmSkel, $userId, $charId, $callbackClient, $SessionId, $DomainId, $SessionToolsResult;
// jump back to main page
echo "<h1>The session ".$SessionId." have been started</h1>";

6
code/web/public_php/tools/validate_cookie.php
View file

@ -16,7 +16,9 @@
function validateCookie(&$userId, &$domainId, &$charId)
{
global $DBHost, $RingDBUserName, $RingDBPassword, $RingDBName, $AcceptUnknownUser;
$domainInfo = getDomainInfo($domainId);
global $DBHost, $RingDBUserName, $RingDBPassword, $AcceptUnknownUser;
if (!isset($_COOKIE["ryzomId"]))
{
@ -41,7 +43,7 @@
// check the cookie in the database
$link = mysqli_connect($DBHost, $RingDBUserName, $RingDBPassword) or die ("Can't connect to database host:$DBHost user:$RingDBUserName");
mysqli_select_db($link, $RingDBName) or die ("Can't access to the table dbname:$RingDBName");
mysqli_select_db($link, $domainInfo['ring_db_name']) or die ("Can't access to the table dbname:" . $domainInfo['ring_db_name']);
$cookie = mysqli_real_escape_string($link, $cookie);
$query = "SELECT user_id, current_status, current_domain_id FROM ring_users where cookie='$cookie'";