Deleted old trunk code

4 files changed, 0 insertions, 280 deletions

diff --git a/ogs/gridserver/gridserver_config.inc.php b/ogs/gridserver/gridserver_config.inc.php
deleted file mode 100644
index 98ebed3..0000000
--- a/ogs/gridserver/gridserver_config.inc.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?
-// All the grid server specific stuff lives here
-
-// What we send to authenticate to the user/login server
-$userserver_sendkey="1234";
-
-// What we expect to get back from the user/login server
-$userserver_recvkey="1234";
-
-$sim_recvkey = "1234";
-$sim_sendkey = "1234";
-
-$grid_home = "/ogs/gridserver/";
-?>
diff --git a/ogs/gridserver/index.php b/ogs/gridserver/index.php
deleted file mode 100644
index f7754c6..0000000
--- a/ogs/gridserver/index.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?
-error_reporting(E_ALL); // yes, we remember this from the login server, don't we boys and girls? don't kill innocent XML-RPC!
-
-// these files are soooo common..... (to the grid)
-include("../common/xmlrpc.inc.php");
-include("../common/database.inc.php");
-include("../common/grid_config.inc.php");
-include("../common/util.inc.php");
-
-include("gridserver_config.inc.php"); // grid server specific config stuff
-
-function get_sim_info($args) {
-    global $dbhost,$dbuser,$dbpasswd,$dbname;
-    global $userserver_sendkey, $userserver_recvkey;
-
-    // First see who's talking to us, if key is invalid then send an invalid one back and nothing more
-    if($args['authkey']!=$userserver_recvkey) {
-        return Array(
-            'authkey' => 'I can play the bad key trick too you know',
-            'login' => 'false'
-        );
-    }
-
-    // if we get to here, the key is valid, give that login server what it wants!
-
-    $link = mysql_connect($dbhost,$dbuser,$dbpasswd)
-     OR die("Unable to connect to database");
-     
-     mysql_select_db($dbname)
-      or die("Unable to select database");
-
-    $region_handle = $args['region_handle'];
-    $query = "SELECT * FROM region_profiles WHERE region_handle='$region_handle'";
-    $result = mysql_query($query);
-    
-    return mysql_fetch_assoc($result);
-}
-
-function get_session_info($args) {
-    global $dbhost,$dbuser,$dbpasswd,$dbname;
-    global $sim_sendkey, $sim_recvkey;
-
-    // authkey, session-id, agent-id
-        
-    // First see who's talking to us, if key is invalid then send an invalid one back and nothing more
-    if($args[0]!=$sim_recvkey) {
-        return Array(
-            'authkey' => "I can play the bad key trick too you know" 
-        );
-    }
-
-    $link = mysql_connect($dbhost,$dbuser,$dbpasswd)
-     OR die("Unable to connect to database");
-     
-     mysql_select_db($dbname)
-      or die("Unable to select database");
-
-    $session_id = $args[1];
-    $agent_id = $args[2];
-    
-    $query = "SELECT * FROM sessions WHERE session_id = '$session_id' AND agent_id='$agent_id' AND session_active=1";
-    $result = mysql_query($query);
-    if(mysql_num_rows($result)>0) {
-        $info=mysql_fetch_assoc($result);
-        $circuit_code = $info['circuit_code'];
-        $secure_session_id=$info['secure_session_id'];
-
-        $query = "SELECT * FROM local_user_profiles WHERE userprofile_LLUUID='$agent_id'";
-        $result=mysql_query($query);
-        $userinfo=mysql_fetch_assoc($result);
-        $firstname=$userinfo['profile_firstname'];
-        $lastname=$userinfo['profile_lastname'];
-        $agent_id=$userinfo['userprofile_LLUUID'];
-        return Array(
-            'authkey' => $sim_sendkey,
-            'circuit_code' => $circuit_code,
-            'agent_id' => $agent_id,
-            'session_id' => $session_id,
-            'secure_session_id' => $secure_session_id,
-            'firstname' => $firstname,
-            'lastname' => $lastname
-        );
-    }
-}
-
-function check_loggedin($args) {
-    global $dbhost,$dbuser,$dbpasswd,$dbname;
-    global $userserver_sendkey, $userserver_recvkey;
-        
-    // First see who's talking to us, if key is invalid then send an invalid one back and nothing more
-    if($args['authkey']!=$userserver_recvkey) {
-        return Array(
-            'authkey' => "I can play the bad key trick too you know" 
-        );
-    }
-
-    // if we get to here, the key is valid, give that login server what it wants!
-
-    $link = mysql_connect($dbhost,$dbuser,$dbpasswd)
-     OR die("Unable to connect to database");
-     
-     mysql_select_db($dbname)
-      or die("Unable to select database");
-
-    $userprofile_LLUUID = $args['userprofile_LLUUID'];
-    $query = "SELECT * FROM sessions WHERE agent_id='$userprofile_LLUUID' AND session_active=1";
-    $result = mysql_query($query);
-
-    if(mysql_num_rows($result)>1) {
-        return Array(
-            'authkey' => $userserver_sendkey,
-            'logged_in' => 1
-        );
-    } else {
-        return Array(
-            'authkey' => $userserver_sendkey,
-            'logged_in' => 0
-        );
-    }
-}
-
-function create_session($args) {
-    global $dbhost,$dbuser,$dbpasswd,$dbname;
-    global $userserver_sendkey, $userserver_recvkey;
-
-    // First see who's talking to us, if key is invalid then send an invalid one back and nothing more
-    if($args['authkey']!=$userserver_recvkey) {
-        return Array(
-            'authkey' => "I can play the bad key trick too you know" 
-        );
-    }
-
-    // if we get to here, the key is valid, give that login server what it wants!
-
-    $link = mysql_connect($dbhost,$dbuser,$dbpasswd)
-     OR die("Unable to connect to database");
-     
-     mysql_select_db($dbname)
-      or die("Unable to select database");
-
-    // yes, secure_sessionid should be different, i know...
-    $query = "SELECT value FROM Grid_settings WHERE setting='highest_LLUUID'";
-    $result = mysql_query($query);
-    $row = mysql_fetch_array($result);
-    $highest_LLUUID = $row['value'];
-    $newsession_id=inc_lluuid($highest_LLUUID);
-    $secure_session_id=inc_lluuid($newsession_id);
-    
-    $query="UPDATE Grid_settings SET value='$secure_session_id' WHERE setting='highest_LLUUID' LIMIT 1";
-    $result=mysql_query($query);
-    
-    $userprofile_LLUUID=$args['userprofile_LLUUID'];
-    $current_location=$args['current_location'];
-    $remote_ip=$args['remote_ip'];
-    $query="INSERT INTO sessions(session_id,secure_session_id,agent_id,session_start,session_active,current_location,remote_ip) VALUES('$newsession_id','$secure_session_id','$userprofile_LLUUID',NOW(),1,'$current_location','$remote_ip')";
-    $result=mysql_query($query);
-    if(!isset($result)) {
-        die();
-    }
-    return Array(
-        'authkey' => $userserver_sendkey,
-        'session_id' => $newsession_id,
-        'secure_session_id' => $secure_session_id
-    );    
-}
-
-$server=new IXR_Server(
-    Array(
-        'check_session_loggedin' => 'check_loggedin',
-        'create_session' => 'create_session',
-        'get_sim_info' => 'get_sim_info',
-        'get_session_info' => 'get_session_info'
-    )
-);
-
-?>
\ No newline at end of file
diff --git a/ogs/gridserver/usersessions/.htaccess b/ogs/gridserver/usersessions/.htaccess
deleted file mode 100644
index 3b76a74..0000000
--- a/ogs/gridserver/usersessions/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-Options +FollowSymlinks
-
-RewriteEngine on
-RewriteOptions MaxRedirects=1
-RewriteRule .* index.php  [L]
diff --git a/ogs/gridserver/usersessions/index.php b/ogs/gridserver/usersessions/index.php
deleted file mode 100644
index e7a3817..0000000
--- a/ogs/gridserver/usersessions/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?
-// DIRTY HACK ALERT!!!!!!!!!!!!!
-// The following code shows the vital importance of the r69 revision of the original gareth/ branch
-
-
-// This file parses URLs of the format:
-// usersessions/key/userid/data
-// where key is the key to authenticate with the grid, userid is the user's LLUUID and data is the data about the user's session being requested
-// if the data requested is left out, an XML response will be sent
-
-error_reporting(E_ALL); // Remember kids, PHP errors kill XML-RPC responses and REST too! will the slaughter ever end?
-
-include("../gridserver_config.inc.php");
-include("../../common/database.inc.php");
-include("../../common/util.inc.php");
-
-// Parse out the parameters from the URL
-$params = str_replace($grid_home,'', $_SERVER['REQUEST_URI']);
-$params = str_replace("index.php/","",$params);
-$params = split('/',$params);
-
-// Die if the key doesn't match
-if($params[1]!=$sim_recvkey) {
-    die();
-}
-
-$link = mysql_connect($dbhost,$dbuser,$dbpasswd)
- OR die("Unable to connect to database");
-
-mysql_select_db($dbname)
- or die("Unable to select database");
-
-$agent_id = strtolower($params[2]);
-$query = "SELECT * FROM sessions WHERE agent_id='$agent_id' AND session_active=1";
-
-// if we have 4 params, then param 4 is the command
-if(count($params)==4) {
-        $cmd=$params['3'];
-} else if(count($params)==5) {
-        $circuit_code=$params[3];
-        $cmd=$params[4];              // otherwise, 5 is the command and 4 is the circuit code
-}
-
-$result = mysql_query($query);
-if(mysql_num_rows($result)>0) {
-        $info=mysql_fetch_assoc($result);
-        $circuit_code = $info['circuit_code'];
-        if($circuit_code == 0) $circuit_code=$params['4'];
-        $secure_session_id=$info['secure_session_id'];
-        $session_id=$info['session_id'];
-
-        $query = "SELECT * FROM local_user_profiles WHERE userprofile_LLUUID='$agent_id'";
-        $result=mysql_query($query);
-        $userinfo=mysql_fetch_assoc($result);
-        $firstname=$userinfo['profile_firstname'];
-        $lastname=$userinfo['profile_lastname'];
-        $agent_id=$userinfo['userprofile_LLUUID'];
-        $exists=1;
-} else {
-        $exists=0;
-}
-
-// if only 3 params, assume we are sending an XML response
-if(count($params)==3) {
-        output_xml_block("usersession",Array(
-            'authkey' => $sim_sendkey,
-            'circuit_code' => $circuit_code,
-            'agent_id' => $agent_id,
-            'session_id' => $session_id,
-            'secure_session_id' => $secure_session_id,
-            'firstname' => $firstname,
-            'lastname' => $lastname
-        ));
-}
-
-switch($cmd) {
-        case 'exists':
-                echo $exists;
-        break;
-        case 'delete':
-                $query = "UPDATE sessions SET session_active=0, session_end=NOW() WHERE agent_id='$agent_id' LIMIT 1";
-                $deleteresult = mysql_query($query);
-        break;
-}
-?>