diff options
author | BlueWall | 2014-11-23 14:25:48 -0500 |
---|---|---|
committer | BlueWall | 2014-11-23 14:25:48 -0500 |
commit | 12108bf6e9dc16b6b4b1fe344c1b12ed31a1e4b4 (patch) | |
tree | e2d852f5675e7f6714f11dca84fc658bffa8ad8f /OpenSim/Services/UserProfilesService/UserProfilesService.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-12108bf6e9dc16b6b4b1fe344c1b12ed31a1e4b4.zip opensim-SC_OLD-12108bf6e9dc16b6b4b1fe344c1b12ed31a1e4b4.tar.gz opensim-SC_OLD-12108bf6e9dc16b6b4b1fe344c1b12ed31a1e4b4.tar.bz2 opensim-SC_OLD-12108bf6e9dc16b6b4b1fe344c1b12ed31a1e4b4.tar.xz |
Fix handling of user preference updates where no email address is supplied
Diffstat (limited to 'OpenSim/Services/UserProfilesService/UserProfilesService.cs')
-rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index c752055..675cd07 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
@@ -47,7 +47,6 @@ namespace OpenSim.Services.ProfilesService | |||
47 | MethodBase.GetCurrentMethod().DeclaringType); | 47 | MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | IUserAccountService userAccounts; | 49 | IUserAccountService userAccounts; |
50 | IAuthenticationService authService; | ||
51 | 50 | ||
52 | public UserProfilesService(IConfigSource config, string configName): | 51 | public UserProfilesService(IConfigSource config, string configName): |
53 | base(config, configName) | 52 | base(config, configName) |
@@ -55,7 +54,7 @@ namespace OpenSim.Services.ProfilesService | |||
55 | IConfig Config = config.Configs[configName]; | 54 | IConfig Config = config.Configs[configName]; |
56 | if (Config == null) | 55 | if (Config == null) |
57 | { | 56 | { |
58 | m_log.Warn("[PROFILES]: No configuration found!"); | 57 | m_log.Warn("[PROFILES SERVICE]: No configuration found!"); |
59 | return; | 58 | return; |
60 | } | 59 | } |
61 | Object[] args = null; | 60 | Object[] args = null; |
@@ -66,9 +65,6 @@ namespace OpenSim.Services.ProfilesService | |||
66 | userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); | 65 | userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args); |
67 | 66 | ||
68 | args = new Object[] { config }; | 67 | args = new Object[] { config }; |
69 | string authServiceConfig = Config.GetString("AuthenticationServiceModule", String.Empty); | ||
70 | if (accountService != string.Empty) | ||
71 | authService = ServerUtils.LoadPlugin<IAuthenticationService>(authServiceConfig, args); | ||
72 | } | 68 | } |
73 | 69 | ||
74 | #region Classifieds | 70 | #region Classifieds |
@@ -176,23 +172,22 @@ namespace OpenSim.Services.ProfilesService | |||
176 | account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId); | 172 | account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId); |
177 | if(string.IsNullOrEmpty(account.Email)) | 173 | if(string.IsNullOrEmpty(account.Email)) |
178 | { | 174 | { |
179 | result = "No Email address on record!"; | 175 | pref.EMail = string.Empty; |
180 | return false; | ||
181 | } | 176 | } |
182 | else | 177 | else |
183 | pref.EMail = account.Email; | 178 | pref.EMail = account.Email; |
184 | } | 179 | } |
185 | catch | 180 | catch |
186 | { | 181 | { |
187 | m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account"); | 182 | m_log.Error ("[PROFILES SERVICE]: UserAccountService Exception: Could not get user account"); |
188 | result = "Missing Email address!"; | 183 | result = "UserAccountService settings error in UserProfileService!"; |
189 | return false; | 184 | return false; |
190 | } | 185 | } |
191 | } | 186 | } |
192 | else | 187 | else |
193 | { | 188 | { |
194 | m_log.Info ("[PROFILES]: UserAccountService: Could not get user account"); | 189 | m_log.Error ("[PROFILES SERVICE]: UserAccountService: Could not get user account"); |
195 | result = "Missing Email address!"; | 190 | result = "UserAccountService settings error in UserProfileService!"; |
196 | return false; | 191 | return false; |
197 | } | 192 | } |
198 | } | 193 | } |
@@ -211,23 +206,22 @@ namespace OpenSim.Services.ProfilesService | |||
211 | account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId); | 206 | account = userAccounts.GetUserAccount(UUID.Zero, pref.UserId); |
212 | if(string.IsNullOrEmpty(account.Email)) | 207 | if(string.IsNullOrEmpty(account.Email)) |
213 | { | 208 | { |
214 | result = "No Email address on record!"; | 209 | pref.EMail = string.Empty; |
215 | return false; | ||
216 | } | 210 | } |
217 | else | 211 | else |
218 | pref.EMail = account.Email; | 212 | pref.EMail = account.Email; |
219 | } | 213 | } |
220 | catch | 214 | catch |
221 | { | 215 | { |
222 | m_log.Info ("[PROFILES]: UserAccountService Exception: Could not get user account"); | 216 | m_log.Error ("[PROFILES SERVICE]: UserAccountService Exception: Could not get user account"); |
223 | result = "Missing Email address!"; | 217 | result = "UserAccountService settings error in UserProfileService!"; |
224 | return false; | 218 | return false; |
225 | } | 219 | } |
226 | } | 220 | } |
227 | else | 221 | else |
228 | { | 222 | { |
229 | m_log.Info ("[PROFILES]: UserAccountService: Could not get user account"); | 223 | m_log.Error ("[PROFILES SERVICE]: UserAccountService: Could not get user account"); |
230 | result = "Missing Email address!"; | 224 | result = "UserAccountService settings error in UserProfileService!"; |
231 | return false; | 225 | return false; |
232 | } | 226 | } |
233 | } | 227 | } |