6 files changed, 199 insertions, 35 deletions

diff --git a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
index c21d7e2..7dd4c51 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
@@ -8,7 +8,12 @@ namespace OpenGrid.Framework.Data.DB4o
 {

     public class DB4oUserData : IUserData

     {

-        DB4oUserManager manager = new DB4oUserManager("userprofiles.yap");

+        DB4oUserManager manager;

+

+        public void Initialise()

+        {

+            manager = new DB4oUserManager("userprofiles.yap");

+        }

 

         public UserProfileData getUserByUUID(LLUUID uuid)

         {

@@ -33,7 +38,7 @@ namespace OpenGrid.Framework.Data.DB4o
         }

 

         public UserAgentData getAgentByUUID(LLUUID uuid)

-        {

+        {   

             try

             {

                 return getUserByUUID(uuid).currentAgent;

@@ -71,5 +76,15 @@ namespace OpenGrid.Framework.Data.DB4o
             return true;

         }

 

+

+        public string getName()

+        {

+            return "DB4o Userdata";

+        }

+

+        public string getVersion()

+        {

+            return "0.1";

+        }

     }

 }

diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index efb6a32..e6d4b49 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{0A563AC1-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Data.MSSQL</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Data.MSSQL</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,22 +61,23 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

+    <Reference Include="System.Data">

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -80,7 +87,7 @@
       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -101,4 +108,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
new file mode 100644
index 0000000..4f35a59
--- /dev/null
+++ b/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
@@ -0,0 +1,68 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenGrid.Framework.Data;

+using libsecondlife;

+

+namespace OpenGrid.Framework.Data.MySQL

+{

+    class MySQLUserData : IUserData

+    {

+        public MySQLManager manager;

+

+        public void Initialise()

+        {

+            manager = new MySQLManager("host", "database", "user", "password", "false");

+        }

+

+        public UserProfileData getUserByName(string name)

+        {

+            return getUserByName(name.Split(' ')[0], name.Split(' ')[1]);

+        }

+

+        public UserProfileData getUserByName(string user, string last)

+        {

+            return new UserProfileData();

+        }

+

+        public UserProfileData getUserByUUID(LLUUID uuid)

+        {

+            return new UserProfileData();

+        }

+

+        public UserAgentData getAgentByName(string name)

+        {

+            return getAgentByName(name.Split(' ')[0], name.Split(' ')[1]);

+        }

+

+        public UserAgentData getAgentByName(string user, string last)

+        {

+            return new UserAgentData();

+        }

+

+        public UserAgentData getAgentByUUID(LLUUID uuid)

+        {

+            return new UserAgentData();

+        }

+

+        public bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount)

+        {

+            return false;

+        }

+

+        public bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item)

+        {

+            return false;

+        }

+

+        public string getName()

+        {

+            return "MySQL Userdata Interface";

+        }

+

+        public string getVersion()

+        {

+            return "0.1";

+        }

+    }

+}

diff --git a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index d9ee212..67cdda6 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Data.MySQL</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,26 +61,27 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

+    <Reference Include="System.Data">

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="MySql.Data.dll" >

+    <Reference Include="MySql.Data.dll">

       <HintPath>..\bin\MySql.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,7 +91,7 @@
       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -94,6 +101,7 @@
     <Compile Include="MySQLManager.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="MySQLUserData.cs" />

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -105,4 +113,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenGrid.Framework.Data/UserData.cs b/OpenGrid.Framework.Data/UserData.cs
index 6b4f2ba..1b37957 100644
--- a/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenGrid.Framework.Data/UserData.cs
@@ -7,18 +7,83 @@ namespace OpenGrid.Framework.Data
 {

     public interface IUserData

     {

-        // Retrieval

-        // User Profiles

+        /// <summary>

+        /// Returns a user profile from a database via their UUID

+        /// </summary>

+        /// <param name="user">The accounts UUID</param>

+        /// <returns>The user data profile</returns>

         UserProfileData getUserByUUID(LLUUID user);

+

+        /// <summary>

+        /// Returns a users profile by searching their username

+        /// </summary>

+        /// <param name="name">The users username</param>

+        /// <returns>The user data profile</returns>

         UserProfileData getUserByName(string name);

+

+        /// <summary>

+        /// Returns a users profile by searching their username parts

+        /// </summary>

+        /// <param name="fname">Account firstname</param>

+        /// <param name="lname">Account lastname</param>

+        /// <returns>The user data profile</returns>

         UserProfileData getUserByName(string fname, string lname);

-        // User Agents

+

+        /// <summary>

+        /// Returns the current agent for a user searching by it's UUID

+        /// </summary>

+        /// <param name="user">The users UUID</param>

+        /// <returns>The current agent session</returns>

         UserAgentData getAgentByUUID(LLUUID user);

+

+        /// <summary>

+        /// Returns the current session agent for a user searching by username

+        /// </summary>

+        /// <param name="name">The users account name</param>

+        /// <returns>The current agent session</returns>

         UserAgentData getAgentByName(string name);

+

+        /// <summary>

+        /// Returns the current session agent for a user searching by username parts

+        /// </summary>

+        /// <param name="fname">The users first account name</param>

+        /// <param name="lname">The users account surname</param>

+        /// <returns>The current agent session</returns>

         UserAgentData getAgentByName(string fname, string lname);

 

-        // Transactional

+        /// <summary>

+        /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)

+        /// </summary>

+        /// <param name="from">The account to transfer from</param>

+        /// <param name="to">The account to transfer to</param>

+        /// <param name="amount">The amount to transfer</param>

+        /// <returns>Successful?</returns>

         bool moneyTransferRequest(LLUUID from, LLUUID to, uint amount);

+

+        /// <summary>

+        /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account.

+        /// </summary>

+        /// <param name="from">User to transfer from</param>

+        /// <param name="to">User to transfer to</param>

+        /// <param name="inventory">Specified inventory item</param>

+        /// <returns>Successful?</returns>

         bool inventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);

+

+        /// <summary>

+        /// Returns the plugin version

+        /// </summary>

+        /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns>

+        string getVersion();

+

+        /// <summary>

+        /// Returns the plugin name

+        /// </summary>

+        /// <returns>Plugin name, eg MySQL User Provider</returns>

+        string getName();

+

+        /// <summary>

+        /// Initialises the plugin (artificial constructor)

+        /// </summary>

+        void Initialise();

     }

 }

diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGrid.Framework.Data/UserProfileData.cs
index 8d72c6b..3d8eec4 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGrid.Framework.Data/UserProfileData.cs
@@ -12,6 +12,7 @@ namespace OpenGrid.Framework.Data
         public string surname;     // The users surname (can be used to indicate user class - eg 'Test User' or 'Test Admin')

 

         public string passwordHash; // Hash of the users password

+        public string passwordSalt; // Salt for the users password

 

         public ulong homeRegion;       // RegionHandle of home

         public LLVector3 homeLocation; // Home Location inside the sim