OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.

master-beforevarregion
BlueWall 2013-12-16 15:10:09 -05:00
parent fe01e7d1cc
commit b03ec6137f
3 changed files with 73 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,13 +925,18 @@ namespace OpenSim.Data.MySQL
} }
else else
{ {
dbcon.Close();
dbcon.Open();
query = "INSERT INTO usersettings VALUES ";
query += "(?uuid,'false','false', ?Email)";
using (MySqlCommand put = new MySqlCommand(query, dbcon)) using (MySqlCommand put = new MySqlCommand(query, dbcon))
{ {
query = "INSERT INTO usersettings VALUES ";
query += "(?Id,'false','false', '')";
lock(Lock) put.Parameters.AddWithValue("?Email", pref.EMail);
{ put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
put.ExecuteNonQuery(); put.ExecuteNonQuery();
} }
} }
@ -939,7 +944,6 @@ namespace OpenSim.Data.MySQL
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[PROFILES_DATA]" + m_log.DebugFormat("[PROFILES_DATA]" +

3
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
View File

@ -808,11 +808,12 @@ namespace OpenSim.Data.SQLite
else else
{ {
query = "INSERT INTO usersettings VALUES "; query = "INSERT INTO usersettings VALUES ";
query += "(:Id,'false','false', '')"; query += "(:Id,'false','false', :Email)";
using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand()) using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
{ {
put.Parameters.AddWithValue(":Id", pref.UserId.ToString()); put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
put.Parameters.AddWithValue(":Email", pref.EMail);
put.ExecuteNonQuery(); put.ExecuteNonQuery();
} }

61
OpenSim/Services/UserProfilesService/UserProfilesService.cs
View File

@ -37,6 +37,7 @@ using OpenSim.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Services.UserAccountService;
namespace OpenSim.Services.ProfilesService namespace OpenSim.Services.ProfilesService
{ {
@ -166,11 +167,71 @@ namespace OpenSim.Services.ProfilesService
#region User Preferences #region User Preferences
public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
{ {
if(string.IsNullOrEmpty(pref.EMail))
{
UserAccount account = new UserAccount();
if(userAccounts is UserAccountService.UserAccountService)
{
try
{
account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
if(string.IsNullOrEmpty(account.Email))
{
result = "No Email address on record!";
return false;
}
else
pref.EMail = account.Email;
}
catch
{
m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
result = "Missing Email address!";
return false;
}
}
else
{
m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
result = "Missing Email address!";
return false;
}
}
return ProfilesData.UpdateUserPreferences(ref pref, ref result); return ProfilesData.UpdateUserPreferences(ref pref, ref result);
} }
public bool UserPreferencesRequest(ref UserPreferences pref, ref string result) public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
{ {
if(string.IsNullOrEmpty(pref.EMail))
{
UserAccount account = new UserAccount();
if(userAccounts is UserAccountService.UserAccountService)
{
try
{
account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId);
if(string.IsNullOrEmpty(account.Email))
{
result = "No Email address on record!";
return false;
}
else
pref.EMail = account.Email;
}
catch
{
m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account");
result = "Missing Email address!";
return false;
}
}
else
{
m_log.Info ("[PROFILES]: UserAccountService: Could not get user account");
result = "Missing Email address!";
return false;
}
}
return ProfilesData.GetUserPreferences(ref pref, ref result); return ProfilesData.GetUserPreferences(ref pref, ref result);
} }
#endregion User Preferences #endregion User Preferences