|
From: <tre...@us...> - 2007-11-14 18:04:00
|
Revision: 579
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=579&view=rev
Author: trevorolio
Date: 2007-11-14 10:04:04 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Added colored skins for Mike.
Changed the publicity of account information so profile pages are more useful.
Modified Paths:
--------------
maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java 2007-11-13 17:30:42 UTC (rev 578)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java 2007-11-14 18:04:04 UTC (rev 579)
@@ -86,7 +86,7 @@
if (authed) {
result = new AccountDocument(account.getUsername(), account.getAccountlevel(), account.getFirstName(), account.getLastName(), account.getHomepage(), null, account.getEmail(), account.getCreationDate(), null, account.getFrozenUntil(), account.getDefaultBodyConfigurationID());
} else {
- result = new AccountDocument(account.getUsername(), null, null, null, null, null, null, account.getCreationDate(), null, account.getFrozenUntil(), -1);
+ result = new AccountDocument(account.getUsername(), account.getAccountlevel(), account.getFirstName(), account.getLastName(), account.getHomepage(), null, null, account.getCreationDate(), null, account.getFrozenUntil(), account.getDefaultBodyConfigurationID());
}
return result;
}
@@ -446,7 +446,7 @@
private class AccountResource extends AuthenticatedSiteResource {
public AccountResource() {
- super(SiteResource.WILDCARD_ELEMENT, true, getSessionFactory());
+ super(SiteResource.WILDCARD_ELEMENT, false, getSessionFactory());
addSubResource(new SpacesResource());
addSubResource(new TemplatesResource());
addSubResource(new MembershipResource());
@@ -462,13 +462,13 @@
}
AccountRecord requestedAccount = AccountPersistTasks.findAccountByUsername(usernameParam, getSessionFactory());
-
if (requestedAccount == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}
- AccountDocument result = createAccountDocument(requestedAccount, authedAccount.equals(requestedAccount) || AccountDocument.ACCOUNT_LEVEL_ADMIN.equals(authedAccount.getAccountlevel()));
+ boolean authed = authedAccount != null && (authedAccount.equals(requestedAccount) || AccountDocument.ACCOUNT_LEVEL_ADMIN.equals(authedAccount.getAccountlevel()));
+ AccountDocument result = createAccountDocument(requestedAccount, authed);
response.setStatus(HttpServletResponse.SC_OK);
response.setContentType("text/xml");
response.getOutputStream().write(result.toString().getBytes());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|