Index: openacs-4/packages/dotlrn/www/applets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/applets.adp	23 Jan 2002 06:29:14 -0000	1.3
+++ openacs-4/packages/dotlrn/www/applets.adp	23 Jan 2002 07:41:04 -0000	1.4
@@ -1,7 +1,6 @@
 <master src="master">
 <property name="title">Manage Applets</property>
 <property name="context_bar">@context_bar@</property>
-<property name="portal_id">@portal_id@</property>
 
 <b><font size=-1><a href=one-community-admin>Group Admin</a></font></b><p>
 
Index: openacs-4/packages/dotlrn/www/applets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/applets.tcl	23 Jan 2002 06:29:14 -0000	1.7
+++ openacs-4/packages/dotlrn/www/applets.tcl	23 Jan 2002 07:41:04 -0000	1.8
@@ -9,6 +9,4 @@
 
 set context_bar {{"one-community-admin" Admin} {Manage Applets}}
 
-set portal_id ""
-
 ad_return_template
Index: openacs-4/packages/dotlrn/www/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community-member.adp	23 Jan 2002 00:15:43 -0000	1.2
+++ openacs-4/packages/dotlrn/www/community-member.adp	23 Jan 2002 07:41:04 -0000	1.3
@@ -1,7 +1,6 @@
 <master src="master">
 <property name="title">@first_names@ @last_name@</property>
 <property name="context_bar">@context_bar@</property>
-<property name="portal_id">@portal_id@</property>
 
 <if @inline_portrait_state@ eq "inline">
 
Index: openacs-4/packages/dotlrn/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/master.adp	23 Jan 2002 01:14:47 -0000	1.9
+++ openacs-4/packages/dotlrn/www/master.adp	23 Jan 2002 07:41:04 -0000	1.10
@@ -33,17 +33,16 @@
   </tr>
 </table>
 
-<P>
+<p>
 
-
 <small>@navbar@</small>
-<P>
+<p>
 
 <slave>
 
 <small>@navbar@</small>
-<P>
-<P>
-<P>
+<p>
+<p>
+<p>
 <hr>
 <small><a href="http://mitsloan.mit.edu">MIT Sloan School of Management</a> | <a href="http://web.mit.edu">MIT</a></small>
Index: openacs-4/packages/dotlrn/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/master.tcl	23 Jan 2002 06:29:14 -0000	1.9
+++ openacs-4/packages/dotlrn/www/master.tcl	23 Jan 2002 07:41:04 -0000	1.10
@@ -2,9 +2,6 @@
 # sloan specifc master
 #
 
-
-
-
 # if we have a portal_id show navbar
 set user_id [ad_verify_and_get_user_id]
 
