[Ogoglio-commits] SF.net SVN: ogoglio: [564] maven/trunk/ogoglio-server/src/main

[<tre...@us...>]

Revision: 564
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=564&view=rev
Author:   trevorolio
Date:     2007-11-07 16:25:42 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Added account level field to auth docs.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AuthServlet.java
    maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AuthServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AuthServlet.java	2007-11-08 00:25:38 UTC (rev 563)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AuthServlet.java	2007-11-08 00:25:42 UTC (rev 564)
@@ -135,7 +135,7 @@
                 } else {
                     AuthDocument authDoc = null;
                     if (cookieAccountRecord != null) {
-                        authDoc = new AuthDocument(cookieAccountRecord.getUsername(), true);
+                        authDoc = new AuthDocument(cookieAccountRecord.getUsername(), true, cookieAccountRecord.getAccountlevel());
                     } else {
                         authDoc = new AuthDocument();
                     }
@@ -161,7 +161,7 @@
                         newCookie.setPath("/");
                         newCookie.setMaxAge(Integer.MAX_VALUE - 1);
                         response.addCookie(newCookie);
-                        AuthDocument authDoc = new AuthDocument(authedAccountRecord.getUsername(), true);
+                        AuthDocument authDoc = new AuthDocument(authedAccountRecord.getUsername(), true, authedAccountRecord.getAccountlevel());
                         response.setStatus(HttpServletResponse.SC_OK);
                         response.setContentType("text/xml");
                         response.getOutputStream().write(authDoc.toString().getBytes());
@@ -178,7 +178,7 @@
                 AccountRecord cookieAccountRecord = getAuthedAccountRecord(request, getSessionFactory());
                 AuthDocument authDoc = null;
                 if (cookieAccountRecord != null) {
-                    authDoc = new AuthDocument(cookieAccountRecord.getUsername(), true);
+                    authDoc = new AuthDocument(cookieAccountRecord.getUsername(), true, cookieAccountRecord.getAccountlevel());
                 } else {
                     authDoc = new AuthDocument();
                 }
@@ -205,7 +205,7 @@
                 AccountRecord cookieAccountRecord = getAuthedAccountRecord(request, getSessionFactory());
                 AuthDocument authDoc = null;
                 if (cookieAccountRecord != null) {
-                    authDoc = new AuthDocument(cookieAccountRecord.getUsername(), true);
+                    authDoc = new AuthDocument(cookieAccountRecord.getUsername(), true, cookieAccountRecord.getAccountlevel());
                 } else {
                     authDoc = new AuthDocument();
                 }

Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js	2007-11-08 00:25:38 UTC (rev 563)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js	2007-11-08 00:25:42 UTC (rev 564)
@@ -262,6 +262,10 @@
     return xml.replace(/&apos;/g,"'").replace(/&quot;/g,"\"").replace(/&gt;/g,">").replace(/&lt;/g,"<").replace(/&amp;/g,"&");
 };
 
+function newlinesToBrs(text){
+	return text.replace(/\n/g,"<br/>");
+}
+
 // BEGIN QUATERION CLASS
 
 function Quaternion(wValue, xValue, yValue, zValue){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.