the erbo_reorg_04202002 branch is no more...development continues on the

trunk while the stable_branch_04202002 branch takes the 'stable' role

scripts/comm/invite.js

@@ -38,7 +38,8 @@ if ("GET"==rinput.verb)
 { // set up the invitation screen parameters
   rinput.setRequestAttribute("invitation.title","Send Community Invitation:");
   rinput.setRequestAttribute("invitation.subtitle",comm.name);
-  rinput.setRequestAttribute("invitation.action",rinput.formatURL("comm/invite.js.vs",LinkTypes.SERVLET));
+  html = vlib.queryHTMLRendering(rinput);
+  rinput.setRequestAttribute("invitation.action",html.formatURL("comm/invite.js.vs",html.SERVLET));
   rinput.setRequestAttribute("invitation.params",
                              "<INPUT TYPE=\"HIDDEN\" NAME=\"cc\" VALUE=\"" + comm.communityID + "\">");
 

scripts/comm/photo.js

@@ -43,7 +43,8 @@ if ("GET"==rinput.verb)
   { // create and initialize the PhotoUploader
     rc = new PhotoUploader("Upload Community Logo","comm/photo.js.vs",LinkTypes.SERVLET);
     rc.addHiddenParameter("cc",comm.communityID);
-    rc.photoTag = rinput.getCommunityLogoTag(comm.getContactInfo().photoURL);
+    html = vlib.queryHTMLRendering(rinput);
+    rc.photoTag = html.getCommunityLogoTag(comm.getContactInfo().photoURL);
     rc.label = "New community logo";
 
   } // end try

scripts/comm/show.js

@@ -68,7 +68,8 @@ try
     rinput.setRequestAttribute("address.country",ce.name);
 
   // Save off the community logo tag.
-  rinput.setRequestAttribute("community.logo",rinput.getCommunityLogoTag(ci.photoURL));
+  html = vlib.queryHTMLRendering(rinput);
+  rinput.setRequestAttribute("community.logo",html.getCommunityLogoTag(ci.photoURL));
 
   // create the view object
   rc = new JSPView("Community Profile: " + comm.name,"comm/profile.jsp");

scripts/conf/invite_conf.js

@@ -41,7 +41,8 @@ if ("GET"==rinput.verb)
 { // set up the invitation screen parameters
   rinput.setRequestAttribute("invitation.title","Send Conference Invitation:");
   rinput.setRequestAttribute("invitation.subtitle",conf.name);
-  rinput.setRequestAttribute("invitation.action",rinput.formatURL("conf/invite_conf.js.vs",LinkTypes.SERVLET));
+  html = vlib.queryHTMLRendering(rinput);
+  rinput.setRequestAttribute("invitation.action",html.formatURL("conf/invite_conf.js.vs",html.SERVLET));
   rinput.setRequestAttribute("invitation.params",
                              "<INPUT TYPE=\"HIDDEN\" NAME=\"cc\" VALUE=\"" + comm.communityID
                              + "\"><INPUT TYPE=\"HIDDEN\" NAME=\"conf\" VALUE=\"" + conf.confID + "\">");

scripts/conf/invite_topic.js

@@ -45,8 +45,8 @@ if ("GET"==rinput.verb)
 { // set up the invitation screen parameters
   rinput.setRequestAttribute("invitation.title","Send Topic Invitation:");
   rinput.setRequestAttribute("invitation.subtitle",topic.name);
-  rinput.setRequestAttribute("invitation.action",
-                             rinput.formatURL("conf/invite_topic.js.vs",LinkTypes.SERVLET));
+  html = vlib.queryHTMLRendering(rinput);
+  rinput.setRequestAttribute("invitation.action",html.formatURL("conf/invite_topic.js.vs",html.SERVLET));
   rinput.setRequestAttribute("invitation.params",
                              "<INPUT TYPE=\"HIDDEN\" NAME=\"cc\" VALUE=\"" + comm.communityID
                              + "\"><INPUT TYPE=\"HIDDEN\" NAME=\"conf\" VALUE=\"" + conf.confID

scripts/conf/posts.js

@@ -92,8 +92,9 @@ try
   rc.topCustom = conf.getCustomBlock(ConferenceContext.CUST_BLOCK_TOP);
   rc.bottomCustom = conf.getCustomBlock(ConferenceContext.CUST_BLOCK_BOTTOM);
   rc.title = topic.name;
+  html = vlib.queryHTMLRendering(rinput);
   rc.subtitle = topic.totalMessages + " Total; " + rc.unread + " New; Last: "
-              + rinput.formatDate(topic.lastUpdateDate);
+              + html.formatDate(topic.lastUpdateDate);
 
   // do a "read new" on this topic
   if (read_new)

scripts/login.js

@@ -93,10 +93,12 @@ else if (op=="login")
 
     logger.debug("User \"" + user.userName + "\" logged in successfully");
 
-    // If the user wants a cookie, give it to them!
     if (dlg.getValue("saveme").booleanValue())
-      rinput.savePersistentCookie(RequestInput.LOGIN_COOKIE,user.getAuthenticationToken(),
-                                  RequestInput.LOGIN_COOKIE_AGE);
+    { // If the user wants a cookie, give it to them!
+      cctl = vlib.queryCookieControl(rinput);
+      cctl.savePersistentCookie(CookieControl.LOGIN_COOKIE,user.getAuthenticationToken(),
+                                CookieControl.LOGIN_COOKIE_AGE);
+    } // end if
 
     // Clear the left menus (to force recomputation) and bounce us back to whereever we were
     // supposed to go.

scripts/logout.js

@@ -30,8 +30,10 @@ user = rinput.user;
 if (user.isLoggedIn())
 { // user is logged in - we want to log out
   // TODO: only remove the login cookie if it was actually set!
-  rinput.deleteCookie(RequestInput.LOGIN_COOKIE);    // remove the login cookie
-  rinput.endSession();
+  cctl = vlib.queryCookieControl(rinput);
+  cctl.deleteCookie(CookieControl.LOGIN_COOKIE);    // remove the login cookie
+  sctl = vlib.querySessionControl(rinput);
+  sctl.endSession();
 
   target = "top.js.vs";  // take 'em back to the top
 

scripts/new_account.js

@@ -37,8 +37,9 @@ if (user.isLoggedIn())
 
 // Return the text of the User Agreement.
 rinput.displayLogin = false;
-rc = new TextMessage(rinput.getStockMessage("user-agreement-title"),
-                     rinput.getStockMessage("user-agreement-subtitle"));
+html = vlib.queryHTMLRendering(rinput);
+rc = new TextMessage(html.getStockMessage("user-agreement-title"),
+                     html.getStockMessage("user-agreement-subtitle"));
 rc.text = rinput.getStockMessage("user-agreement");
 rc.addButton(LinkTypes.SERVLET,"new_account_2.js.vs?tgt=" + vlib.encodeURL(target),"ua_accept");
 rc.addButton(LinkTypes.SERVLET,"top.js.vs","ua_decline");

scripts/new_account_2.js

@@ -97,7 +97,9 @@ if (op=="create")
     // save the contact info for the user (this also sends email confirmation messages as needed)
     uc.putContactInfo(ci);
 
-    rinput.replaceUser(uc);   // this is now the user for this session!
+    // this is now the user for this session!
+    sctl = vlib.querySessionControl(rinput);
+    sctl.replaceUser(uc);
 
     // Now bounce us immediately to the Verification dialog.
     rc = new Redirect("verify_email.js.vs?tgt=" + vlib.encodeURL(target),LinkTypes.SERVLET);

scripts/profile_photo.js

@@ -45,7 +45,8 @@ if ("GET"==rinput.verb)
   { // create and initialize the PhotoUploader
     rc = new PhotoUploader("Upload User Photo","profile_photo.js.vs",LinkTypes.SERVLET);
     rc.addHiddenParameter("tgt",target);
-    rc.photoTag = rinput.getUserPhotoTag(user.getContactInfo().photoURL);
+    html = vlib.queryHTMLRendering(rinput);
+    rc.photoTag = html.getUserPhotoTag(user.getContactInfo().photoURL);
     rc.label = "New user photo";
     rinput.displayLogin = false;
 

scripts/showuser.js

@@ -88,7 +88,8 @@ try
   rinput.setRequestAttribute("address.lastline",buf.toString());
 
   // Save off the user photo tag.
-  rinput.setRequestAttribute("user.photo",rinput.getUserPhotoTag(prof.photoURL));
+  html = vlib.queryHTMLRendering(rinput);
+  rinput.setRequestAttribute("user.photo",html.getUserPhotoTag(prof.photoURL));
 
   // Create a view object and send it out.
   rc = new JSPView("User Profile - " + username,"user_profile.jsp");

scripts/sysadmin/modify_photo.js

@@ -50,7 +50,8 @@ if ("GET"==rinput.verb)
     admuser = adm.getUserContext(uid);
     rc = new PhotoUploader("Upload User Photo","sysadmin/modify_photo.js.vs",LinkTypes.SERVLET);
     rc.addHiddenParameter("uid",uid);
-    rc.photoTag = rinput.getUserPhotoTag(admuser.getContactInfo().photoURL);
+    html = vlib.queryHTMLRendering(rinput);
+    rc.photoTag = html.getUserPhotoTag(admuser.getContactInfo().photoURL);
     rc.label = "New user photo";
 
   } // end try