@@ -40,15 +37,16 @@
     if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} {
         set navbar "<table border=0 cellpadding=5><tr>"
         
-        append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td> <td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>"]
+        append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b><center>" -separator "</center></td> <td><font face=arial,helvetica size=-1 color=black><b><center>" -post_html "</a></center></td>"]
         if {$show_control_panel} {
             if {$link_control_panel} {
-                append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=one-community-admin>Group Admin</a></center></td> </tr></table>"
+                append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=one-community-admin>Group Admin</a></center></td></tr></table>"
             } else {
-                append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center>Group Admin</center></td> </tr></table>"
+                append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center>Group Admin</center></td></tr></table>"
             }
+        } else {
+            append navbar "</tr></table>"
         }
-        
     } else {
         set navbar ""
         set portal_id ""
@@ -61,7 +59,7 @@
     if {[info exists portal_id] && ![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} {
         set navbar "<table border=0 cellpadding=5><tr>"
         
-        append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td> <td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>"]
+        append navbar [portal::list_pages -link_all $link_all -return_url $return_url -portal_id $portal_id -link "switch-page" -pre_html "<td><font face=arial,helvetica size=-1 color=black><b><center>" -separator "</center></td> <td><font face=arial,helvetica size=-1 color=black><b><center>" -post_html "</a></center></td>"]
         
         append navbar "</tr></table>"
         
@@ -79,9 +77,9 @@
         append navbar [portal::list_pages -return_url $return_url -portal_id $portal_id -link_all $link_all -link "switch-page" -pre_html "\n<td><font face=arial,helvetica size=-1 color=black><b> <center>" -separator " </center></td>\n<td><font face=arial,helvetica size=-1 color=black><b> <center>" -post_html "</a></center></td>\n"]
         
         if {$link_control_panel} {
-            append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=preferences>Control Panel</a></center></td> </tr></table>"
+            append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center><a href=preferences>Control Panel</a></center></td></tr></table>"
         } else {
-            append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center>Control Panel</center></td> </tr></table>"
+            append navbar "<td><font face=arial,helvetica size=-1 color=black><b><center>Control Panel</center></td></tr></table>"
         }
         
     } else {
Index: openacs-4/packages/dotlrn/www/member-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/member-add-2.adp	23 Jan 2002 00:15:43 -0000	1.5
+++ openacs-4/packages/dotlrn/www/member-add-2.adp	23 Jan 2002 07:41:04 -0000	1.6
@@ -1,6 +1,5 @@
 <master src="master">
 <property name="title">Add A Member To A Community</property>
-<property name="portal_id">@portal_id@</property>
 
 You're adding <strong>@first_names@ @last_name@ (@email@)</strong>:<p>
 
Index: openacs-4/packages/dotlrn/www/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/member-add.adp	21 Jan 2002 06:30:11 -0000	1.4
+++ openacs-4/packages/dotlrn/www/member-add.adp	23 Jan 2002 07:41:04 -0000	1.5
@@ -1,7 +1,6 @@
 <master src="master">
 <property name="title">Add A Member To A Community</property>
 <property name="context_bar">@context_bar@</property>
-<property name="portal_id">@portal_id@</property>
 
 The results of your search are:
 <ul>
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/members.adp	21 Jan 2002 06:30:11 -0000	1.3
+++ openacs-4/packages/dotlrn/www/members.adp	23 Jan 2002 07:41:04 -0000	1.4
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="title">Manage Membership</property>
 <property name="context_bar">@context_bar@</property>
-<property name="portal_id">@portal_id@</property>
 
+<b><font size=-1><a href=one-community-admin>Group Admin</a></font></b><p>
+
 <include src="members-chunk" referer="members">
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/members.tcl	23 Jan 2002 01:30:14 -0000	1.6
+++ openacs-4/packages/dotlrn/www/members.tcl	23 Jan 2002 07:41:04 -0000	1.7
@@ -8,6 +8,5 @@
 }
 
 set context_bar {{"one-community-admin" Admin} {Manage Members}}
-set portal_id ""
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/one-community-type.adp	21 Jan 2002 06:30:11 -0000	1.17
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	23 Jan 2002 07:41:04 -0000	1.18
@@ -1,7 +1,6 @@
 <master src="master">
 <property name="context_bar">@context_bar@</property>
 <property name="title">@title@</property>
-<property name="portal_id">@portal_id@</property>
 
 <p></p>
 
Index: openacs-4/packages/dotlrn/www/one-community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn/www/one-community-type.tcl	23 Jan 2002 04:03:11 -0000	1.14
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl	23 Jan 2002 07:41:04 -0000	1.15
@@ -18,8 +18,6 @@
     title:onevalue
 }
 
-set portal_id ""
-
 # Check that this is a community type
 if {[ad_parameter community_type_level_p] != 1} {
     ad_returnredirect "./"
Index: openacs-4/packages/dotlrn/www/spam.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/spam.adp	23 Jan 2002 00:15:43 -0000	1.4
+++ openacs-4/packages/dotlrn/www/spam.adp	23 Jan 2002 07:41:04 -0000	1.5
@@ -17,6 +17,7 @@
       <td>Sender's Email Address</td>
     </tr>
 
+<!--
     <tr>
       <td>&#60sender_first_names&#62</td>
       <td> = </td>
@@ -28,6 +29,7 @@
       <td> = </td>
       <td>Sender's Last Name</td>
     </tr>
+-->
 
     <tr>
       <td>&#60community_name&#62</td>
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/spam.tcl	21 Jan 2002 08:17:27 -0000	1.3
+++ openacs-4/packages/dotlrn/www/spam.tcl	23 Jan 2002 07:41:04 -0000	1.4
@@ -24,6 +24,16 @@
 set sender_id [ad_conn user_id]
 set portal_id [dotlrn_community::get_portal_id $community_id $sender_id]
 
+db_1row select_sender_info {
+    select parties.email as sender_email,
+           persons.first_names as sender_first_names,
+           persons.last_name as sender_last_name
+    from parties,
+         persons
+    where parties.party_id = :sender_id
+    and persons.person_id = :sender_id
+}
+
 form create spam_message
 
 element create spam_message community_id \
@@ -32,6 +42,13 @@
     -widget hidden \
     -value $community_id
 
+element create spam_message from \
+    -label From \
+    -datatype text \
+    -widget text \
+    -html {size 60} \
+    -value $sender_email
+
 element create spam_message rel_type \
     -label To \
     -datatype text \
@@ -43,7 +60,7 @@
     -label Subject \
     -datatype text \
     -widget text \
-    -html {size 50}
+    -html {size 60}
 
 element create spam_message message \
     -label Message \
@@ -58,7 +75,8 @@
     -value $referer
 
 if {[form is_valid spam_message]} {
-    form get_values spam_message community_id rel_type subject message referer
+    form get_values spam_message \
+        community_id from rel_type subject message referer
 
     # YON: should redirect and close the connection here so that the user
     #      doesn't have to wait for the emails to get sent out.
@@ -84,26 +102,16 @@
     #      send all the emails ourselves.
 
     # let's get some data we might need
-    db_1row select_sender_info {
-        select parties.email as sender_email,
-               persons.first_names as sender_first_names,
-               persons.last_name as sender_last_name
-        from parties,
-             persons
-        where parties.party_id = :sender_id
-        and persons.person_id = :sender_id
-    }
-
     set community_name [dotlrn_community::get_community_name $community_id]
     set community_url [dotlrn_community::get_community_url $community_id]
 
     # replace some values in the subject and the message
-    regsub -all {<sender_email>} $subject $sender_email subject
-    regsub -all {<sender_email>} $message $sender_email message
-    regsub -all {<sender_first_names>} $subject $sender_first_names subject
-    regsub -all {<sender_first_names>} $message $sender_first_names message
-    regsub -all {<sender_last_name>} $subject $sender_last_name subject
-    regsub -all {<sender_last_name>} $message $sender_last_name message
+    regsub -all {<sender_email>} $subject $from subject
+    regsub -all {<sender_email>} $message $from message
+#    regsub -all {<sender_first_names>} $subject $sender_first_names subject
+#    regsub -all {<sender_first_names>} $message $sender_first_names message
+#    regsub -all {<sender_last_name>} $subject $sender_last_name subject
+#    regsub -all {<sender_last_name>} $message $sender_last_name message
     regsub -all {<community_name>} $subject $community_name subject
     regsub -all {<community_name>} $message $community_name message
     regsub -all {<community_url>} $subject $community_url subject
@@ -150,7 +158,7 @@
         regsub -all {<last_name>} $message $last_name message
 
         # send the email
-        if {[catch {ns_sendmail $email $sender_email $subject $message} errmsg]} {
+        if {[catch {ns_sendmail $email $from $subject $message} errmsg]} {
             append errors "
 <p>
   Failed to deliver to $email because:
Index: openacs-4/packages/dotlrn/www/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/user-add.adp	21 Jan 2002 06:30:12 -0000	1.2
+++ openacs-4/packages/dotlrn/www/user-add.adp	23 Jan 2002 07:41:04 -0000	1.3
@@ -1,6 +1,5 @@
 <master src="master">
 <property name="title">Add A User</property>
 <property name="context_bar">@context_bar@</property>
-<property name="portal_id">@portal_id@</property>
 
 <formtemplate id="add_user"></formtemplate>
Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/user-add.tcl	23 Jan 2002 01:30:14 -0000	1.6
+++ openacs-4/packages/dotlrn/www/user-add.tcl	23 Jan 2002 07:41:04 -0000	1.7
@@ -76,6 +76,4 @@
     ad_script_abort
 }
 
-set portal_id ""
-
 ad_return_template