ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for user preferences (im via email)

Browse Source
This commit is contained in:
BlueWall
2013-12-06 02:52:13 -05:00
parent 04f8fc1ce9
commit 1842388bb4
14 changed files with 297 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Data/MySQL/MySQLUserProfilesData.cs
View File

@@ -895,7 +895,7 @@ namespace OpenSim.Data.MySQL
}
#region User Preferences
public OSDArray GetUserPreferences(UUID avatarId)
public bool GetUserPreferences(ref UserPreferences pref, ref string result)
{
string query = string.Empty;
@@ -912,19 +912,16 @@ namespace OpenSim.Data.MySQL
dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
{
cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
using (MySqlDataReader reader = cmd.ExecuteReader())
{
if(reader.HasRows)
{
reader.Read();
OSDMap record = new OSDMap();
record.Add("imviaemail",OSD.FromString((string)reader["imviaemail"]));
record.Add("visible",OSD.FromString((string)reader["visible"]));
record.Add("email",OSD.FromString((string)reader["email"]));
data.Add(record);
bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
bool.TryParse((string)reader["visible"], out pref.Visible);
pref.EMail = (string)reader["email"];
}
else
{
@@ -947,17 +944,19 @@ namespace OpenSim.Data.MySQL
{
m_log.DebugFormat("[PROFILES_DATA]" +
": Get preferences exception {0}", e.Message);
result = e.Message;
return false;
}
return data;
return true;
}
public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
{
string query = string.Empty;
query += "UPDATE userpsettings SET ";
query += "UPDATE usersettings SET ";
query += "imviaemail=?ImViaEmail, ";
query += "visible=?Visible,";
query += "visible=?Visible ";
query += "WHERE useruuid=?uuid";
try
@@ -967,14 +966,11 @@ namespace OpenSim.Data.MySQL
dbcon.Open();
using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
{
cmd.Parameters.AddWithValue("?ImViaEmail", emailIm.ToString().ToLower ());
cmd.Parameters.AddWithValue("?WantText", visible.ToString().ToLower ());
cmd.Parameters.AddWithValue("?uuid", avatarId.ToString());
lock(Lock)
{
cmd.ExecuteNonQuery();
}
cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail);
cmd.Parameters.AddWithValue("?Visible", pref.Visible);
cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
cmd.ExecuteNonQuery();
}
}
}
@@ -982,6 +978,7 @@ namespace OpenSim.Data.MySQL
{
m_log.DebugFormat("[PROFILES_DATA]" +
": AgentInterestsUpdate exception {0}", e.Message);
result = e.Message;
return false;
}
return true;

10
OpenSim/Data/MySQL/Resources/UserProfiles.migrations
View File

@@ -81,3 +81,13 @@ CREATE TABLE IF NOT EXISTS `userdata` (
commit;
:VERSION 3 # -------------------------------
begin;
CREATE TABLE IF NOT EXISTS `usersettings` (
`useruuid` varchar(36) NOT NULL,
`imviaemail` enum('true','false') NOT NULL,
`visible` enum('true','false') NOT NULL,
`email` varchar(254) NOT NULL,
PRIMARY KEY (`useruuid`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
commit;