3 files changed, 121 insertions, 16 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index 76d3faf..b42ec09 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -514,6 +514,90 @@ namespace OpenGrid.Framework.Data.MySQL
         }

 

         /// <summary>

+        /// Creates a new user and inserts it into the database

+        /// </summary>

+        /// <param name="uuid">User ID</param>

+        /// <param name="username">First part of the login</param>

+        /// <param name="lastname">Second part of the login</param>

+        /// <param name="passwordHash">A salted hash of the users password</param>

+        /// <param name="passwordSalt">The salt used for the password hash</param>

+        /// <param name="homeRegion">A regionHandle of the users home region</param>

+        /// <param name="homeLocX">Home region position vector</param>

+        /// <param name="homeLocY">Home region position vector</param>

+        /// <param name="homeLocZ">Home region position vector</param>

+        /// <param name="homeLookAtX">Home region 'look at' vector</param>

+        /// <param name="homeLookAtY">Home region 'look at' vector</param>

+        /// <param name="homeLookAtZ">Home region 'look at' vector</param>

+        /// <param name="created">Account created (unix timestamp)</param>

+        /// <param name="lastlogin">Last login (unix timestamp)</param>

+        /// <param name="inventoryURI">Users inventory URI</param>

+        /// <param name="assetURI">Users asset URI</param>

+        /// <param name="canDoMask">I can do mask</param>

+        /// <param name="wantDoMask">I want to do mask</param>

+        /// <param name="aboutText">Profile text</param>

+        /// <param name="firstText">Firstlife text</param>

+        /// <param name="profileImage">UUID for profile image</param>

+        /// <param name="firstImage">UUID for firstlife image</param>

+        /// <returns>Success?</returns>

+        public bool insertUserRow(libsecondlife.LLUUID uuid, string username, string lastname, string passwordHash, string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,

+            float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, string aboutText, string firstText,

+            libsecondlife.LLUUID profileImage, libsecondlife.LLUUID firstImage)

+        {

+            string sql = "INSERT INTO users (`UUID`, `username`, `lastname`, `passwordHash`, `passworldSalt`, `homeRegion`, ";

+            sql += "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, ";

+            sql += "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, ";

+            sql += "`profileFirstText`, `profileImage`, profileFirstImage`) VALUES ";

+

+            sql += "(?UUID, ?username, ?lastname, ?passwordHash, ?passworldSalt, ?homeRegion, ";

+            sql += "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX`, ?homeLookAtY, ?homeLookAtZ, ?created, ";

+            sql += "?lastLogin`, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, ";

+            sql += "?profileFirstText, ?profileImage, ?profileFirstImage)";

+

+            Dictionary<string, string> parameters = new Dictionary<string, string>();

+            parameters["?UUID"] = uuid.ToStringHyphenated();

+            parameters["?username"] = username.ToString();

+            parameters["?lastname"] = lastname.ToString();

+            parameters["?passwordHash"] = passwordHash.ToString();

+            parameters["?passworldSalt"] = passwordSalt.ToString();

+            parameters["?homeRegion"] = homeRegion.ToString();

+            parameters["?homeLocationX"] = homeLocX.ToString();

+            parameters["?homeLocationY"] = homeLocY.ToString();

+            parameters["?homeLocationZ"] = homeLocZ.ToString();

+            parameters["?homeLookAtX"] = homeLookAtX.ToString();

+            parameters["?homeLookAtY"] = homeLookAtY.ToString();

+            parameters["?homeLookAtZ"] = homeLookAtZ.ToString();

+            parameters["?created"] = created.ToString();

+            parameters["?lastLogin"] = lastlogin.ToString();

+            parameters["?userInventoryURI"] = inventoryURI.ToString();

+            parameters["?userAssetURI"] = assetURI.ToString();

+            parameters["?profileCanDoMask"] = canDoMask.ToString();

+            parameters["?profileWantDoMask"] = wantDoMask.ToString();

+            parameters["?profileAboutText"] = aboutText.ToString();

+            parameters["?profileFirstText"] = firstText.ToString();

+            parameters["?profileImage"] = profileImage.ToStringHyphenated();

+            parameters["?profileFirstImage"] = firstImage.ToStringHyphenated();

+

+            bool returnval = false;

+

+            try

+            {

+                IDbCommand result = Query(sql, parameters);

+

+                if (result.ExecuteNonQuery() == 1)

+                    returnval = true;

+

+                result.Dispose();

+            }

+            catch (Exception e)

+            {

+                Console.WriteLine(e.ToString());

+                return false;

+            }

+

+            return returnval;

+        }

+

+        /// <summary>

         /// Inserts a new region into the database

         /// </summary>

         /// <param name="profile">The region to insert</param>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
index 032a0e6..e988c94 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
@@ -200,6 +200,20 @@ namespace OpenGrid.Framework.Data.MySQL
         /// <param name="user">The user profile to create</param>

         public void addNewUserProfile(UserProfileData user)

         {

+            try

+            {

+                lock (database)

+                {

+                    database.insertUserRow(user.UUID, user.username, user.surname, user.passwordHash, user.passwordSalt, user.homeRegion, user.homeLocation.X, user.homeLocation.Y, user.homeLocation.Z,

+                        user.homeLookAt.X, user.homeLookAt.Y, user.homeLookAt.Z, user.created, user.lastLogin, user.userInventoryURI, user.userAssetURI, user.profileCanDoMask, user.profileWantDoMask,

+                        user.profileAboutText, user.profileFirstText, user.profileImage, user.profileFirstImage);

+                }

+            }

+            catch (Exception e)

+            {

+                database.Reconnect();

+                Console.WriteLine(e.ToString());

+            }

         }

 

         /// <summary>

diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
index 0708947..e07e5be 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ b/OpenGridServices/ServiceManager/ServiceManager.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>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>ServiceManager</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>ServiceManager</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,30 +61,31 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.Framework.dll" >

+    <Reference Include="OpenSim.Framework.dll">

       <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="OpenSim.GenericConfig.Xml" >

+    <Reference Include="OpenSim.GenericConfig.Xml">

       <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.ServiceProcess" >

+    <Reference Include="System.ServiceProcess">

       <HintPath>System.ServiceProcess.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

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

       <Private>False</Private>

     </Reference>

@@ -87,7 +94,7 @@
   </ItemGroup>

   <ItemGroup>

     <Compile Include="ServiceManager.cs">

-      <SubType>Code</SubType>

+      <SubType>Component</SubType>

     </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

@@ -97,4 +104,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file