Index: openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml	7 Nov 2002 13:13:26 -0000	1.2
+++ openacs-4/packages/dotlrn/catalog/dotlrn.de_DE.ISO-8859-1.xml	4 Dec 2002 09:51:03 -0000	1.3
@@ -5,7 +5,6 @@
   <msg key="Administer">Administrieren</msg>
   <msg key="Change_Locale">Neues Sprach</msg>
   <msg key="Change_My_Password">Meine Kennwort �ndern</msg>
-  <msg key="Help">Hilfe</msg>
   <msg key="actions">Aktionen</msg>
   <msg key="admin_page_name">Einstellungen</msg>
   <msg key="and">und</msg>
@@ -37,7 +36,6 @@
   <msg key="logout">Ausloggen</msg>
   <msg key="lt_Edit_My_Personal_Info">Meine Pers�nliche Information Bearbeiten</msg>
   <msg key="members">Mitglieder</msg>
-  <msg key="myspace">Meine Startseite</msg>
   <msg key="new_class">Neuer</msg>
   <msg key="no_description">keine</msg>
   <msg key="non_member_page_name">Nicht Registriert</msg>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	21 Nov 2002 15:18:50 -0000	1.6
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	4 Dec 2002 09:51:03 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 November 21 16:16 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 02 18:06 -->
 <message_catalog package_key="dotlrn" locale="en_US" charset="ISO-8859-1">
 
   <msg key="A_copy_of">A copy of</msg>
@@ -34,6 +34,8 @@
   <msg key="Applets_to_Add">Applets To Add</msg>
   <msg key="Approve">Approve</msg>
   <msg key="Archived">Archived</msg>
+  <msg key="Are_you_sure">Are you sure?</msg>
+  <msg key="Ask_a_question">Ask a question:</msg>
   <msg key="Be_sure">Be sure</msg>
   <msg key="Become_this_user">Become this user!</msg>
   <msg key="Biography">Biography:</msg>
@@ -54,10 +56,15 @@
   <msg key="Community_member">Community member</msg>
   <msg key="Communitys_Name">Community's Name</msg>
   <msg key="Configure_Element">Configure Element</msg>
+  <msg key="Configure_name">Configure %name%</msg>
   <msg key="Confirm">Confirm</msg>
+  <msg key="Confirm_1">Confirm:</msg>
+  <msg key="Confirm_Drop">Confirm Drop</msg>
+  <msg key="Confirmation">Confirmation</msg>
   <msg key="Control_Panel">Control Panel</msg>
   <msg key="Copy">Copy</msg>
   <msg key="Create_A_New_User">Create A New User</msg>
+  <msg key="Create_a_Web_Log">Create a Web Log</msg>
   <msg key="Current">Current</msg>
   <msg key="Customize_Layout">Customize Layout</msg>
   <msg key="Deactivate_">Deactivate ...</msg>
@@ -67,10 +74,11 @@
   <msg key="Delete_Empty">Delete Empty</msg>
   <msg key="Department">Department</msg>
   <msg key="Description">Description</msg>
+  <msg key="Description_1">Description:</msg>
   <msg key="Dont_Add">Don't Add</msg>
   <msg key="Download">Download</msg>
+  <msg key="Drop">Drop</msg>
   <msg key="Drop_Membership">Drop Membership</msg>
-  <msg key="Drop_nbsp_Membership">Drop &amp;nbsp; Membership</msg>
   <msg key="Edit">Edit</msg>
   <msg key="Edit_Properties">Edit Properties</msg>
   <msg key="Edit_Term">Edit Term</msg>
@@ -80,32 +88,32 @@
   <msg key="Email_Members">Email Members</msg>
   <msg key="End_Date">End Date</msg>
   <msg key="End_date">End date:</msg>
+  <msg key="Error_sending_mail">Error sending mail</msg>
   <msg key="Example_File">Example File</msg>
   <msg key="External_URL">External URL</msg>
+  <msg key="External_URL_1">External URL:</msg>
   <msg key="Extra_Large">Extra Large</msg>
   <msg key="Fields">Fields</msg>
   <msg key="First_Line">First Line</msg>
+  <msg key="First_Name">First Name</msg>
   <msg key="First_Names">First Names</msg>
   <msg key="From">From</msg>
   <msg key="Full">Full</msg>
   <msg key="Full_Access">Full Access</msg>
   <msg key="General_Information">General Information</msg>
-  <msg key="Groups">Groups</msg>
+  <msg key="General_Site_Help">General Site Help</msg>
   <msg key="Guest">Guest?</msg>
   <msg key="Guest_1">Guest?</msg>
+  <msg key="Header_Alternate_Text">Header Alternate Text</msg>
   <msg key="Header_Font">Header Font</msg>
   <msg key="Header_Font_Color">Header Font Color</msg>
   <msg key="Header_Font_Colors">Header Font Colors</msg>
   <msg key="Header_Font_Size">Header Font Size</msg>
   <msg key="Header_Font_Sizes">Header Font Sizes</msg>
   <msg key="Header_Fonts">Header Fonts</msg>
-  <msg key="Header_Icon">Header Icon</msg>
-  <msg key="Header_Icon_Alt_Text">Header Icon Alt Text</msg>
-  <msg key="Header_Icon_Alt_text">Header Icon Alt text</msg>
-  <msg key="Header_Logo">Header Logo</msg>
+  <msg key="Header_Icon_Alt_Text">Header Icon Alt text</msg>
   <msg key="Header_Logo_Alt_Text">Header Logo Alt Text</msg>
   <msg key="Header_Logo_Item_ID">Header Logo Item ID</msg>
-  <msg key="Help">Help</msg>
   <msg key="ID">ID:</msg>
   <msg key="ID_1">ID</msg>
   <msg key="Invalid">Invalid</msg>
@@ -120,6 +128,7 @@
   <msg key="Last_Visit">Last Visit:</msg>
   <msg key="Last_visit_over">Last visit over</msg>
   <msg key="Last_visit_under">Last visit under</msg>
+  <msg key="Latest_post">Latest post:</msg>
   <msg key="Limited">Limited</msg>
   <msg key="Limited_Access">Limited Access</msg>
   <msg key="Mail_Failed">Mail Failed</msg>
@@ -137,10 +146,12 @@
   <msg key="Memberships_1">Memberships:</msg>
   <msg key="Message">Message</msg>
   <msg key="My_Communities">My Communities</msg>
+  <msg key="NA">N/A</msg>
   <msg key="Name">Name</msg>
   <msg key="Name__Email">Name / Email</msg>
   <msg key="Needs_Approval">Needs Approval</msg>
   <msg key="New">New</msg>
+  <msg key="New_Password">New Password:</msg>
   <msg key="New_Term">New Term</msg>
   <msg key="New_User">New User</msg>
   <msg key="No">No</msg>
@@ -150,28 +161,32 @@
   <msg key="No_classes">No classes</msg>
   <msg key="No_dont_delete_it">No, don't delete it</msg>
   <msg key="No_groups_to_add_to">No groups to add to</msg>
-  <msg key="No_members">No members</msg>
   <msg key="No_user_found">No user found</msg>
   <msg key="None">None</msg>
   <msg key="Normal">Normal</msg>
   <msg key="Not_Allowed">Not Allowed</msg>
   <msg key="Note">Note:</msg>
+  <msg key="Nuke">Nuke</msg>
   <msg key="Nuke_">Nuke ...</msg>
   <msg key="Nuke_Users">Nuke Users</msg>
   <msg key="Open">Open</msg>
   <msg key="Or">Or</msg>
   <msg key="Pending">Pending</msg>
   <msg key="Pending_Approval">Pending Approval</msg>
+  <msg key="Personal_Options">Personal Options</msg>
   <msg key="Personal_home_page">Personal home page:</msg>
   <msg key="Portrait">Portrait:</msg>
+  <msg key="Post_to">Post to:</msg>
   <msg key="Pretty_Name">Pretty Name</msg>
   <msg key="Pretty_Plural">Pretty Plural</msg>
   <msg key="Preview">Preview</msg>
+  <msg key="Public_Web_Log">Public Web Log</msg>
   <msg key="Recipients_Email">Recipient's Email</msg>
   <msg key="Recipients_Last_Name">Recipient's Last Name</msg>
   <msg key="Referer">Referer</msg>
   <msg key="Registration_date">Registration date:</msg>
   <msg key="Reject">Reject</msg>
+  <msg key="Request_Membership">Request Membership</msg>
   <msg key="Results">Results</msg>
   <msg key="Return_URL">Return URL</msg>
   <msg key="Role">Role</msg>
@@ -185,7 +200,9 @@
   <msg key="Size">Size</msg>
   <msg key="SloanSpace">SloanSpace</msg>
   <msg key="Small">Small</msg>
+  <msg key="Sorry">Sorry!</msg>
   <msg key="Spam_">Spam ...</msg>
+  <msg key="Spam_Community">Spam Community</msg>
   <msg key="Spam_Users">Spam Users</msg>
   <msg key="Start_Date">Start Date</msg>
   <msg key="Start_date">Start date:</msg>
@@ -200,7 +217,9 @@
   <msg key="To">To</msg>
   <msg key="Type">Type</msg>
   <msg key="Unknown_Term">Unknown Term</msg>
+  <msg key="Update_Password">Update Password</msg>
   <msg key="User">User</msg>
+  <msg key="User_Admin_Page">User Admin Page</msg>
   <msg key="User_ID">User ID:</msg>
   <msg key="User_ID_1">User ID</msg>
   <msg key="User_Management">User Management</msg>
@@ -217,7 +236,6 @@
   <msg key="Yes_delete">Yes, delete</msg>
   <msg key="You_can_specify_colors_by_name">You can specify colors by name</msg>
   <msg key="You_must_create">You must create</msg>
-  <msg key="Youre_adding">You're adding</msg>
   <msg key="Youre_editing">You're editing</msg>
   <msg key="Youve_chosen_to_add">You've chosen to add</msg>
   <msg key="a_member_of">A member of the</msg>
@@ -313,83 +331,148 @@
   <msg key="lime">lime</msg>
   <msg key="login_information">Login information:</msg>
   <msg key="logout">Logout</msg>
+  <msg key="lt_Add_Members_to_Anothe">Add Members to Another Community</msg>
   <msg key="lt_Add_Membership_To_Com">Add Membership To Community</msg>
   <msg key="lt_Add_These_Users_To_A_">Add These Users To A Group</msg>
   <msg key="lt_Add_a_new_dotLRN_user">Add a new dotLRN user:</msg>
+  <msg key="lt_Add_a_new_user_to_Slo">Add a new user to SloanSpace</msg>
+  <msg key="lt_Add_community_name_Me">Add %community_name% Members to Another Community</msg>
   <msg key="lt_Add_members_to_anothe">Add members to another group</msg>
   <msg key="lt_Administrative_Action">Administrative Actions</msg>
+  <msg key="lt_An_error_occured_whil">An error occured while trying to add a user to a community.  This error has been logged.</msg>
+  <msg key="lt_An_error_occured_whil_1">An error occured while trying to remove a user to a community.  This error has been logged.</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete the empty department</msg>
+  <msg key="lt_Be_sure_that_the_pers">Be sure that the person does not already have a SloanSpace account under another email address. Duplicate accounts cause problems for everyone. To add a person with an existing account use &lt;a href=members&gt;Manage Membership&lt;/a&gt;.</msg>
   <msg key="lt_Change_my_language_se">Change my language setting</msg>
   <msg key="lt_Class_Key_a_short_nam">Class Key (a short name, no spaces)</msg>
   <msg key="lt_Communitys_Web_Addres">Community's Web Address</msg>
-  <msg key="lt_E-mail_address_must_b">E-mail address must be valid and unique</msg>
-  <msg key="lt_Edit_My_Bulletin_Boar">Edit My Notifications</msg>
+  <msg key="lt_Do_you_really_want_to">Do you really want to remove the following members?</msg>
+  <msg key="lt_Do_you_really_want_to_1">Do you really want to remove %num_users% users?</msg>
+  <msg key="lt_E-mail_address_must_b">E-mail address must be valid and unique. &lt;br&gt;This user probably already has a SloanSpace account. &lt;br&gt;Try adding this user through &lt;a href=members&gt;Manage Membership&lt;/a&gt;.</msg>
+  <msg key="lt_Edit_My_Notifications">Edit My Notifications</msg>
   <msg key="lt_Edit_My_Personal_Info">Edit My Personal Information</msg>
   <msg key="lt_Edit_Pre-approved_Ema">Edit Pre-approved Email Servers</msg>
+  <msg key="lt_Edit_department_prope">Edit department properties.</msg>
   <msg key="lt_Email_suffixes_listed">Email suffixes listed here are used to automatically make dotLRN users of
   people that register with email addresses that match one of the values in
   this list.</msg>
+  <msg key="lt_Error_Nuking_first_na">Error Nuking %first_names% %last_name% (%email%)</msg>
+  <msg key="lt_Error_adding_user_to_">Error adding user to community</msg>
+  <msg key="lt_Error_removing_user_c">Error removing user community</msg>
+  <msg key="lt_Error_sending_email_t">Error sending email to %email% from password-update-2.tcl</msg>
   <msg key="lt_First_check_the_box_o">First check the box of the users you want to add, next select their
       role, and finally submit the form.</msg>
+  <msg key="lt_Folder_folder_name_is">Folder %folder_name% is empty</msg>
   <msg key="lt_Go_back_and_try_again">Go back and try again</msg>
+  <msg key="lt_Help_and_Personal_Con">Help and Personal Configuration</msg>
   <msg key="lt_Here_is_the_actual_er">Here is the actual error message:</msg>
   <msg key="lt_Here_you_can_create_s">Here you can create several users at once using a correctly formatted CSV
 (comma-separated values) file. You can create a spreadsheet and save it as
 a CSV file to import here.</msg>
+  <msg key="lt_If_this_person_is_a_M">If this person is a MIT or Sloan Student have him self-register at sloanspace.mit.edu so he will have a full access account.</msg>
+  <msg key="lt_If_you_wish_to_give_g">If you wish to give guests full access to forums and surveys you may request that the site-wide admin change the status of your community. This option is not open to classes due to MIT privacy policy.</msg>
+  <msg key="lt_Information_about_oth">Information about other members of this community will not be available to this user.</msg>
   <msg key="lt_Interactive_setting_o">Interactive setting of dotLRN parameters</msg>
+  <msg key="lt_JoinDrop_Classes_or_C">Join/Drop Classes or Communities</msg>
   <msg key="lt_JoinDrop_a_Class_or_C">Join/Drop a Class or Community Group</msg>
   <msg key="lt_Join_the_above_criter">Join the above criteria with</msg>
   <msg key="lt_Join_the_above_criter_1">Join the above criteria by</msg>
   <msg key="lt_Key_a_short_name_no_s">Key (a short name, no spaces)</msg>
   <msg key="lt_Last_Visit_Over_in_da">Last Visit Over (in days)</msg>
   <msg key="lt_Last_Visit_Within_in_">Last Visit Within (in days)</msg>
+  <msg key="lt_Make_this_user_a_site">Make this user a site wide admin.</msg>
   <msg key="lt_Manage_this_users_por">Manage this user's portrait</msg>
   <msg key="lt_No_I_dont_want_to_arc">No, I don't want to archive this group.</msg>
+  <msg key="lt_Note_The_script_will_">Note: The script will continue to run even if you 
+close your browser.</msg>
+  <msg key="lt_Note_This_process_is_">Note: This process is expected to take %num_seconds% seconds.</msg>
+  <msg key="lt_Note_This_process_is__1">Note: This process is expected to take %num_minutes% minutes.</msg>
+  <msg key="lt_Note_use_this_feature">Note: use this feature responsibly and &lt;i&gt;think&lt;/i&gt; first.</msg>
   <msg key="lt_Note_you_will_have_th">Note: you will have the option of adding these users to a group
 once they have been uploaded.</msg>
+  <msg key="lt_Nuke_first_names_last">Nuke %first_names% %last_name% (%email%)</msg>
+  <msg key="lt_Please_confirm_that_y">Please confirm that you want eliminate all traces of %first_names%
+%last_name% (%email%) from the database.  If you select &quot;Yes&quot;, we'll
+make an attempt.  If we succeed, you'll be redirected to where you
+were.  If there is an error and we are unable to complete the removal,
+we'll return an error message.</msg>
+  <msg key="lt_Please_follow_the_fol">Please follow the following link to reset your password:
+
+%change_password_url%
+
+</msg>
   <msg key="lt_Please_select_a_diffe">Please select a different name</msg>
   <msg key="lt_Pre-approved_Email_Se">Pre-approved Email Servers</msg>
   <msg key="lt_Recipients_First_Name">Recipient's First Name</msg>
+  <msg key="lt_Return_to_where_you_w">Return to where you were.</msg>
   <msg key="lt_Revert_ONLY_the_Heade">Revert ONLY the Header Icon properties to defaults</msg>
   <msg key="lt_Revert_all_properties">Revert all properties to defaults</msg>
   <msg key="lt_Save_and_use_this_hea">Save and use this header</msg>
+  <msg key="lt_Search_dotLRN_users_f">Search dotLRN users for user:</msg>
   <msg key="lt_Senders_Email_Address">Sender's Email Address</msg>
   <msg key="lt_Some_of_the_emails_fa">Some of the emails failed. Those users had random passwords generated for them, however. The best way to proceed is to have these users log in and ask them to click on 'I have forgotten my password'.</msg>
   <msg key="lt_The_first_line_of_the">The first line of the file</msg>
+  <msg key="lt_The_following_email_w">The following email was just sent from %system_name%</msg>
+  <msg key="lt_The_following_email_w_1">The following email was just sent from %system_name%
+
+Sent by: %system_owner%
+Sent to: %email%
+Subject: %subject%
+Message: %body%</msg>
   <msg key="lt_The_following_members">The following members of</msg>
   <msg key="lt_The_following_variabl">The following variables can be used to insert user/community specific data:</msg>
   <msg key="lt_The_groups_data_will_">The group's data will not be modified, but the group will only be accessible to system administrators.</msg>
   <msg key="lt_The_results_of_your_s">The results of your search are:</msg>
   <msg key="lt_The_system_was_unable">The system was unable to send email. Please notify the user personally. This problem is probably caused by a misconfiguration of your email system. Here is the error:</msg>
   <msg key="lt_There_was_a_bug_in_th">There was a bug in this page</msg>
   <msg key="lt_There_was_a_bug_in_th_1">There was a bug in this page. Please report this problem.</msg>
+  <msg key="lt_There_was_an_error_se">There was an error sending email to %email%.</msg>
+  <msg key="lt_There_was_an_error_se_1">There was an error sending email to %system_owner%.</msg>
   <msg key="lt_There_was_an_error_tr">There was an error trying to add your content.
             The most likely causes are that:</msg>
   <msg key="lt_This_action_will_take">This action will take approximately</msg>
-  <msg key="lt_This_page_will_eventu">This page will eventually include help</msg>
+  <msg key="lt_This_action_will_take_1">This action will take approximately &lt;strong&gt;%estimated_number_of_seconds%&lt;/strong&gt; seconds.</msg>
+  <msg key="lt_This_allows_you_to_gi">This allows you to give a non-MIT  person who is not a registered student access to this group.</msg>
+  <msg key="lt_This_user_is_a_site-w">This user is a site-wide admin.</msg>
+  <msg key="lt_This_user_is_currentl">This user is currently in state &lt;i&gt;%member_state%&lt;/i&gt;.  To allow this user access to dotLRN you must &lt;br&gt;&lt;a href=&quot;%approve_user_url%&quot;&gt;approve and add to dotLRN&lt;/a&gt;</msg>
   <msg key="lt_Update_this_users_pas">Update this user's password</msg>
+  <msg key="lt_Use_this_only_for_an_">Use this only for an officially registered student in this class who is &lt;b&gt;not&lt;/b&gt; a MIT or Sloan student.</msg>
+  <msg key="lt_Web_Log_for_user_name">Web Log for %user_name%</msg>
+  <msg key="lt_Well_we_tried_to_nuke">Well, we tried to nuke the user, but there was an error.  The most
+likely case is that a reference to this user (user_id=%user_id%)
+exists somewhere in the database schema.  It's time to call your
+programmers!</msg>
   <msg key="lt_What_others_see_about">(What others see about me:</msg>
   <msg key="lt_Year_eg_2003_20032004">Year (e.g. 2003, 2003/2004)</msg>
+  <msg key="lt_You_are_about_to_dele">You are about to delete %num_users% users.</msg>
+  <msg key="lt_You_are_adding_strong">You are adding &lt;strong&gt;%first_names% %last_name% (%email%)&lt;/strong&gt; to %community_name%:</msg>
   <msg key="lt_You_are_not_allowed_t">You are not allowed to perform that action.</msg>
   <msg key="lt_You_double-clicked_th">You double-clicked the &quot;Add&quot; button on the previous page.</msg>
   <msg key="lt_You_may_now_choose_to">You may now choose to</msg>
+  <msg key="lt_You_need_to_confirm_t">You need to confirm the password that you typed. (Type the same thing again.)</msg>
   <msg key="lt_You_tried_to_upload_a">You tried to upload a non-image file.</msg>
   <msg key="lt_Your_Current_Membersh">Your Current Memberships</msg>
   <msg key="lt_Your_dotLRN_Workspace">Your dotLRN Workspace</msg>
+  <msg key="lt_Your_password_on_syst">Your password on %system_name%</msg>
+  <msg key="lt_Your_passwords_dont_m">Your passwords don't match! Presumably, you made a typo while entering one of them.</msg>
   <msg key="lt_Your_search_returned_">Your search returned no results, please broaden your search criteria.</msg>
   <msg key="lt_Youre_asking_to_chang">You're asking to change the level of access of this user.
 This has strong repercussions. Are you user about this?</msg>
   <msg key="lt__since_these_must_be_">, since these must be
   associated with Terms.</msg>
   <msg key="lt_a_secondary">- 
         a secondary identifier for the  user.</msg>
+  <msg key="lt_approve_and_add_to_do">approve and add to dotLRN</msg>
   <msg key="lt_are_not_yet_members_o">are not yet members of</msg>
   <msg key="lt_dotLRN_properties_for">dotLRN properties for this user.</msg>
   <msg key="lt_emailing_this_user_fa">emailing this user failed!</msg>
   <msg key="lt_having_trouble">Having trouble getting the look you want? Here's some tips</msg>
   <msg key="lt_if_you_misspell">If you misspell the font name or pick a font that a user doesn't
   have on her computer, the normal system font will be used.</msg>
-  <msg key="lt_this_is_what_the_header">This is what the header will look like</msg>
+  <msg key="lt_policy_must_be_one_of">policy must be one of: open, needs approval, or closed</msg>
+  <msg key="lt_spam_policy_must_be_o">spam policy must be one of: all or members</msg>
+  <msg key="lt_strongfirst_names_las">&lt;strong&gt;%first_names% %last_name% (%email%)&lt;/strong&gt; is a %existing_role% in %community_name%. You may select a new role below:</msg>
+  <msg key="lt_this_is_what_the_header">This is what the header title will look like</msg>
   <msg key="lt_this_may_take_some_time">This may take some time. Please be patient.</msg>
   <msg key="lt_this_user_is_deleted_">this user is deleted and
   banned from the community.</msg>
@@ -401,7 +484,6 @@
   <msg key="members">Members</msg>
   <msg key="must">must</msg>
   <msg key="must_be_one_of">- must be one of</msg>
-  <msg key="myspace">MySpace</msg>
   <msg key="navy">navy</msg>
   <msg key="new">new</msg>
   <msg key="new_class">New</msg>
@@ -411,6 +493,7 @@
   <msg key="non_member_page_name">Not-A-Member</msg>
   <msg key="none_set_up">none set up</msg>
   <msg key="not_a_user">Not a User</msg>
+  <msg key="nuke">nuke</msg>
   <msg key="of_type">of type</msg>
   <msg key="olive">olive</msg>
   <msg key="optional_defaults_to">optional, defaults to</msg>
@@ -425,6 +508,7 @@
   <msg key="registration_request_sent">Thank you. Your registration request has been sent to the System Administrator</msg>
   <msg key="reject">reject</msg>
   <msg key="required">required</msg>
+  <msg key="revoke">revoke</msg>
   <msg key="rrggbb">rrggbb</msg>
   <msg key="search">search</msg>
   <msg key="seconds">seconds.</msg>
@@ -448,6 +532,7 @@
   <msg key="the_format_of_email_domains">The format of this value is a comma-separated list of domains (usually
   preceded by the *@ string which match
   &amp;lt;anything&amp;gt;@&amp;lt;email-domain&amp;gt;). For example, you might use:</msg>
+  <msg key="there_are_no_users_matching">There are no users matching %search_text%.</msg>
   <msg key="this_user_is_deleted">this user is deleted</msg>
   <msg key="this_user_to_dotLRN">this user to dotLRN.</msg>
   <msg key="to_be_able_to_create">to be able to create</msg>
Index: openacs-4/packages/dotlrn/sql/oracle/communities-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/communities-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/sql/oracle/communities-create.sql	9 Aug 2002 18:39:24 -0000	1.12
+++ openacs-4/packages/dotlrn/sql/oracle/communities-create.sql	4 Dec 2002 09:51:03 -0000	1.13
@@ -31,7 +31,6 @@
                                 primary key,
     supertype                   constraint dotlrn_ct_supertype_fk
                                 references dotlrn_community_types (community_type),
-    constraint dotlrn_ct_type_supertype_un unique (community_type, supertype),
     pretty_name                 varchar2(100)
                                 constraint dotlrn_ct_pretty_name_nn
                                 not null,
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/oracle/custom-permissions.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql	9 Aug 2002 18:39:24 -0000	1.18
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-create.sql	4 Dec 2002 09:51:03 -0000	1.19
@@ -37,3 +37,4 @@
 @@ main-portlet-create.sql
 @@ security-create.sql
 @@ user-extension-create.sql
+@@ custom-permissions.sql
Index: openacs-4/packages/dotlrn/sql/oracle/security-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/security-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/oracle/security-create.sql	9 Aug 2002 18:39:24 -0000	1.3
+++ openacs-4/packages/dotlrn/sql/oracle/security-create.sql	4 Dec 2002 09:51:03 -0000	1.4
@@ -49,9 +49,13 @@
     -- the ability to create a community type
     acs_privilege.create_privilege('dotlrn_create_community_type');
 
+    -- the ability to spam a community
+    acs_privilege.create_privilege('dotlrn_spam_community');
+
     -- consistent permissions
     acs_privilege.add_child('dotlrn_edit_community', 'dotlrn_view_community');
     acs_privilege.add_child('dotlrn_admin_community', 'dotlrn_edit_community');
+    acs_privilege.add_child('dotlrn_admin_community', 'dotlrn_spam_community');
 
     -- inheritance
     acs_privilege.add_child('create', 'dotlrn_create_community_type');
Index: openacs-4/packages/dotlrn/sql/oracle/security-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/security-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/security-drop.sql	9 Aug 2002 18:39:24 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/oracle/security-drop.sql	4 Dec 2002 09:51:03 -0000	1.3
@@ -36,6 +36,7 @@
 
     acs_privilege.remove_child('dotlrn_edit_community', 'dotlrn_view_community');
     acs_privilege.remove_child('dotlrn_admin_community', 'dotlrn_edit_community');
+    acs_privilege.remove_child('dotlrn_admin_community', 'dotlrn_spam_community');
 
     delete
     from acs_permissions
@@ -46,7 +47,8 @@
                         'dotlrn_create_community_type',
                         'dotlrn_edit_community',
                         'dotlrn_view_community',
-                        'dotlrn_view_community_type');
+                        'dotlrn_view_community_type',
+                        'dotlrn_spam_community');
 
     acs_privilege.drop_privilege('dotlrn_admin_community');
     acs_privilege.drop_privilege('dotlrn_admin_community_type');
@@ -56,6 +58,7 @@
     acs_privilege.drop_privilege('dotlrn_edit_community');
     acs_privilege.drop_privilege('dotlrn_view_community');
     acs_privilege.drop_privilege('dotlrn_view_community_type');
+    acs_privilege.drop_privilege('dotlrn_spam_community');
 
 end;
 /
Index: openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql	9 Aug 2002 18:39:25 -0000	1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/communities-create.sql	4 Dec 2002 09:51:03 -0000	1.4
@@ -34,7 +34,6 @@
     supertype                   varchar(100)
 				constraint dotlrn_ct_supertype_fk
                                 references dotlrn_community_types (community_type),
-    constraint dotlrn_ct_type_supertype_un unique (community_type, supertype),
     pretty_name                 varchar(100)
                                 constraint dotlrn_ct_pretty_name_nn
                                 not null,
Index: openacs-4/packages/dotlrn/sql/postgresql/communities-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/communities-drop.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/communities-drop.sql	9 Aug 2002 18:39:25 -0000	1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/communities-drop.sql	4 Dec 2002 09:51:03 -0000	1.4
@@ -26,7 +26,7 @@
 -- @version $Id$
 --
 
-\i communities-tree-drop.sql;
+\i communities-tree-drop.sql
 
 drop view dotlrn_active_comms_not_closed;
 drop view dotlrn_active_communities;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/postgresql/custom-permissions.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql	9 Aug 2002 18:39:25 -0000	1.9
+++ openacs-4/packages/dotlrn/sql/postgresql/dotlrn-create.sql	4 Dec 2002 09:51:03 -0000	1.10
@@ -36,3 +36,4 @@
 \i main-portlet-create.sql
 \i security-create.sql
 \i user-extension-create.sql
+\i custom-permissions.sql
Index: openacs-4/packages/dotlrn/sql/postgresql/security-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/security-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/sql/postgresql/security-create.sql	9 Aug 2002 18:39:25 -0000	1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/security-create.sql	4 Dec 2002 09:51:03 -0000	1.4
@@ -28,59 +28,68 @@
 -- Security Setup for dotLRN
 -- privileges, privilege inheritance
 --
-begin;
+create function inline0()
+returns integer as '
+begin
         -- the ability to browse dotLRN in general
-        select acs_privilege__create_privilege('dotlrn_browse');
+        perform acs_privilege__create_privilege(''dotlrn_browse'');
 
         -- the ability to even view that a community exists
-        select acs_privilege__create_privilege('dotlrn_view_community');
+        perform acs_privilege__create_privilege(''dotlrn_view_community'');
 
         -- the ability to participate in a community
-        select acs_privilege__create_privilege('dotlrn_edit_community');
+        perform acs_privilege__create_privilege(''dotlrn_edit_community'');
 
         -- the ability to admin a community
-        select acs_privilege__create_privilege('dotlrn_admin_community');
+        perform acs_privilege__create_privilege(''dotlrn_admin_community'');
 
         -- the ability to create a community
-        select acs_privilege__create_privilege('dotlrn_create_community');
+        perform acs_privilege__create_privilege(''dotlrn_create_community'');
 
         -- the ability to even view a community type
-        select acs_privilege__create_privilege('dotlrn_view_community_type');
+        perform acs_privilege__create_privilege(''dotlrn_view_community_type'');
 
         -- the ability to admin a community type
-        select acs_privilege__create_privilege('dotlrn_admin_community_type');
+        perform acs_privilege__create_privilege(''dotlrn_admin_community_type'');
         
         -- the ability to create a community type
-        select acs_privilege__create_privilege('dotlrn_create_community_type');
+        perform acs_privilege__create_privilege(''dotlrn_create_community_type'');
 
+        -- the ability to spam a community
+        perform acs_privilege__create_privilege(''dotlrn_spam_community'');
+
         -- temporarily drop this trigger to avoid a data-change violation 
         -- on acs_privilege_hierarchy_index while updating the child privileges.
 
         drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy;
 
         -- Consistent permissions
-        select acs_privilege__add_child('dotlrn_edit_community', 'dotlrn_view_community');
-        select acs_privilege__add_child('dotlrn_admin_community', 'dotlrn_edit_community');
+        perform acs_privilege__add_child(''dotlrn_edit_community'', ''dotlrn_view_community'');
+        perform acs_privilege__add_child(''dotlrn_admin_community'', ''dotlrn_edit_community'');
+        perform acs_privilege__add_child(''dotlrn_admin_community'', ''dotlrn_spam_community'');
 
         -- inheritance
-        select acs_privilege__add_child('create', 'dotlrn_create_community_type');
-        select acs_privilege__add_child('create', 'dotlrn_create_community');
-        select acs_privilege__add_child('write', 'dotlrn_edit_community');
-        select acs_privilege__add_child('read', 'dotlrn_view_community');
-        select acs_privilege__add_child('read', 'dotlrn_view_community_type');
-        select acs_privilege__add_child('admin', 'dotlrn_admin_community');
-        select acs_privilege__add_child('admin', 'dotlrn_admin_community_type');
+        perform acs_privilege__add_child(''create'', ''dotlrn_create_community_type'');
+        perform acs_privilege__add_child(''create'', ''dotlrn_create_community'');
+        perform acs_privilege__add_child(''write'', ''dotlrn_edit_community'');
+        perform acs_privilege__add_child(''read'', ''dotlrn_view_community'');
+        perform acs_privilege__add_child(''read'', ''dotlrn_view_community_type'');
+        perform acs_privilege__add_child(''admin'', ''dotlrn_admin_community'');
+        perform acs_privilege__add_child(''admin'', ''dotlrn_admin_community_type'');
+        -- for now, we only want admins to be able to browse by default
+        perform acs_privilege__add_child(''admin'', ''dotlrn_browse'');
 
         -- re-enable the trigger before the last insert to force the 
         -- acs_privilege_hierarchy_index table to be updated.
-
         create trigger acs_priv_hier_ins_del_tr after insert or delete
         on acs_privilege_hierarchy for each row
         execute procedure acs_priv_hier_ins_del_tr ();
 
-        -- for now, we only want admins to be able to browse by default
-        select acs_privilege__add_child('admin', 'dotlrn_browse');
-
         -- no default permissions
+        return 0;
+end;' language 'plpgsql';
 
-end;
+select inline0();
+drop function inline0();
+
+
Index: openacs-4/packages/dotlrn/sql/postgresql/security-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/security-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/postgresql/security-drop.sql	9 Aug 2002 18:39:25 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/postgresql/security-drop.sql	4 Dec 2002 09:51:03 -0000	1.3
@@ -39,7 +39,9 @@
 
     perform acs_privilege__remove_child(''dotlrn_edit_community'', ''dotlrn_view_community'');
     perform acs_privilege__remove_child(''dotlrn_admin_community'', ''dotlrn_edit_community'');
+    perform acs_privilege__remove_child(''dotlrn_admin_community'', ''dotlrn_spam_community'');
 
+
     delete
     from acs_permissions
     where privilege in (''dotlrn_admin_community'',
@@ -59,7 +61,7 @@
     perform acs_privilege__drop_privilege(''dotlrn_edit_community'');
     perform acs_privilege__drop_privilege(''dotlrn_view_community'');
     perform acs_privilege__drop_privilege(''dotlrn_view_community_type'');
-
+    perform acs_privilege__drop_privilege(''dotlrn_spam_community'');
     return 0;
 
 end;' language 'plpgsql';
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.171 -r1.172
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	12 Nov 2002 08:44:05 -0000	1.171
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	4 Dec 2002 09:51:03 -0000	1.172
@@ -217,7 +217,7 @@
                 where object_id = :community_id
             }
 
-            set template_id [dotlrn::get_portal_id_from_type -type $community_type]
+            set template_id [dotlrn::get_portal_id_from_type -type $object_type]
 
             # Create comm's portal page
             set portal_id [portal::create \
@@ -311,8 +311,21 @@
         # this community should be able to read this instance (and
         # it's children)
         permission::set_not_inherit -object_id $community_id
-
-        return $community_id
+	
+	#this block sets permissions for subcommunities
+	while {1} {
+	    if {![empty_string_p $parent_community_id]} {
+		#admin of the parent need admin on the subcommunity.
+		set parent_admin_party [db_string "parent_admin_party" "select segment_id from rel_segments where group_id = :parent_community_id and rel_type='dotlrn_admin_rel'"]
+		permission::grant -party_id $parent_admin_party -object_id $community_id -privilege "admin"
+		
+		#if this community has a parent we need to work up the chain.
+		set parent_community_id [get_parent_id -community_id $parent_community_id]
+		
+	    } else {
+		return $community_id
+	    }
+	}
     }
 
     ad_proc set_active_dates {
@@ -376,12 +389,10 @@
     ad_proc -private get_default_roles_not_cached {
         {-community_type:required}
     } {
-        set toplevel_community_type [get_toplevel_community_type -community_type $community_type]
-
-        if {[string match $toplevel_community_type dotlrn_class_instance]} {
-            set community_type dotlrn_class_instance
-        } else {
+        if {[string match $community_type dotlrn_club]} {
             set community_type dotlrn_community
+        } elseif {![string match $community_type dotlrn_community]} {
+            set community_type dotlrn_class_instance
         }
 
         return [db_list_of_lists select_role_data {}]
@@ -441,7 +452,6 @@
             set pretty_name [lindex $roles [expr $i + 2]]
         }
 
-        ns_log Notice "PM: pretty_name $pretty_name [lang::util::localize $pretty_name]"
         return [lang::util::localize $pretty_name]
     }
 
@@ -572,6 +582,9 @@
         set member_segment_id [get_members_rel_id -community_id $community_id]
         set admin_segment_id [get_admin_rel_id -community_id $community_id]
 
+	set parent_id [dotlrn_community::get_parent_id -community_id $community_id]
+        set parent_admin_segment_id [get_admin_rel_id -community_id $parent_id]
+
         permission::grant \
             -party_id $member_segment_id \
             -object_id $community_id \
@@ -745,6 +758,7 @@
         }
 
         util_memoize_flush "dotlrn_community::list_users_not_cached -rel_type $rel_type -community_id $community_id"
+	util_memoize_flush_regexp  $user_id
     }
 
     ad_proc -public add_user_to_community {
@@ -772,6 +786,12 @@
             ns_set put $extra_vars user_id $user_id
             ns_set put $extra_vars community_id $community_id
 
+	    ns_log notice "rel_type is sending the following to relation_add                -member_state needs approval \
+                -extra_vars $extra_vars \
+                $rel_type \
+                $community_id \
+                $user_id "
+
             # Set up the relationship
             if {[catch {set rel_id [relation_add \
                 -member_state "needs approval" \
@@ -861,8 +881,10 @@
             # flush the list_users cache
             util_memoize_flush "dotlrn_community::list_users_not_cached -rel_type $rel_type -community_id $community_id"
         }
+	util_memoize_flush_regexp $user_id
     }
 
+
     ad_proc -public get_all_communities_by_user {
         user_id
     } {
@@ -1120,6 +1142,7 @@
         {-community_id:required}
         {-pretext "<li>"}
         {-join_target register}
+	{-drop_target deregister}
         {-only_member_p 0}
     } {
         Returns a html fragment of the subcommunity hierarchy of this
@@ -1142,22 +1165,23 @@
         if {[empty_string_p $user_id]} {
             set user_id [ad_get_user_id]
         }
-
         foreach sc_id [get_subcomm_list -community_id $community_id] {
-
             if {[has_subcommunity_p -community_id $sc_id] \
                     && [member_p $sc_id $user_id]} {
                 # Shows the subcomms of this subcomm ONLY IF I'm a
                 # member of the current comm
                 set url [get_community_url $sc_id]
                 append chunk "$pretext <a href=$url>[get_community_name $sc_id]</a>\n"
 
-                if {[dotlrn::user_can_admin_community_p -community_id $sc_id]} {
-                    append chunk "\[<small> <a href=${url}one-community-admin>admin</a> </small>\]"
-                }
+		append chunk "<a href=\"${url}${drop_target}?referer=[ad_conn url]\">[_ dotlrn.Drop]</a>\n"
+		 
+# Removing admin to improve performance
+#                if {[dotlrn::user_can_admin_community_p -community_id $sc_id]} {
+#                    append chunk " <a href=\"${url}one-community-admin\"><img border=0 valign=\"bottom\" src=\"graphics/admin.gif\" alt=\"Administer\"></a>\n"
+#                }
 
                 append chunk "<ul>\n[get_subcomm_chunk -community_id $sc_id -user_id $user_id -only_member_p $only_member_p]</ul>\n"
-            } elseif {[member_p $sc_id $user_id] || [dotlrn::user_can_admin_community_p -community_id $sc_id] || [not_closed_p -community_id $sc_id]} {
+            } elseif {[member_p $sc_id $user_id] || [not_closed_p -community_id $sc_id]} {
 
                 # Shows the subcomm if:
                 # 1. I'm a member of this subcomm OR
@@ -1182,24 +1206,27 @@
                 append chunk "$pretext <a href=$url>[get_community_name $sc_id]</a>\n"
 
                 if {![member_p $sc_id $user_id] && [not_closed_p -community_id $sc_id]} {
+                      append chunk "<nobr>"
 
-                      append chunk "<nobr>\[<small> "
-
                       if {[member_pending_p -community_id $sc_id -user_id $user_id]} {
                           append chunk "[_ dotlrn.Pending_Approval]"
                       } elseif {[needs_approval_p -community_id $sc_id]} {
-                          append chunk "<a href=\"${parent_url}${join_target}?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">>Request Membership</a>\n"
-
+                          append chunk "<a href=\"${parent_url}${join_target}?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">[_ dotlrn.Request_Membership]</a>\n"
                       } else {
-                          append chunk "<a href=\"${parent_url}${join_target}\?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">Join</a>\n"
+                          append chunk "<a href=\"${parent_url}${join_target}\?[export_vars {{community_id $sc_id} {referer {[ad_conn url]}}}]\">[_ dotlrn.Join]</a>\n"
                       }
 
-                      append chunk " </small>\]</nobr>\n"
-                }
+                      append chunk "\n"
+                }  elseif {[member_p $sc_id $user_id]} {
 
-                if {[dotlrn::user_can_admin_community_p -community_id $sc_id]} {
-                    append chunk "<nobr>\[<small> <a href=\"${url}one-community-admin\">Administer</a> </small>\]</nobr>\n"
-                }
+		    # User is a member.
+		    append chunk "<a href=\"${url}${drop_target}?referer=[ad_conn url]\">[_ dotlrn.Drop]</a>\n"
+		    
+		}
+		#Removing admin to improve performance.
+#                if {[dotlrn::user_can_admin_community_p -community_id $sc_id]} {
+#                    append chunk " <a href=\"${url}one-community-admin\"><img border=0 valign=\"bottom\" src=\"graphics/admin.gif\" alt=\"Administer\"></a>\n"
+#                }
             }
         }
 
@@ -1296,7 +1323,8 @@
     } {
         if {[subcommunity_p -community_id $community_id]} {
             set parent_name [get_parent_name -community_id $community_id]
-            return [concat "<a href=\"..\">$parent_name</a> : [get_community_name $community_id]"]
+	    set parent_url [get_community_url [get_parent_id -community_id $community_id]]
+	    return [concat "<a href=$parent_url>$parent_name</a> : [get_community_name $community_id]"]
         } else {
             return [get_community_name $community_id]
         }
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -r1.78 -r1.79
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	31 Jul 2002 21:18:32 -0000	1.78
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	4 Dec 2002 09:51:03 -0000	1.79
@@ -26,12 +26,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn_community::get_type_package_id.select_package_id">
-        <querytext>
-            select package_id from dotlrn_community_types where community_type= :community_type
-        </querytext>
-    </fullquery>
-
     <fullquery name="dotlrn_community::set_package_id.update_package_id">
         <querytext>
             update dotlrn_communities_all set package_id= :package_id where community_id= :community_id
@@ -166,7 +160,7 @@
             and registered_users.user_id not in (select dm.user_id
                                                  from dotlrn_member_rels_full dm
                                                  where dm.community_id = :subcomm_id)
-            order by dotlrn_member_rels_approved.rel_type, registered_users.last_name
+            order by last_name
         </querytext>
     </fullquery>
 
@@ -372,15 +366,15 @@
     <fullquery name="dotlrn_community::not_closed_p.check_community_not_closed">
         <querytext>
             select 1
-            from dotlrn_active_comms_not_closed
+            from dotlrn_communities_not_closed
             where community_id = :community_id
         </querytext>
     </fullquery>
 
     <fullquery name="dotlrn_community::open_p.check_community_open">
         <querytext>
             select 1
-            from dotlrn_active_comms_not_closed
+            from dotlrn_communities_not_closed
             where community_id = :community_id
             and join_policy = 'open'
         </querytext>
@@ -389,7 +383,7 @@
     <fullquery name="dotlrn_community::needs_approval_p.check_community_needs_approval">
         <querytext>
             select 1
-            from dotlrn_active_comms_not_closed
+            from dotlrn_communities_not_closed
             where community_id = :community_id
             and join_policy = 'needs approval'
         </querytext>
@@ -468,6 +462,18 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_community::list_applets.select_all_applets">
+        <querytext>
+            select impl_name
+            from acs_sc_impls,
+                 acs_sc_bindings,
+                 acs_sc_contracts
+            where acs_sc_impls.impl_id = acs_sc_bindings.impl_id
+            and acs_sc_contracts.contract_id = acs_sc_bindings.contract_id
+            and acs_sc_contracts.contract_name = 'dotlrn_applet'
+        </querytext>
+    </fullquery>
+
     <fullquery name="dotlrn_community::list_applets.select_community_applets">
         <querytext>
             select dotlrn_applets.applet_key
@@ -478,6 +484,14 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_community::list_active_applets.select_all_active_applets">
+        <querytext>
+            select applet_key
+            from dotlrn_applets
+            where active_p = 't'
+        </querytext>
+    </fullquery>
+
     <fullquery name="dotlrn_community::list_active_applets.select_community_active_applets">
         <querytext>
             select dotlrn_applets.applet_key
Index: openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl	23 Oct 2002 12:38:38 -0000	1.34
+++ openacs-4/packages/dotlrn/tcl/dotlrn-init.tcl	4 Dec 2002 09:51:03 -0000	1.35
@@ -76,14 +76,16 @@
         # init of each applet NOTE: this applet_add proc _must_ be able to be
         # called repeatedly since this script is eval'd at every server startup
         foreach applet [db_list select_not_installed_applets {}] {
-            dotlrn_applet::applet_call $applet AddApplet [list]
+            if {[catch {dotlrn_applet::applet_call $applet AddApplet [list]} errMsg]} { 
+                ns_log warning "dotlrn-init: AddApplet $applet failed\n$errMsg"
+            }
         }
 
         ns_log notice "dotlrn-init: dotlrn is instantiated, about to call dotlrn::init"
 
         if {![dotlrn::is_initialized]} { dotlrn::init }
 
-        ns_log notice "dotlrn-init: about to call dotlrn_class:init"
+        ns_log notice "dotlrn-init: about to call dotlrn_class::init"
 
         if {![dotlrn_class::is_initialized]} { dotlrn_class::init }
 
Index: openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	23 Oct 2002 12:38:38 -0000	1.26
+++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	4 Dec 2002 09:51:04 -0000	1.27
@@ -35,7 +35,7 @@
 
     ad_proc -public get_pretty_name {
     } {
-        return [parameter::get -parameter dotlrn_main_portlet_pretty_name]
+        return [parameter::get -package_id [dotlrn::get_package_id] -parameter dotlrn_main_portlet_pretty_name]
     }
 
     ad_proc -public link {
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.68 -r1.69
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	23 Oct 2002 12:38:38 -0000	1.68
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	4 Dec 2002 09:51:04 -0000	1.69
@@ -412,7 +412,9 @@
         
         foreach applet_key $default_applets_list {
             if {[dotlrn_applet::applet_exists_p -applet_key $applet_key]} {
-                dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]
+                if {[catch {dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]} errMsg]} { 
+                    ns_log warning "FAILED: dotlrn_community::applet_call $applet_key AddPortlet [list $portal_id]\n$errMsg"
+                }
             }
         }
     }
Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	12 Nov 2002 08:44:05 -0000	1.51
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	4 Dec 2002 09:51:04 -0000	1.52
@@ -51,7 +51,13 @@
                 set name "$name-1"
             }
         }
-        
+
+	#bad things happen if the group name is the same as a dotlrn file name.
+	set conflicting_names [list members configure spam index not-allowed clone help]
+	if { [lsearch -exact $conflicting_names $name] != -1 } {
+	    lappend name "-1"
+	}
+
         return $name
     }
 
@@ -126,7 +132,7 @@
             set portal_id [portal::create \
                 -template_id $template_id \
                 -name "[_ dotlrn.lt_Your_dotLRN_Workspace]" \
-                $user_id \
+                $user_id
             ]
 
             ns_set put $extra_vars portal_id $portal_id
@@ -150,12 +156,17 @@
             # are selecting from changes inside the loop causing all kinds of
             # dead lock issues.
             set current_memberships [db_list_of_ns_sets select_current_memberships {
-                select community_id,
+                select dotlrn_member_rels_full.community_id,
                        rel_type,
                        member_state
-                from dotlrn_member_rels_full
+                from dotlrn_member_rels_full, dotlrn_communities
                 where user_id = :user_id
+		and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id
+		and dotlrn_communities.parent_community_id is null
             }]
+           
+            # Note that remove_user will remove users from the subgroups as well as the
+	    # parent community. Therefore, current_memberships only contains parent communities.
 
             foreach row $current_memberships {
                 dotlrn_community::remove_user [ns_set get $row community_id] $user_id
@@ -264,10 +275,15 @@
     } {
         Check if a user can read sensitive data in dotLRN
     } {
-        return [acs_privacy::user_can_read_private_data_p \
-            -user_id $user_id \
-            -object_id [dotlrn::get_package_id] \
-        ]
+	if { [parameter::get -parameter protect_private_data_p -default 1] } {
+	    return [ad_permission_p \
+		    -user_id $user_id \
+		    [dotlrn::get_package_id] \
+		    read_private_data
+	    ]
+	} else {
+	    return 1
+	}
     }
 
     ad_proc -public require_user_read_private_data {
@@ -370,6 +386,26 @@
         }
     }
 
+    ad_proc -public user_can_spam_community_p {
+        {-user_id ""}
+        {-community_id:required}
+    } {
+        check if a user can admin a community
+    } {
+        return [permission::permission_p -party_id $user_id -object_id $community_id -privilege dotlrn_spam_community]
+    }
+
+    ad_proc -public require_user_spam_community {
+        {-user_id ""}
+        {-community_id:required}
+    } {
+        require that user be able to spam a community
+    } {
+        if {![user_can_spam_community_p -user_id $user_id -community_id $community_id]} {
+            do_abort
+        }
+    }
+
     ad_proc -public admin_p {
         {-user_id ""}
     } {
Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	23 Oct 2002 12:38:38 -0000	1.18
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl	4 Dec 2002 09:51:04 -0000	1.19
@@ -106,6 +106,9 @@
         {-user_id:required}
         {-link_control_panel:required}
         {-control_panel_text:required}
+	{-link_all 0}
+        {-pre_html ""}
+        {-post_html ""}
     } {
         A helper procedure that generates the PORTAL navbar (the thing
         with the portal pages on it) for dotlrn. It is called from the
@@ -115,8 +118,8 @@
         set dotlrn_url [dotlrn::get_url]
         set community_id [dotlrn_community::get_community_id]
         set control_panel_name control-panel
-        set link_all 0
-    
+	set control_panel_url "$dotlrn_url/$control_panel_name"
+           
         if {[empty_string_p $community_id]} {
             # We are not under a dotlrn community. However we could be
             # under /dotlrn (i.e. in the user's portal) or anywhere
@@ -143,8 +146,9 @@
             set text [dotlrn_community::get_community_header_name $community_id] 
             set control_panel_name one-community-admin
             set link [dotlrn_community::get_community_url $community_id]
-        
-            # figure out what privs this user has on the community
+	    set control_panel_url "$link/$control_panel_name"
+
+            # figure out what this privs this user has on the community
             set admin_p [dotlrn::user_can_admin_community_p \
                 -user_id $user_id \
                 -community_id $community_id
@@ -177,13 +181,15 @@
         #
         # Common code for the the behavior of the control panel link
         #
+	set extra_td_selected_p 0
         if {$show_control_panel} {
             if {$link_control_panel} {
                 set extra_td_html \
-                    " &nbsp; <a href=$link$control_panel_name>$control_panel_text</a>"
+                    "<a href=$control_panel_url>$control_panel_text</a>"
             } else {
-                set extra_td_html " &nbsp; <strong>$control_panel_text</strong>"
+                set extra_td_html "$control_panel_text"
                 set link_all 1
+		set extra_td_selected_p 1
             } 
         } else {
             set extra_td_html {}
@@ -195,10 +201,11 @@
                 -portal_id $portal_id \
                 -link $link \
                 -link_all $link_all \
-                -pre_html "" \
-                -post_html "" \
+                -pre_html $pre_html \
+                -post_html $post_html \
                 -extra_td_html $extra_td_html \
-                -table_html_args "class=\"navbar\""]
+		-extra_td_selected_p $extra_td_selected_p \
+                -table_html_args "class=\"navbar\" border=0 cellspacing=0 cellpadding=3"]
         }
     }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/zz-dotlrn-postload-init.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/approve-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/approve-link.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/approve-link.adp	23 Oct 2002 12:38:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/approve-link.adp	4 Dec 2002 09:51:04 -0000	1.5
@@ -22,3 +22,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/community-edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/community-edit-2.adp	23 Oct 2002 12:38:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/community-edit-2.adp	4 Dec 2002 09:51:04 -0000	1.5
@@ -30,11 +30,19 @@
 
 
 #dotlrn.lt_this_is_what_the_header#:
-
 <hr>
-<div style="@style_fragment@">
-<img src=community-image?revision_id=@revision_id@ alt="@header_alt_text@" border=0>&nbsp;&nbsp;@header_text@
-</div>
+<table width="100%" cellpadding=0 cellspacing=0>
+  <tr>
+    <td width="10%" class="header-logo">
+     <img src=@header_url@ border=0 alt="@header_alt_text@">
+    </td>
+    <td>
+	<div style="@style_fragment@" class=header-text>
+	@header_text@
+	</div>
+    </td>
+  </tr>
+</table>
 <hr>
 
 <p>
Index: openacs-4/packages/dotlrn/www/community-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/community-edit-2.tcl	12 Nov 2002 08:44:05 -0000	1.9
+++ openacs-4/packages/dotlrn/www/community-edit-2.tcl	4 Dec 2002 09:51:04 -0000	1.10
@@ -38,28 +38,33 @@
 set page_title [_ dotlrn.Preview]
 set header_text [dotlrn_community::get_community_header_name $community_id]
 
-#
 # Image stuff
-#
+
 set tmp_filename [ns_queryget header_img.tmpfile]
+
+#TODO - better way to get typs.
+# THIS DOESN'T WORK.
 set mime_type [ns_guesstype $header_img]
 
+
 if {[empty_string_p $tmp_filename]} {
-    set tmp_size 0
-    set revision_id 0
-} else {
-    set tmp_size [file size $tmp_filename]
-}
+      set tmp_size 0
+      set revision_id 0
+  } else {
+      set tmp_size [file size $tmp_filename]
+  }
+
 set title "$header_img-[db_nextval acs_object_id_seq]"
 
-# strip off the C:\directories... crud and just get the file name
+#  # strip off the C:\directories... crud and just get the file name
+
 if ![regexp {([^/\\]+)$} $header_img match client_filename] {
-    set client_filename $header_img
+      set client_filename $header_img
 }
 
 if { ![empty_string_p [ad_parameter MaximumFileSize]] 
-     && $tmp_size > 0
-     && $tmp_size > [ad_parameter MaximumFileSize] } {
+       && $tmp_size > 0
+      && $tmp_size > [ad_parameter MaximumFileSize] } {
 
     set msg_subst_list [list system_name [ad_system_name] \
                              max_attachments_bytes [util_commify_number [ad_parameter MaximumFileSize]]]
@@ -70,8 +75,11 @@
 if { $tmp_size > 0 } {
     # import the content now, so that we can spit it out in the preview
     db_transaction {
-        set parent_id 0
-        
+
+        # We will store the image in the communities' shared folder.
+        set parent_id [dotlrn_fs::get_community_shared_folder -community_id $community_id]
+               
+
         # the last param "object name" is unused
         set revision_id [cr_import_content \
             -title $title \
@@ -86,7 +94,7 @@
 
         ns_log notice "aks1: new revision_id $revision_id"
 
-    } on_error {
+    } on_error { 
         # most likely a duplicate name, double click, etc.
         ad_return_complaint 1 "
             [_ dotlrn.lt_There_was_an_error_tr]
@@ -101,7 +109,6 @@
                   $errmsg
                 </pre>
               </blockquote>"
-        
         ad_script_abort
     }
 } else {
@@ -143,6 +150,35 @@
 
 append style_fragment " " "color: $header_font_color;"
 
+#logo stuff
+if {[empty_string_p $revision_id]} {
+
+    set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+
+    set temp_community_id $community_id
+    while {[dotlrn_community::subcommunity_p -community_id $temp_community_id]} {
+	# For a subcommunity, we use the logo of the
+	# the first ancestor that is not a sub_community
+
+	set temp_community_id [dotlrn_community::get_parent_id -community_id $temp_community_id]
+	set comm_type [dotlrn_community::get_community_type_from_community_id $temp_community_id]
+ 
+    }
+
+    if {$comm_type == "dotlrn_club"} {
+	#community colors
+	set scope_name "comm"
+    } else {
+	set scope_name "course"
+    }
+    
+    set header_url "[dotlrn::get_url]/graphics/logo-$scope_name.gif"
+
+} else {
+    set header_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$revision_id"
+}
+
+
 form create header_form
 set yes_label "[_ dotlrn.lt_Save_and_use_this_hea]"
 
@@ -158,16 +194,16 @@
     -widget submit
 
 element create header_form header_logo_item_id \
-    -label header_logo_item_id \
-    -datatype text \
-    -widget hidden \
-    -value $revision_id
+      -label header_logo_item_id \
+      -datatype text \
+      -widget hidden \
+      -value $revision_id
 
 element create header_form header_logo_alt_text \
-    -label header_logo_alt_text \
-    -datatype text \
-    -widget hidden \
-    -value $header_alt_text
+      -label header_logo_alt_text \
+      -datatype text \
+      -widget hidden \
+      -value $header_alt_text
 
 element create header_form header_font \
     -label header_font \
@@ -204,8 +240,8 @@
                 [list header_font_size $header_font_size] \
                 [list header_font_color $header_font_color] \
                 [list header_logo_item_id $header_logo_item_id] \
-                [list header_logo_alt_text $header_logo_alt_text] \
-            ]
+                [list header_logo_alt_text $header_logo_alt_text]]
+ 
 
         ad_returnredirect "one-community-admin"
     } else {
Index: openacs-4/packages/dotlrn/www/community-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/community-edit.adp	23 Oct 2002 12:38:39 -0000	1.9
+++ openacs-4/packages/dotlrn/www/community-edit.adp	4 Dec 2002 09:51:04 -0000	1.10
@@ -59,15 +59,20 @@
         <input type="text" name="header_font_color" value="@header_font_color@" size="50" /></td>
       </tr>
 
-      <tr>
-        <td><b>#dotlrn.Header_Icon#</b>&nbsp;&nbsp;</td>
-        <td><input type="file" name="header_img"/></td>
+     <tr>
+           <td><b>#dotlrn.header_logo#</b>&nbsp;&nbsp;</td>
+           <td><img src=@header_url@></tr>
       </tr>
 
+     <tr>
+           <td>&nbsp;&nbsp;</td>
+           <td><input type=file name=header_img size=20></tr>
+      </tr>
+
       <tr>
-        <td><b>#dotlrn.Header_Icon_Alt_text#</b>&nbsp;&nbsp;</td>
-        <td><input type="text" name="header_alt_text" value="@header_alt_text@" size="50" /></td>
-        
+        <td><b>#dotlrn.Header_Alternate_Text#</b>&nbsp;&nbsp;</td>
+        <td nowrap>
+        <input type="text" name="header_alt_text" value="@header_alt_text@" size="50" /></td>
       </tr>
 
       <tr><td align=center colspan=2>
Index: openacs-4/packages/dotlrn/www/community-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/community-edit.tcl	23 Oct 2002 12:38:39 -0000	1.6
+++ openacs-4/packages/dotlrn/www/community-edit.tcl	4 Dec 2002 09:51:04 -0000	1.7
@@ -23,7 +23,7 @@
     @version $Id$
 
 } -query {
-    {referer "community-edit"}
+    {referer "one-community-admin"}
 }
 
 set user_id [ad_conn user_id]
@@ -128,9 +128,46 @@
     -community_id $community_id \
     -attribute_name header_logo_alt_text
 ]
-  
+
+set revision_id [dotlrn_community::get_attribute \
+      -community_id $community_id \
+      -attribute_name header_logo_item_id
+  ]
+
+# Default logos are served from know locations in the file system
+# based on community type.
+
+# Customized logos are stored in the public file-storage folder
+# for the community.
+ 
+if {[empty_string_p $revision_id]} {
+
+    set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+
+    set temp_community_id $community_id
+    while {[dotlrn_community::subcommunity_p -community_id $temp_community_id]} {
+	# For a subcommunity, we use the logo of the
+	# the first ancestor that is not a sub_community
+
+	set temp_community_id [dotlrn_community::get_parent_id -community_id $temp_community_id]
+	set comm_type [dotlrn_community::get_community_type_from_community_id $temp_community_id]
+ 
+    }
+
+    if {$comm_type == "dotlrn_club"} {
+	#community colors
+	set scope_name "comm"
+    } else {
+	set scope_name "course"
+    }
+    
+    set header_url "[dotlrn::get_url]/graphics/logo-$scope_name.gif"
+
+} else {
+    set header_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$revision_id"
+}
+ 
 set title [_ dotlrn.Edit_Properties]
 set context_bar [list [list one-community-admin [_ dotlrn.Administer]] [_ dotlrn.Edit_Properties]]
 
 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.12 -r1.13
--- openacs-4/packages/dotlrn/www/community-member.adp	23 Oct 2002 12:38:39 -0000	1.12
+++ openacs-4/packages/dotlrn/www/community-member.adp	4 Dec 2002 09:51:04 -0000	1.13
@@ -55,7 +55,11 @@
     <if @url@ not nil>
       <li>#dotlrn.Personal_home_page# <a href="@url@">@url@</a></li>
     </if>
-
+	<if @weblog_p@ true>
+	<multiple name="weblogs">
+	<li><a href=@weblog_url@?forum_id=@weblogs.forum_id@>@weblogs.name@</a> - #dotlrn.Latest_post# @weblogs.lastest_post@
+        </multiple>
+        </if>
     <if @bio@ not nil>
       <p> <em>#dotlrn.Biography#</em> @bio@
     </if>
@@ -70,7 +74,7 @@
 <if @folder_id@ not nil>
 <h3>#dotlrn.Shared_Files#</h3>
 
-  <include src="folder-chunk" folder_id=@folder_id@>
+<include src=@scope_fs_url@ folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
 </if>
 
 <multiple name="user_contributions">
Index: openacs-4/packages/dotlrn/www/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/community-member.tcl	18 Nov 2002 17:58:53 -0000	1.12
+++ openacs-4/packages/dotlrn/www/community-member.tcl	4 Dec 2002 09:51:04 -0000	1.13
@@ -59,6 +59,7 @@
     where user_id = :user_id
 }
 
+
 if {![db_0or1row user_information $user_info_sql]} {
     ad_return_error "[_ dotlrn.No_user_found]" [_ dotlrn.no_community_member_with_id [list user_id $user_id]]
     ad_script_abort
@@ -74,6 +75,17 @@
                         and attribute_name = 'bio')
 } -default ""]
 
+set weblog_p 0
+if {1} {
+    set weblog_package_id  [site_node_apm_integration::get_child_package_id  -package_key "forums"]
+    set weblog_url "[dotlrn_community::get_url -package_id $weblog_package_id]/forum-view"
+#set to check if you are using webloggers
+
+    db_multirow weblogs weblogs {select name, forum_id, to_char(o.last_modified, 'Mon DD, YYYY') as lastest_post from forums_forums_enabled f, acs_objects o where o.object_id = forum_id 
+    and o.creation_user = :user_id and f.package_id = :weblog_package_id}
+    set weblog_p 1
+}
+
 set portrait_p 0
 if {[ad_parameter "show_portrait_p" dotlrn]} {
     set portrait_p 1
@@ -114,6 +126,9 @@
 db_multirow user_contributions user_contributions {}
 
 set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id]
+set scope_fs_url "/packages/file-storage/www/folder-chunk"
+set n_past_days ""
+set url [site_node_object_map::get_url -object_id $folder_id]
 
 set context_bar [ad_context_bar_ws_or_index "[_ dotlrn.Community_member]"]
 set system_name [ad_system_name]
Index: openacs-4/packages/dotlrn/www/community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/community-type.adp	23 Oct 2002 12:38:39 -0000	1.10
+++ openacs-4/packages/dotlrn/www/community-type.adp	4 Dec 2002 09:51:04 -0000	1.11
@@ -43,3 +43,4 @@
 <p></p>
 
 
+
Index: openacs-4/packages/dotlrn/www/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/configure.adp	23 Oct 2002 12:38:39 -0000	1.15
+++ openacs-4/packages/dotlrn/www/configure.adp	4 Dec 2002 09:51:04 -0000	1.16
@@ -18,13 +18,14 @@
 
 %>
 
-<master src="dotlrn-master">
-<property name="title">#dotlrn.Customize_Layout#</property>
-<property name="link_control_panel">0</property>
+<master>
+<property name="title">#dotlrn.Configure_name#</property>
+<property name="portal_id">@portal_id@</property>
+<property name="link_all">1</property>
+<property name="show_control_panel">1</property>
+<property name="link_control_panel">1</property>
+<property name="return_url">./</property>
 
 <p></p>
 
 @rendered_page@
-
-
-
Index: openacs-4/packages/dotlrn/www/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/configure.tcl	23 Oct 2002 12:38:39 -0000	1.17
+++ openacs-4/packages/dotlrn/www/configure.tcl	4 Dec 2002 09:51:04 -0000	1.18
@@ -44,25 +44,14 @@
 } else {
     set user_id [ad_conn user_id]
 
-    # am i not a limited access user with 0 or 1 communities?
-    # if so, i have a user portal that i can configure
-    if {![dotlrn::user_can_browse_p -user_id $user_id]} {
-    
-        set communities [dotlrn_community::get_all_communities_by_user $user_id]
-    
-        if {[llength $communities] == 0} {
-            ad_returnredirect "index-not-a-user"
-            ad_script_abort
-        } elseif {[llength $communities] == 1} {
-            ad_returnredirect [ns_set get [lindex $communities 0] url]
-            ad_script_abort
-        }
-    
-    }
+    # I don't see under what circumstance we wouldn't want users to
+    # customize thier own portal. -Caroline.
 
+    #    dotlrn::require_user_browse -user_id $user_id
+
     set portal_id [dotlrn::get_portal_id -user_id $user_id]
     set name [portal::get_name $portal_id]
-    set rendered_page [portal::configure $portal_id "index"]
+    set rendered_page [portal::configure -allow_theme_change_p 0 $portal_id "index"]
 }
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/control-panel.adp	21 Nov 2002 15:18:50 -0000	1.6
+++ openacs-4/packages/dotlrn/www/control-panel.adp	4 Dec 2002 09:51:04 -0000	1.7
@@ -24,25 +24,64 @@
 
 <% set dotlrn_url [dotlrn::get_url] %>
 
+<table border="0" width="100%">
+  <tr>
+    <td valign="top" width="50%">
+<table class="element" border=0 cellpadding="0" cellspacing="0" width="100%">
+<tr> 
+  <td colspan=3 class="element-header-text">#dotlrn.lt_Help_and_Personal_Con#</td>
+</tr>
+<tr><td colspan=3 class="dark-line" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr>
+  <td class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+  <td class="element-text" width="100%">
+<table cellspacing="0" cellpadding="0" class="element-content" width="100%">
+	<tr><td>
+<h3>#dotlrn.General_Site_Help#</h3> 
 <ul>
-  <li><a href="@dotlrn_url@/help">#dotlrn.Help#</a></li>
+  <li><a href="@dotlrn_url@/help">#dotlrn.help#</a></li>
+  <li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@">@system_owner@</a>
+</ul>
+<h3>#dotlrn.Personal_Options#</h3>
+<ul>
+<li><include src="weblog-control-panel">
   <li>
     <a href="/user/basic-info-update?return_url=@referer@">#dotlrn.lt_Edit_My_Personal_Info#</a>
-    <br>
-    <small>
+    <li>
       #dotlrn.lt_What_others_see_about#
-      <%= [acs_community_member_link -user_id $user_id -label "[ad_url][acs_community_member_url -user_id $user_id]"] %>)
-     </small>
+      <%= [acs_community_member_link -user_id $user_id -label "[ad_url][acs_community_member_url -user_id $user_id]"] %>
   </li>
   <li><a href="/user/password-update?return_url=@referer@">#dotlrn.Change_My_Password#</a></li>
   <li><a href="/acs-lang/">#dotlrn.lt_Change_my_language_se#</a></li>
-  <li><a href="/notifications/manage">#dotlrn.lt_Edit_My_Bulletin_Boar#</a></li>
+  <li><a href="/notifications/manage">#dotlrn.lt_Edit_My_Notifications#</a></li>
   <li><a href="configure">#dotlrn.Customize_Layout#</a></li>
+
 <if @admin_p@>
   <li><a href="@admin_url@">@admin_pretty_name@</a></li>
 </if>
 </ul>
+</td></tr></table>
+ </td>
+	  <td align="right" class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
 
-<blockquote>
-  <include src="my-communities" title="#dotlrn.Groups#" referer="control_panel">
-</blockquote>
+</tr>
+<tr><td colspan=3 class="light-line" width="1"><img src="/graphics/spacer.gif"></td></tr>
+</table>
+
+    <td valign="top" width="50%">
+<table class="element" border=0 cellpadding="0" cellspacing="0" width="100%">
+<tr> 
+  <td colspan=3 class="element-header-text">#dotlrn.lt_JoinDrop_Classes_or_C#</td>
+</tr>
+<tr><td colspan=3 class="dark-line" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr>
+  <td class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+  <td class="element-text" width="100%">
+  <include src="dotlrn-main-portlet" show_buttons_p=1 title="Groups" referer="@dotlrn_url@/control-panel">
+ </td>
+	  <td align="right" class="light-line" width="1"><img src="/graphics/spacer.gif" width="1"></td>
+
+</tr>
+<tr><td colspan=3 class="light-line" width="1"><img src="/graphics/spacer.gif"></td></tr>
+</table>
+</table>
Index: openacs-4/packages/dotlrn/www/control-panel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/control-panel.tcl	23 Oct 2002 12:38:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/control-panel.tcl	4 Dec 2002 09:51:04 -0000	1.5
@@ -36,11 +36,12 @@
 # Make sure user is logged in
 set user_id [ad_maybe_redirect_for_registration]
 
-set title "[_ dotlrn.Control_Panel]"
+set title [parameter::get -localize -parameter admin_page_name]
 set admin_p [dotlrn::admin_p]
 set admin_url "[dotlrn::get_url]/admin"
 set referer [ns_conn url]
 set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name]
+set system_owner [ad_system_owner]
 
 ad_return_template
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/deregister-confirm.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/deregister-confirm.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/deregister-confirm.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/deregister-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-link.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/deregister-link.adp	12 Nov 2002 08:44:05 -0000	1.8
+++ openacs-4/packages/dotlrn/www/deregister-link.adp	4 Dec 2002 09:51:04 -0000	1.9
@@ -18,4 +18,8 @@
 
 %>
 
-<a href="<if @url@ nil>#dotlrn.deregister#<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>"><if @label@ nil>#dotlrn.Drop_Membership#</if><else>@label@</else></a>
+<center>
+<a href="<if @url@ nil>#dotlrn.deregister#<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>"><if @label@ nil><img src=graphics/drop.gif alt="#dotlrn.Drop_Membership#" border=0></if><else>@label@</else></a>
+</center>
+
+
Index: openacs-4/packages/dotlrn/www/deregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/deregister.tcl	23 Oct 2002 12:38:39 -0000	1.6
+++ openacs-4/packages/dotlrn/www/deregister.tcl	4 Dec 2002 09:51:04 -0000	1.7
@@ -22,11 +22,20 @@
     @creation-date 2001-10-06
     @version $Id$
 } -query {
-    {user_id ""}
+    {user_id:multiple,integer ""}
     {community_id ""}
     {referer "./"}
 }
 
+
+# This page was modified to allow more that one user to be dropped at a time.
+# This one done so there is one consistent way of dropping members.
+#
+# The parameter "user_id" was kept so that other entry points (both current
+# and those that might occur in the future from OpenACS and other changes)
+# wouldn't break.  This does have the unfortunate consequence that the name
+# user_id is not intuative when it is a list of many user_ids. (teadams@alum.mit.edu)
+
 ad_maybe_redirect_for_registration
 
 if {[empty_string_p $community_id]} {
@@ -39,7 +48,28 @@
     dotlrn::require_user_admin_community -community_id $community_id
 }
 
-dotlrn_community::remove_user $community_id $user_id
+foreach member_id $user_id {
+ 
+    # This is catch most double clicks.
+    # The catch will take care of cases where the double click is too fast.
 
+    if {[dotlrn_community::member_p $community_id $member_id]} {
+	if {[catch {
+	    dotlrn_community::remove_user $community_id $member_id
+	} errmsg]} {
+
+	    if {![dotlrn_community::member_p $community_id $user_id]} {
+		# assume this was a double click
+		ad_returnredirect $referer
+		ad_script_abort
+	    } else {
+		ns_log Error "deregister.tcl failed: $errmsg"
+		ReturnHeaders
+		ad_return_error "[_ dotlrn.lt_Error_removing_user_c]"  "[_ dotlrn.lt_An_error_occured_whil_1]"
+	    }
+	}
+    }
+}
+
 ad_returnredirect $referer
 
Index: openacs-4/packages/dotlrn/www/dotlrn-default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-default-master.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/dotlrn-default-master.adp	23 Oct 2002 12:38:39 -0000	1.12
+++ openacs-4/packages/dotlrn/www/dotlrn-default-master.adp	4 Dec 2002 09:51:04 -0000	1.13
@@ -36,9 +36,8 @@
 
 <slave>
 
+
 <div class="footer">@ds_link@</div>
 
 </body>
 </html>
-
-
Index: openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-default-master.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl	23 Oct 2002 12:38:39 -0000	1.20
+++ openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl	4 Dec 2002 09:51:04 -0000	1.21
@@ -210,7 +210,7 @@
 set header_font_color "black"
 set header_logo_item_id ""
 set header_img_url "$dotlrn_graphics_url/logowhite.gif" 
-set header_img_alt_text "[_ dotlrn.Header_Logo]"
+set header_img_alt_text "[_ dotlrn.header_logo]"
 
 if {[empty_string_p [dotlrn_community::get_parent_community_id -package_id $package_id]]} {
     set parent_comm_p 0
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	17 Jun 2002 21:57:20 -0000	1.6
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet-oracle.xql	4 Dec 2002 09:51:04 -0000	1.7
@@ -10,11 +10,11 @@
                    decode(dotlrn_communities.community_type, 'dotlrn_community', 'dotlrn_community',
                                                              'dotlrn_club', 'dotlrn_club',
                                                              'dotlrn_class_instance') as simple_community_type,
+                   decode(dotlrn_community_admin_p(dotlrn_communities.community_id, dotlrn_member_rels_approved.user_id),'f',0,1) as admin_p,	
                    tree.tree_level(dotlrn_communities.tree_sortkey) as tree_level,
                    nvl((select tree.tree_level(dotlrn_community_types.tree_sortkey)
                         from dotlrn_community_types
-                        where dotlrn_community_types.community_type = dotlrn_communities.community_type), 0) as community_type_level,
-                   acs_permission.permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p
+                        where dotlrn_community_types.community_type = dotlrn_communities.community_type), 0) as community_type_level
             from dotlrn_communities,
                  dotlrn_member_rels_approved
             where dotlrn_communities.community_id = dotlrn_member_rels_approved.community_id
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	23 Oct 2002 12:38:39 -0000	1.33
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	4 Dec 2002 09:51:04 -0000	1.34
@@ -18,8 +18,6 @@
 
 %>
 
-<% set dotlrn_url [dotlrn::get_url] %>
-
 <if @user_can_browse_p@>
   <small>[&nbsp;<a href="@dotlrn_url@/manage-memberships">#dotlrn.lt_JoinDrop_a_Class_or_C#</a>&nbsp;]</small>
   <br></br>
@@ -35,35 +33,51 @@
     set depth 0
 %>
 
+<h3>
   <if @communities.simple_community_type@ eq "dotlrn_class_instance">
-    <li><%= [parameter::get -localize -parameter class_instances_pretty_plural] %>:
+    <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>:
   </if>
   <else>
-    <li><%= [parameter::get -localize -parameter clubs_pretty_plural] %>:
+    <%= [parameter::get -localize -parameter clubs_pretty_plural] %>:
   </else>
+</h3>
 
 <group column="simple_community_type">
 
 <% set new_level $communities(tree_level) %>
 
   <if @new_level@ lt @old_level@>
-<% incr depth -1 %>
+    <% incr depth -1 %>
     </ul>
-  </if>
+	<if @new_level@ eq 1 and @depth@ gt 1>
+	<% while {$depth > 1} {	
+		append close_tags "</ul>" 
+		incr depth -1 
+	} 
+	%>
+	@close_tags@
+        </if>
+     </if>
 
   <if @new_level@ gt @old_level@>
 <% incr depth 1 %>
     <ul>
+	<nobr>
   </if>
 
       <li>
         <nobr>
           <a href="@communities.url@">@communities.pretty_name@</a>
-          <if @communities.admin_p@ eq t> 
-            [<small>
-              <a href="@communities.url@one-community-admin">#dotlrn.Administer#</a>
-            </small>]
-          </if>
+	<if @show_buttons_p@ eq 1>
+		&nbsp [<small> 
+                        <a href="@communities.url@deregister?referer=@referer@">#dotlrn.Drop_Membership#</a>
+                      </small>]
+		<if @communities.admin_p@ eq 1>
+                  &nbsp; [<small>
+                           <a href="@communities.url@one-community-admin">#dotlrn.Administer#</a>
+                         </small>]
+		</if>
+	</if>
         </nobr>
       </li>
 
@@ -81,5 +95,3 @@
 
 </if>
 
-
-
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	23 Oct 2002 12:38:39 -0000	1.10
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	4 Dec 2002 09:51:04 -0000	1.11
@@ -21,8 +21,13 @@
 
     @author Arjun Sanyal (arjun@openforce.net)
     @version $Id$
+} {
 }
 
+if {![exists_and_not_null show_buttons_p]} {
+    set show_buttons_p 0
+}
+
 set user_id [ad_conn user_id]
 set user_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id]
 
@@ -36,5 +41,6 @@
     }
 }
 
-ad_return_template
+set dotlrn_url [dotlrn::get_url]
 
+ad_return_template
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp	18 Nov 2002 13:42:08 -0000	1.15
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	4 Dec 2002 09:51:04 -0000	1.16
@@ -1,6 +1,5 @@
 <%
 
-    #
     #  Copyright (C) 2001, 2002 MIT
     #
     #  This file is part of dotLRN.
@@ -14,87 +13,82 @@
     #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
     #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
     #  details.
+
+
+    # /www/dotlrn-default-master.adp
     #
+    # This is the 'default-master' template for dotlrn sites. 
+    # 
+    # Author: Arjun Sanyal (arjun@openforce.net), yon@openforce.net
+    #
+    # $Id$
 
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+%>    
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
+
 <title>@title@</title>
 @header_stuff@
+
+
 </head>
-<body<multiple name="body_attributes"> @body_attributes.key@="@body_attributes.value@"</multiple>>
+<body>
 
 <!-- Header Begin -->
-<table width="100%">
-  <tr>
-    <td colspan=3>
-    <!-- Ugly NN4 bar hack -->
-      <table width="100%" bgcolor="@color_hack@" border="0" cellpadding="1" cellspacing="0">
-         <tr bgcolor="@color_hack@"> 
-            <td><img src="@dotlrn_graphics_url@/spacer.gif" width="1" height="1" alt=""></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td class="header-logo">
-      <a href="@dotlrn_url@">
+<table width="100%" cellpadding=0 cellspacing=0> 
+ <tr>
+    <td width="10%" class="header-logo">
+      <a href="@dotlrn_url@/?">
       <img class="header-img" border=0 src="@header_img_url@" alt="@header_img_alt_text@"></a>
     </td>
 
-    <td><div class=header-text>@text@</div></td>
+    <td width="50%"><div class=header-text><nobr>@text@<nobr></div></td>
 
-    <td class="header-buttons">
-      <img src="@color_1pixel@" width="9" height="9"> <a href="@dotlrn_url@">#dotlrn.myspace#</a>
-      <img src="@color_1pixel@" width="9" height="9"> <a href="@dotlrn_url@/control-panel">#dotlrn.help#</a>
-      <img src="@color_1pixel@" width="9" height="9"> <a href="/register/logout">#dotlrn.logout#</a>
+    <td width="40%" class="header-buttons" align="right" valign="bottom">
+       <img src="@color_1pixel@" width="9" height="9"> <a href="@dotlrn_url@">#dotlrn.user_portal_page_home_title#</a>
+       <img src="@color_1pixel@" width="9" height="9"> <a href="@help_url@">#dotlrn.help#</a>
+       <img src="@color_1pixel@" width="9" height="9"> <a href="/register/logout">#dotlrn.logout#</a>
     </td>
 
   </tr>
 
-  <tr>
-    <td colspan=3>
-      <table width="100%" bgcolor="@color_hack@" border="0" cellpadding="1" cellspacing="0">
-         <tr bgcolor="@color_hack@"> 
-            <td><img src="@dotlrn_graphics_url@/spacer.gif" width="1" height="1" alt=""></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  
+<tr><td colspan=3 class="dark-line" height="1"><img src="/graphics/spacer.gif"></td></tr>
+
+<!-- navbars on every page -->
+<tr><td colspan=3 valign=top>@navbar@</td></tr>
 </table>
+<p>
+<p>
+<!-- Header End -->
 
-<div style="font-size: small">@navbar@</div>
 
-<P>
 
 <slave>
 
 
 <!-- Footer Begin -->
 
-<P>
+<!-- navbars on every page -->
 
-<div style="font-size: small">@navbar@</div>
 
-<hr>
-
+      <table width="100%" border="0" cellpadding="0" cellspacing="0">
+	<tr><td><div style="font-size: small">@navbar@</div></td></tr>
+<tr><td colspan=3 class="dark-line" height="1"><img src="/graphics/spacer.gif"></td></tr>
+      </table>
+<p>
 <div class="footer">
-  <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-      <td align=left valign=top>
-        <a href="http://dotlrn.org">dotLRN</a>
-        | 
-        <a href="http://openacs.org">OpenACS</a>
-        |
-        <a href="@change_locale_url@">#dotlrn.Change_Locale#</a>
-      </td>
-      <td align=right>
-        @ds_link@
-      </td>
-    </tr>
-  </table>
+  <a href="http://mitsloan.mit.edu">MIT Sloan School of Management</a> 
+  | 
+  <a href="http://web.mit.edu">MIT</a>
+  | 
+  <a href="@change_locale_url@">#dotlrn.Change_Locale#</a>
 </div>
+
+<div class="footer">@ds_link@</div>
+
+</body>
+</html>
+
Index: openacs-4/packages/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	18 Nov 2002 13:42:08 -0000	1.13
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	4 Dec 2002 09:51:04 -0000	1.14
@@ -1,4 +1,3 @@
-#
 #  Copyright (C) 2001, 2002 MIT
 #
 #  This file is part of dotLRN.
@@ -14,7 +13,7 @@
 #  details.
 #
 #
-# /www/dotlrn-master.tcl
+# /www/dotlrn-default-master.tcl
 #
 # This is the "default-master" template for dotlrn sites. 
 #
@@ -43,138 +42,202 @@
 #
 # $Id$
 
-ad_page_contract {
 
-    Q: What is this file?
+set user_id [ad_get_user_id] 
+set community_id [dotlrn_community::get_community_id]
+set dotlrn_url [dotlrn::get_url]
 
-    A: This is the master template for dotlrn. It sets up the navbar and
-    dynamically generates a CSS file for the dotlrn banner color, font, header 
-    image, and the portal themes.
+#Scope Related graphics/css parameters
 
-    Q: How do I use this file?
+# Set everything for user level scope as default then modify it later as we refine the scope.
+set scope_name "user"
+set scope_main_color "#003366"
+set scope_header_color "#6DB2C9"
+set scope_highlight_text "white"
+set scope_z_dark "#C9D7DC"
+set scope_z_light "#EAF0F2"
+set scope_light_border "#DDEBF5"
+set help_url "[dotlrn::get_url]/control-panel"
+set header_font "Arial, Helvetica, sans-serif"
+set header_font_size "medium"
+set header_font_color "black"
+set header_logo_item_id ""
+set header_img_url "/graphics/logo" 
+set header_img_alt_text "Header Logo"
 
-    A: This template is meant to replace your OpenACS default-master template.    
-    
-    To do this change the "Main Site"'s "DefaultMaster" parameter 
-    from "/www/default-master" to "/packages/dotlrn/www/dotlrn-master"
-    at http://yoursite.com/admin/site-map
+set extra_spaces "<img src=$dotlrn_url/graphics/spacer.gif border=0 width=15>"
+set td_align "align=\"center\" valign=\"top\""
 
-    Q: Do I have to replace my site's default-master template with this 
-    one for dotlrn to work?
 
-    A: Yes
+if {[dotlrn::user_p -user_id $user_id]} {
+    set portal_id [dotlrn::get_portal_id -user_id $user_id]
+}
 
-    Q: How do I customize the banner, images, CSS, etc?
+if {![empty_string_p $community_id]} {
+    set have_comm_id_p 1
+} else {
+    set have_comm_id_p 0
+}
 
-    A: You can change the default banner and generated CSS by editing this template
-    and the associated ADP.
+if {[exists_and_not_null portal_id]} {
+    set have_portal_id_p 1
+} else {
+    set have_portal_id_p 0 
+}
 
-    WARNING: Some portal themes depend on the CSS generated below. Be careful when
-    you edit the CSS below and check that the portal theme has not broken.
+# navbar vars
+set show_navbar_p 1
+if {[exists_and_not_null no_navbar_p] && $no_navbar_p} {
+    set show_navbar_p 0
+} 
 
-    @author arjun (arjun@openforce.net)
-    @version $Id$
-
+if {![info exists link_all]} {
+    set link_all 0
 }
 
-#
-# Set up some basic vars
-# 
-set user_id [ad_get_user_id] 
-set dotlrn_url [dotlrn::get_url]
-set dotlrn_graphics_url "/graphics"
-
-#
-# Get passed in properties
-#
-
-# title - if passed in appends it to the default title
-set default_title "dotLRN"
-
-if {![info exists title]} {
-    set title $default_title
+if {![info exists return_url]} {
+    set link [ad_conn -get extra_url]
 } else {
-    set title "$default_title : $title"
+    set link $return_url
 }
 
-# no_navbar_p - a property to turn off the navbar, not currently used
-if {![info exists no_navbar_p]} {
-    set no_navbar_p 0
-}
 
-# link_control_panel - a special property used by "control-panel" pages
 if {![info exists link_control_panel]} {
     set link_control_panel 1
 }
 
-#                    
-# navbar generation
-#
-if {!$no_navbar_p} {
+if {![info exists control_panel_text]} {
+    set control_panel_text "Control Panel"
+}
+
+if {$have_comm_id_p} {
+    # get this comm's info
+    set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
+    set text [dotlrn_community::get_community_header_name $community_id] 
+    set link [dotlrn_community::get_community_url $community_id]
+    set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id]
+
+    if {[empty_string_p $portal_id] && !$admin_p } {
+        # not a member yet
+        set portal_id [dotlrn_community::get_non_member_portal_id -community_id $community_id]
+    }
+
+    if { $have_portal_id_p && $show_navbar_p } {
+	set make_navbar_p 1
+
+    } else {
+	set make_navbar_p 0
+        set portal_id ""
+    }
+} elseif {[parameter::get -parameter community_type_level_p] == 1} {
+    set extra_td_html ""
+    set link_all 1
+    set link [dotlrn::get_url]
+    # in a community type
+    set text \
+            [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
+    
+    if {$have_portal_id_p && $show_navbar_p} {
+	set make_navbar_p 1
+    } else {
+	set make_navbar_p 0
+        set portal_id ""
+    }
+} else {
+    # we could be anywhere (maybe under /dotlrn, maybe not)
+    set link "[dotlrn::get_url]/"
+    set community_id ""
+    set text ""
+    set make_navbar_p 1
+    if {$have_portal_id_p && $show_navbar_p} {
+    } else {
+	set make_navbar_p 0
+	set portal_id ""
+    }
+}
+
+if { $make_navbar_p } {
+    if {$link_control_panel} {
+	set link_control_panel 1
+    } else {
+	set link_control_panel 0
+    }
+    set extra_spaces "<img src=$dotlrn_url/graphics/spacer.gif border=0 width=15>"    
     set navbar [dotlrn::portal_navbar \
         -user_id $user_id \
         -link_control_panel $link_control_panel \
-        -control_panel_text [_ "dotlrn.control_panel"]
+        -control_panel_text [_ "dotlrn.control_panel"] \
+	-pre_html "$extra_spaces" \
+	-post_html $extra_spaces \
+        -link_all $link_all
     ]
 } else {
     set navbar "<br>"
 }
 
-# the ColorHack and FontHack and LogoHack!
-set color_hack "#cc0000"
-set color_hack_name "red"
-set color_1pixel "/shared/1pixel.tcl?[export_vars { { r 204 } { g 0 } { b 0 }}]"
+# Set up some basic stuff
+set user_id [ad_get_user_id]
+set full_name "[dotlrn::get_user_name $user_id]"
 
-set header_font ""
-set header_font_size "medium"
-set header_font_color "black"
-set header_logo_item_id ""
-set header_img_url "$dotlrn_graphics_url/dotlrn.gif" 
-set header_img_alt_text [_ "dotlrn.header_logo"]
+if {![exists_and_not_null title]} {
+    set title "SloanSpace"
+}
 
-
-# gets the package_id for the passed in dotlrn instace,
-# if the community_id is invalid, returns the pacakge_id of the 
-# main dotlrn instance ???
-set community_id [dotlrn_community::get_community_id]
-set package_id [dotlrn_community::get_package_id $community_id]
-
-if {[empty_string_p [dotlrn_community::get_parent_community_id -package_id $package_id]]} {
+if {[empty_string_p [dotlrn_community::get_parent_community_id -package_id [ad_conn package_id]]]} {
     set parent_comm_p 0
 } else {
     set parent_comm_p 1
 }
 
-# in a community or just under one in a mounted package like /calendar 
-if {[parameter::get -package_id $package_id -parameter community_level_p] == 1 || $parent_comm_p } {
-    set community_id [dotlrn_community::get_community_id]
-    
-    # color hack
+set community_id [dotlrn_community::get_community_id]
+
+if {![empty_string_p $community_id]} {
+    # in a community or just under one in a mounted package like /calendar 
+    set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+
     if {[dotlrn_community::subcommunity_p -community_id $community_id]} {
-        set color_hack "#663366"
-        set color_hack_name "purple"
-        set color_1pixel "/shared/1pixel.tcl?[export_vars { { r 153 } { g 102 } { b 153 }}]"
+	#The colors for a subgroup are set by the parent group with a few overwritten.
+	set comm_type [dotlrn_community::get_community_type_from_community_id [dotlrn_community::get_parent_id -community_id $community_id]]
+    }
+
+    if {$comm_type == "dotlrn_club"} {
+	    #community colors
+	    set scope_name "comm"
+	    set scope_main_color "#CC6633"
+	    set scope_header_color "#F48F5C"
+	    set scope_z_dark "#FFDDB0"
+	    set scope_z_light "#FFF2E2"
+	    set scope_light_border "#E7B59C"
+	if {[dotlrn_community::subcommunity_p -community_id $community_id]} {
+	    set scope_z_dark "#FFDDB0"
+	    set scope_z_light "#FFF2E2"
+	}
     } else {
-        set comm_type \
-                [dotlrn_community::get_community_type_from_community_id $community_id]
-        if {$comm_type == "dotlrn_club"} {
-            set color_hack "#006666"
-            set color_hack_name "green"
-            set color_1pixel "/shared/1pixel.tcl?[export_vars { { r 0 } { g 102 } { b 102 }}]"
-        } else {
-            set color_hack "#6699cc"
-            set color_hack_name "blue"
-            set color_1pixel "/shared/1pixel.tcl?[export_vars { { r 102 } { g 153 } { b 204 }}]"
-        }
+	set scope_name "course"
+	set scope_main_color "#6C9A83"
+	set scope_header_color $scope_main_color
+	set scope_z_dark "#CDDED5"
+	set scope_z_light "#E6EEEA"
+	set scope_light_border "#D0DFD9"
+	if {[dotlrn_community::subcommunity_p -community_id $community_id]} {
+	    set scope_z_dark "#D0DFD9"
+	    set scope_z_light "#ECF3F0"
+	}
     }
+  
+    set header_img_url "$header_img_url-$scope_name.gif"
 
     # font hack
-    set header_font [dotlrn_community::get_attribute \
+   set community_header_font [dotlrn_community::get_attribute \
         -community_id $community_id \
         -attribute_name header_font
     ]
-    append header_font ", "
 
+    if {![empty_string_p $community_header_font]} {
+	set header_font "$community_header_font,$header_font"
+    }
+
+
     set header_font_size [dotlrn_community::get_attribute \
         -community_id $community_id \
         -attribute_name header_font_size
@@ -193,9 +256,11 @@
 
     if {![empty_string_p $header_logo_item_id]} {
 
-        set header_img_url "community-image?revision_id=$header_logo_item_id" 
-    } 
-
+	# Need filename
+        set header_img_url "[dotlrn_community::get_community_url $community_id]/file-storage/download/?version_id=$header_logo_item_id" 
+    }
+	
+   
     set header_logo_alt_text [dotlrn_community::get_attribute \
         -community_id $community_id \
         -attribute_name header_logo_alt_text
@@ -208,13 +273,14 @@
     # The header text is the name of the community
     set text [dotlrn_community::get_community_header_name $community_id] 
 
-} elseif {[parameter::get -package_id $package_id -parameter community_type_level_p] == 1} {
+} elseif {[parameter::get -parameter community_type_level_p] == 1} {
     # in a community type
     set text \
             [dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
 } else {
     # under /dotlrn
-    set text "[dotlrn::get_user_name $user_id]"
+    set header_img_url "$header_img_url-$scope_name.gif" 
+    set text $full_name    
 }
 
 if { ![info exists header_stuff] } {
@@ -225,87 +291,258 @@
 append header_stuff "
 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">
 
-<STYLE TYPE=\"text/css\">
 
+<STYLE TYPE=\"text/css\">
 BODY {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-weight: normal;
-    background: white;
-    color: black;
+    FONT-WEIGHT: normal; 
+    FONT-SIZE: small; 
+    BACKGROUND: white; 
+    COLOR: black; 
+    FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif;
 }
 
-img.header-img {
-    /* NN4 hack */
-    color: white;
-    background: white;
-    /* end NN4 hack */
+H2 {
+   FONT-FAMILY: Arial, Helvetica, sans-serif;
+   FONT-SIZE: medium;
+   FONT-WEIGHT: bold;
 }
 
-.header-logo {
-    color: white;
-    background: white;
-    width: 140px;
+H3 {
+   FONT-FAMILY: Arial, Helvetica, sans-serif;
+   FONT-SIZE: small;
+   COLOR: $scope_main_color; 
+   FONT-WEIGHT: bold;
+   MARGIN-BOTTOM: 0px;
 }
 
-.header-buttons {
-    vertical-align: middle;
-    text-align: right;
+
+
+H2.portal-page-name {
+    FONT-WEIGHT: bold; FONT-SIZE: medium; COLOR: black; FONT-FAMILY: Arial, Helvetica, sans-serif; margin-top: 5px; margin-left: 5px;
 }
 
+TD.dark-line {
+    font-size: 1px;
+    background-color: $scope_main_color;
+}
+
+TD.light-line {
+    font-size: 1px;
+    background-color: $scope_light_border;
+}
+
+A {
+    COLOR: #003399;
+	
+}
+A:visited {
+    COLOR: #666666;
+}
+
+UL {
+    MARGIN-TOP: 0px;
+}
+UL UL LI {
+    LIST-STYLE-IMAGE: url(/dotlrn/graphics/dash.gif);
+}
+SMALL {
+    FONT-SIZE: xsmall;
+}
+IMG.header-img {
+    BACKGROUND: white; 
+    COLOR: white;
+}
+.header-logo {
+    BACKGROUND: white; 
+    WIDTH: 100px; 
+    COLOR: white;
+    PADDING-RIGHT: 35px;
+    PADDING-BOTTOM: 10px;
+}
 .header-text {
-    font-family: $header_font Verdana, Arial, Helvetica, sans-serif;;
-    font-size: $header_font_size;
-    color: $header_font_color;
-    background: white;
-    white-space: nowrap;
-    padding-left: 20px;
+    FONT-SIZE: $header_font_size; 
+    BACKGROUND: white; 
+    WIDTH: 100px; 
+    COLOR: $header_font_color; 
+    FONT-FAMILY: $header_font;
+    WHITE-SPACE: nowrap;
+    font-weight: bold;
 }
 
-table.element {
+.element-header-text {
+    FONT-SIZE: small; 
+    font-weight:bold; 
+    BACKGROUND: white;
+    FONT-FAMILY: Arial, Helvetica, sans-serif;
+    font-WEIGHT: bold; 
+    COLOR: $scope_main_color; 
+    text-transform: uppercase;
 }
 
-td.element-header-text {
+TD.element-text {
+    FONT-SIZE: small; 
+    BACKGROUND: white; 
+    FONT-FAMILY: Arial, Helvetica, sans-serif;
+}
+TH.element-text {
+    BACKGROUND: white; 
+    FONT-SIZE: small; 
+    FONT-FAMILY: Arial, Helvetica, sans-serif; 
+}
+TD.element-header-buttons {
+    BACKGROUND: white; 
+    COLOR: $scope_main_color; 
+    WHITE-SPACE: nowrap;
+}
+IMG.element-header-button {
+    BACKGROUND: $scope_main_color; 
+    COLOR: $scope_main_color;
+}
+
+TR.table-header {
+    BACKGROUND: $scope_header_color;
+    FONT-SIZE: small;
+    FONT-FAMILY: Arial, Helvetica, sans-serif; 
+}
+
+STRONG.table-header {
+    BACKGROUND: $scope_header_color; 
+    COLOR: $scope_highlight_text; 
+    FONT-FAMILY: Arial, Helvetica, sans-serif; 
+    FONT-SIZE: small;
+}
+
+TD.selected {
+    BACKGROUND: $scope_main_color; 
+    COLOR: $scope_highlight_text; 
+    FONT-FAMILY: Arial, Helvetica, sans-serif; 
     font-weight: bold;
-    color: #ffffcc;
-    background: $color_hack;     
-    padding: 2px;
+    BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none;
 }
 
-td.element-header-buttons {    
-    background: $color_hack;
-    color: $color_hack;
-    white-space: nowrap;
+TABLE.element-content {
+	padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px
 }
 
-td.element-header-plain {
-    color: black;
-    background: \#ddddff;
+TABLE.z_light {
+    BACKGROUND: $scope_z_light;
 }
 
-img.element-header-button {
-    color: $color_hack;
-    background: $color_hack;
+TABLE.z_dark {
+    BACKGROUND: $scope_z_dark;
 }
 
-.element-content {    
-    border-width: 1px;
-    border-style: solid;
-    border-color: black;
+TR.even {
+    BACKGROUND: $scope_z_light;
 }
 
-.navbar {
-    font-size: small;
+TR.odd {
+    BACKGROUND: $scope_z_dark;
 }
 
-.footer {
-    font-size: x-small;
+HR.main_color {
+    COLOR: $scope_main_color;
 }
 
+TR.table-title {
+    BACKGROUND: $scope_z_dark;
+}
+
+TD.cal-week {
+    BACKGROUND: $scope_z_light;
+    VALIGN: top;
+}
+
+TD.cal-week-event {
+    BACKGROUND: $scope_z_dark;
+}
+
+TD.cal-month-day {
+    BACKGROUND: $scope_z_dark;
+   BORDER: 1px c0c0c0 solid; padding-top: 1px; padding-right: 1px; padding-bottom: 1px; padding-left: 1px ;
+}
+
+TD.cal-month-today {
+    BACKGROUND: $scope_z_light;
+    BORDER-RIGHT: grey 1px solid; BORDER-TOP: grey 1px solid; BORDER-LEFT: grey 1px solid; BORDER-BOTTOM: grey 1px solid;
+}
+
+.element {
+    BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none;
+}
+
+.no-border {
+    BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none;
+}
+
+.footer {
+    FONT-SIZE: x-small;
+}
 .navbar A {
-    background: #eeeeee;
+    COLOR: $scope_main_color; 
+    TEXT-DECORATION: none; 
+    text-weight: bold;
 }
 
+.navbar A:visited {
+    COLOR: $scope_main_color; 
+    TEXT-DECORATION: none; 
+    text-weight: bold;
+}
+
+TD.navbar {
+    COLOR: $scope_main_color; 
+    TEXT-DECORATION: none; 
+    font-weight: bold;
+    padding-top: 7px; padding-bottom:7px;
+    FONT-FAMILY: Arial, Helvetica, sans-serif; 
+    text-align: center; 
+    FONT-SIZE: x-small;
+}
+
+TD.navbar-selected {
+    background-color: $scope_main_color; 
+    COLOR: $scope_highlight_text; 
+    FONT-FAMILY: Arial, Helvetica, sans-serif; 
+    FONT-SIZE: x-small; 
+    text-align: center; 
+    font-weight: bold;
+    TEXT-DECORATION: none; 
+    padding-top: 7px; padding-bottom:7px;
+}
+
+TABLE.table-display {
+    BORDER-RIGHT: $scope_main_color 1px solid; BORDER-TOP: $scope_main_color 1px solid; BORDER-LEFT: $scope_main_color 1px solid; BORDER-BOTTOM: $scope_main_color 1px solid;
+}
+
+TABLE.portlet-config {
+    BACKGROUND: white;
+    CELLPADDING:5px;
+    CELLSPACING: 5px;
+}
+
+TABLE.portal-page-config {
+    BACKGROUND: $scope_z_dark;
+    WIDTH: 700px;
+    CELLPADDING: 5;
+}
+
+
+TD.bottom-border {
+    BORDER-Bottom: $scope_main_color 1px solid;
+}
+
+TR.bottom-border {
+    BORDER-Bottom: $scope_main_color 1px solid;
+}
+
+TD.center {
+    ALIGN: center;
+}
+
+
 </STYLE>
+
 "
 
 # Developer-support support
@@ -321,18 +558,6 @@
     set ds_link {}
 }
 
-set change_locale_url "/acs-lang/?package_id=[ad_conn package_id]"
+set color_1pixel "/shared/1pixel.tcl?[export_vars { { r 204 } { g 0 } { b 0 }}]"
 
-multirow create body_attributes key value
-
-if { [exists_and_not_null focus] } {
-    # Handle elements wohse name contains a dot
-    regexp {^([^.]*)\.(.*)$} $focus match form_name element_name
-    
-    multirow append \
-            body_attributes onload "javascript:document.forms\['${form_name}'\].elements\['${element_name}'\].focus()"
-}
-
-ad_return_template
-
-
+set change_locale_url "/acs-lang/?[export_vars { { package_id "[ad_conn package_id]" } }]"
Index: openacs-4/packages/dotlrn/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/folder-chunk.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/folder-chunk.adp	23 Oct 2002 12:38:39 -0000	1.8
+++ openacs-4/packages/dotlrn/www/folder-chunk.adp	4 Dec 2002 09:51:04 -0000	1.9
@@ -34,7 +34,7 @@
       <td><img src="graphics/folder.gif"></td>
       <td>
         <a href="index?folder_id=@contents.object_id@&n_past_days=@n_past_days@">@contents.name@</a>
-<if @contents.new_p@ and @contents.content_size@ gt 0>(&nbsp;new&nbsp;)</if>
+<if @contents.new_p@ and @contents.content_size@ gt 0>(&nbsp;#dotlrn.new#&nbsp;)</if>
       </td>
       <td>&nbsp;</td>
       <td>
@@ -82,7 +82,7 @@
   </table>
 </if>
 <else>
-  <p><blockquote><i>Folder @folder_name@ is empty</i></blockquote></p>
+  <p><blockquote><i>#dotlrn.lt_Folder_folder_name_is#</i></blockquote></p>
 </else>
 
 
Index: openacs-4/packages/dotlrn/www/help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/help.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/help.adp	23 Oct 2002 12:38:39 -0000	1.7
+++ openacs-4/packages/dotlrn/www/help.adp	4 Dec 2002 09:51:04 -0000	1.8
@@ -19,9 +19,114 @@
 %>
 
 <master src="dotlrn-master">
-<property name="title">#dotlrn.Help#</property>
+<property name="title">#dotlrn.help#</property>
 
-#dotlrn.lt_This_page_will_eventu#
+<p><a href="#Edit%20PersonalInfo">Editing Personal Information</a> | <a href="#JoinDrop">Joining/Dropping 
+  Groups</a> | <a href="#RequestGroup">Requesting a New Group</a> | <a href="#Bulk
+  Email">Sending Bulk Email</a> 
+  | <a href="#Alerts">Modifying Your Forum Email Alerts</a>| <a href="#Help">Additional Help</a></p> 
+<p><b><font size="4"><a name="EditPersonalInfo">Editing Personal Information</a></font></b><br>
+  You can change your personal information at any time. This enables you to protect 
+  your password, correct or change your full name, publish a URL for a your website, 
+  and change your login name/email address. If you do not keep this login name 
+  the same as your current email address or a forwarding address, you will not 
+  receive group emails and forum alerts from SloanSpace. </p>
+<p><b>To Change Password:</b><br>
+ 
+<li> Login and go to your Control Panel page<br>
+ 
+<li>If you do not have a personal portal, click on the Help icon in the group 
+  banner to get to your Control Panel.<br>
+  <li> Click on &quot;Change My Password&quot;<br>
+  <li> Enter your new password twice and click &quot;Update.&quot;
+<p>To change personal information:<br>
+  
+<li> Login and go to your Control Panel page<br>
+<li>If you do not have a personal portal, click on the Help icon in the group 
+  banner to get to your Control Panel.<br>
+  <li>  Click on &quot;Edit My Personal Information&quot;<br>
+  <li>  Edit your full name, your email address (which also changes your login 
+  name to the system) and/or your personal URL.<br>
+  
+<li> Click &quot;Update.&quot; 
+  <p><b><font size="4"><a name="JoinDrop">Joining/Dropping Groups</a></font></b><br>
+    There are three types of groups: classes, communities and subgroups (of classes 
+    and communities). Limited Access users (non-affiliated) cannot join 
+    or drop groups.</p>
+  <p><b>To join/drop classes and communities:</b><br>
+<li> Go to your personal Home page, MySpace.<br>
+  <li> Click on &quot;Join/Drop a Class or Community Group&quot; in the Groups 
+  portlet.<br>
+  <li>  On the top of the page, you will see the list of your current class 
+  and community memberships.<br>
+  <li> Beside each group name is a &quot;Drop Membership&quot; icon.<br>
+  <li> Scroll down the page to view the list of open classes and communities.<br>
+  <li> Join any one by clicking on the join icon to the right of the group 
+  name.<br>
+  <li> Some groups have an approval process. For those, the link is called 
+  &quot;Request Membership.&quot;<br>
+  
+<li> An email will be sent to the group administrator who will approve/disapprove 
+  your request and reply to you.
+<p><b>To join/drop subgroups:</b><br>
+  <li>  Since subgroups are subsets of groups, their memberships are handled 
+  within the groups.<br>
+  <li>  Go to your personal Home page, MySpace.<br>
+  <li>  Go to the class or community through the link in the Groups portlet.<br>
+  <li> Locate the Subgroups portlet on the class or community portal pages.<br>
+  <li> Click the &quot;Join/Drop a Subgroup&quot; link.<br>
+  <li>  Click the &quot;join&quot; or &quot;drop&quot; link next to the desired 
+  subgroup.<br>
+  <li> Your membership status will change when the page reloads.<br>
+  
+<li> Then, return to the Subgroup Home page or MySpace to continue.
+  <p><b><font size="4"><a name="RequestGroup">Requesting a New Class or Community</a></font></b><br>
+  The Site Wide Administrator handles class and community requests. </p>
+<p>To request a new class or to copy and reuse a class from a previous semester:<br>
+  Send email to sloanspace_help@sloan.mit.edu. For a new class, include the class 
+  number, class title, professor(s), teaching assistants and course assistants. 
+  You will be notified by email when the shell is created. To copy and reuse a 
+  class, you need only email sloanspace_help@sloan.mit.edu with the number, name 
+  and previous semester of the course. Include professor, teaching assistant and 
+  course assistant information if any of that has changed. The &quot;recycled&quot; 
+  class will contain all old content, but the student list will be cleared.</p>
+<p><b>To request a new community:</b><br>
+    Send email to sloanspace-help@sloan.mit.edu. Include the name of the community, 
+    a brief description of its purpose, the faculty or staff sponsor, the name(s) 
+    of any persons who will need to be administrators of this community. You will 
+    be notified by email when the community shell has been created. </p>
+  <p><b><font size="4"><a name="BulkEmail">Bulk Mail</a></font></b><br>
+  Class and community administrators can send group emails through the group Control 
+  Panel page. If enabled, class and community members can send group emails through 
+  the &quot;Email Members&quot; links on the user Control Panel page.</p>
+<p><b>To send a group email:</b><br>
+  
+<li> For admins, go to group Control Panel and click &quot;New Bulk Mail.&quot; 
+  <br>
+  
+<li> For students in classes, go to the Staff List portlet and click on Member 
+  List. <br>
+  <li> Click "Email Members."<br>
+  <li> Select roles to email: Members or Administrators.<br>
+  <li> Fill out subject heading and enter message.<br>
+  <li> Select Send date and time and click &quot;Submit.&quot;<br>
+  <li>  Review the message and click &quot;Confirm.&quot;<br>
+  
+<li> The email is sent to all members with the role chosen. Group admins can view 
+  the bulk mail history from the group Control Panel page.
+  
+  <p><b><font size="4"><a name="Alerts">Modifying Your Forum Email Alerts</a></font></b><br>
+    You can subscribe and unsubscribe to email alerts for any forum open to you 
+    through the "Edit My Forum Email Alerts" link on the user Control Panel page. 
+    Limited Access users can access their Control Panel through the Help icon 
+    in the group banner.</p>
+  
+  <p><b><font size="4"><a name=Help">Additional Help</a></font></b><br>
+    If your specific question is not answered here, consult the User or Admin 
+    Handbooks located in the file storage area of the STS-Sloanwide community. 
+    If you still cannot find the answer to your question or problem, email the 
+    Site Wide Administrator at sloanspace-help@sloan.mit.edu.</p>
+<p></p>
+<p><br>
+</p>
 
-
-
Index: openacs-4/packages/dotlrn/www/join-policy-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/join-policy-toggle.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/join-policy-toggle.tcl	23 Oct 2002 12:38:39 -0000	1.6
+++ openacs-4/packages/dotlrn/www/join-policy-toggle.tcl	4 Dec 2002 09:51:04 -0000	1.7
@@ -31,7 +31,7 @@
             [string equal $policy "needs approval"] == 1 ||
             [string equal $policy "closed"] == 1
         )} {
-            ad_complain {policy must be one of: open, needs approval, or closed}
+            ad_complain [_ dotlrn.lt_policy_must_be_one_of]
         }
     }
 }
Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	23 Oct 2002 12:38:39 -0000	1.18
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	4 Dec 2002 09:51:04 -0000	1.19
@@ -41,9 +41,9 @@
 
 <if @n_member_classes@ gt 0>
 
-    <h4><a name="current_classes"><%= [parameter::get -localize -parameter class_instances_pretty_plural] %></a></h4>
+    <table cellpadding="0" cellspacing="0"  width="100%">
+<tr class="table-header">
 
-    <table bgcolor="#eeeeee" width="100%">
 <formtemplate id="member_form">
         <th align="left" width="50%">
           <%= [parameter::get -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="member_department_key">
@@ -52,24 +52,25 @@
           #dotlrn.Term#&nbsp;<formwidget id="member_term_id">
         </th>
 </formtemplate>
+</tr>
     </table>
 
 <if @member_classes:rowcount@ gt 0>
-    <table width="100%">
-      <tr>
+    <table cellpadding="0" cellspacing="0" width="100%">
+      <tr class="table-title">
         <th align="left" width="55%"><%= [parameter::get -localize -parameter class_instances_pretty_name] %> #dotlrn.Name#</th>
         <th align="left" width="15%">#dotlrn.Term#</th>
         <th align="left" width="15%">#dotlrn.Role#</th>
-        <th align="left" width="15%">#dotlrn.Actions#</th>
+        <th align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="member_classes">
 
     <if @member_classes.rownum@ odd>
-      <tr bgcolor="#eeeeee">
+      <tr class="odd">
     </if>
     <else>
-      <tr bgcolor="#ffffff">
+      <tr class="even">
     </else>
         <td><a href="@member_classes.url@">@member_classes.pretty_name@</td>
         <td>@member_classes.term_name@ @member_classes.term_year@</td>
@@ -78,7 +79,7 @@
         <td>[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td>[<small><include src="deregister-link" url="@member_classes.url@deregister" referer=@referer@></small>]</td>
+        <td><small><include src="deregister-link" url="@member_classes.url@deregister" referer=@referer@></small></td>
 </else>
       </tr>
 </multiple>
@@ -90,31 +91,29 @@
 
 </if>
 
-  <h4><a name="current_clubs"><%= [parameter::get -localize -parameter clubs_pretty_plural] %></a></h4>
-
 <if @member_clubs:rowcount@ gt 0>
-    <table width="100%">
-      <tr>
+    <table cellpadding="0" cellspacing="0" width="100%">
+      <tr class="table-title">
         <th align="left" colspan="2" width="70%"><%= [parameter::get -localize -parameter clubs_pretty_name] %> #dotlrn.Name#</th>
         <th align="left" width="15%">#dotlrn.Role#</th>
-        <th align="left" width="15%">#dotlrn.Actions#</th>
+        <th align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="member_clubs">
 
     <if @member_clubs.rownum@ odd>
-      <tr bgcolor="#eeeeee">
+      <tr class="odd">
     </if>
     <else>
-      <tr bgcolor="#ffffff">
+      <tr class="even">
     </else>
         <td colspan="2"><a href="@member_clubs.url@">@member_clubs.pretty_name@</td>
         <td>@member_clubs.role@</td>
 <if @member_clubs.member_state@ eq "needs approval">
         <td>[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td>[<small><include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small>]</td>
+        <td><small><include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small></td>
 </else>
       </tr>
 </multiple>
@@ -127,15 +126,14 @@
 </if>
 
 <if @n_non_member_classes@ gt 0 or @non_member_clubs:rowcount@ gt 0>
-  <hr>
+<hr>
 
-  <h4><a name="join">#dotlrn.Join_A_Group#</a></h4>
+  <h4><a name="join_class">#dotlrn.Join_A_Group#</a></h4>
 
 <if @n_non_member_classes@ gt 0>
 
-    <h4><a name="join_classes"><%= [parameter::get -localize -parameter class_instances_pretty_plural] %></a></h4>
-
-    <table bgcolor="#eeeeee" width="100%">
+    <table cellpadding="0" cellspacing="0" width="100%">
+<tr class="table-header">
 <formtemplate id="non_member_form">
         <th align="left" width="50%">
           <%= [parameter::get -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="non_member_department_key">
@@ -144,33 +142,34 @@
           #dotlrn.Term#&nbsp;<formwidget id="non_member_term_id">
         </th>
 </formtemplate>
+</tr>
     </table>
 
 <if @non_member_classes:rowcount@ gt 0>
-    <table width="100%">
-      <tr>
+    <table celladding="0" cellspacing="0" width="100%">
+      <tr class="table-title">
         <th align="left" width="55%"><%= [parameter::get -localize -parameter class_instances_pretty_name] %> #dotlrn.Name#</th>
         <th align="left" width="15%">#dotlrn.Term#</th>
         <th align="left" width="15%">&nbsp;</th>
-        <th align="left" width="15%">#dotlrn.Actions#</th>
+        <th align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="non_member_classes">
 
     <if @non_member_classes.rownum@ odd>
-      <tr bgcolor="#eeeeee">
+      <tr class="odd">
     </if>
     <else>
-      <tr bgcolor="#ffffff">
+      <tr class="even">
     </else>
         <td><a href="@non_member_classes.url@">@non_member_classes.pretty_name@</td>
         <td>@non_member_classes.term_name@ @non_member_classes.term_year@</td>
         <td>&nbsp;</td>
 <if @non_member_classes.join_policy@ eq "open">
-        <td>[<small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@></small>]</td>
+        <td><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@></small></td>
 </if>
 <else>
-        <td>[<small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small>]</td>
+        <td><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small></td>
 </else>
       </tr>
 </multiple>
@@ -182,33 +181,32 @@
 
 </if>
 
-  <h4><a name="join_clubs"><%= [parameter::get -localize -parameter clubs_pretty_plural] %></a></h4>
 <if @non_member_clubs:rowcount@ gt 0>
-
-    <table width="100%">
-      <tr>
+<a name="join_club"><p></a>
+    <table cellpadding="0" cellspacing="0" width="100%">
+      <tr class="table-title">
         <th align="left" width="55%"><%= [parameter::get -localize -parameter clubs_pretty_name] %> #dotlrn.Name#</th>
         <th align="left" width="15%">&nbsp;</th>
         <th align="left" width="15%">&nbsp;</th>
-        <th align="left">#dotlrn.Actions#</th>
+        <th align="center">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="non_member_clubs">
 
     <if @non_member_clubs.rownum@ odd>
-      <tr bgcolor="#eeeeee">
+      <tr class="odd">
     </if>
     <else>
-      <tr bgcolor="#ffffff">
+      <tr class="even">
     </else>
         <td><a href="@non_member_clubs.url@">@non_member_clubs.pretty_name@</td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
 <if @non_member_clubs.join_policy@ eq "open">
-        <td>[<small><include src="register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small>]</td>
+        <td><small><include src="register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small></td>
 </if>
 <else>
-        <td>[<small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small>]</td>
+        <td><small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small></td>
 </else>
       </tr>
 </multiple>
@@ -220,6 +218,3 @@
 </else>
 
 </if>
-
-
-
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.14 -r1.15
--- openacs-4/packages/dotlrn/www/member-add-2.adp	20 Nov 2002 15:17:54 -0000	1.14
+++ openacs-4/packages/dotlrn/www/member-add-2.adp	4 Dec 2002 09:51:04 -0000	1.15
@@ -21,8 +21,15 @@
 <master src="dotlrn-master">
 <property name="title">#dotlrn.Add_A_Member#</property>
 
-#dotlrn.Youre_adding# <strong>@first_names@ @last_name@ (@email@)</strong>:<p>
+<if @member_p@ eq 1>
 
+#dotlrn.lt_strongfirst_names_las#
+
+</if>
+<else>
+#dotlrn.lt_You_are_adding_strong#<p>
+</else>
+
 <form method="get" action="member-add-3">
   <input type="hidden" name="user_id" value="@user_id@">
   <input type="hidden" name="referer" value="@referer@">
@@ -37,3 +44,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/member-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/member-add-2.tcl	23 Oct 2002 12:38:39 -0000	1.10
+++ openacs-4/packages/dotlrn/www/member-add-2.tcl	4 Dec 2002 09:51:04 -0000	1.11
@@ -41,6 +41,18 @@
     where user_id = :user_id
 }
 
+set community_name [dotlrn_community::get_community_name $community_id]
+
+# See if the user is already in the group
+set member_p [dotlrn_community::member_p $community_id $user_id]
+
+if {$member_p} {
+    set existing_role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type [db_string select_role {}]]
+    if {[empty_string_p $existing_role]} {
+	set existing_role "member"
+    }
+}
+            
 # Depending on the community_type, we have allowable rel_types
 set rel_types [dotlrn_community::get_roles -community_id $community_id]
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/member-add-2.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/member-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-3.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/member-add-3.tcl	23 Oct 2002 12:38:39 -0000	1.6
+++ openacs-4/packages/dotlrn/www/member-add-3.tcl	4 Dec 2002 09:51:04 -0000	1.7
@@ -28,7 +28,14 @@
 }
 
 set community_id [dotlrn_community::get_community_id]
+# See if the user is already in the group
+set member_p [dotlrn_community::member_p $community_id $user_id]
 
+if {$member_p} {
+    dotlrn_community::remove_user $community_id $user_id
+}
+
+
 # Add the relation
 dotlrn_community::add_user -rel_type $rel_type $community_id $user_id
 
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.12 -r1.13
--- openacs-4/packages/dotlrn/www/member-add.adp	23 Oct 2002 12:38:39 -0000	1.12
+++ openacs-4/packages/dotlrn/www/member-add.adp	4 Dec 2002 09:51:04 -0000	1.13
@@ -22,12 +22,16 @@
 <property name="title">#dotlrn.Add_A_Member#</property>
 <property name="context_bar">@context_bar@</property>
 
+<if @users:rowcount@ eq 0>
+     #dotlrn.there_are_no_users_matching#
+  </tr>
+</if>
+<else>
 #dotlrn.lt_The_results_of_your_s#
+</else>
+
 <ul>
 <multiple name="users">
-  <li><a href="member-add-2?user_id=@users.user_id@&referer=@referer@">@users.last_name@, @users.first_names@ (@users.email@)</a></li>
+  <li><a href="member-add-2?user_id=@users.user_id@&referer=@referer@">@users.last_name@, @users.first_names@ (@users.email@)</a>  </li>
 </multiple>
 </ul>
-
-
-
Index: openacs-4/packages/dotlrn/www/member-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/member-add.tcl	23 Oct 2002 12:38:39 -0000	1.8
+++ openacs-4/packages/dotlrn/www/member-add.tcl	4 Dec 2002 09:51:04 -0000	1.9
@@ -26,6 +26,7 @@
     {referer "one-community-admin"}
 }
 
+set search_text [string trim $search_text]
 set community_id [dotlrn_community::get_community_id]
 
 # Just search
Index: openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql	24 Jul 2002 14:00:39 -0000	1.3
+++ openacs-4/packages/dotlrn/www/members-chunk-table-oracle.xql	4 Dec 2002 09:51:04 -0000	1.4
@@ -15,20 +15,16 @@
             from registered_users,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.community_id = :community_id
-            and dotlrn_member_rels_approved.user_id = registered_users.user_id
-            order by decode(role,
+            and dotlrn_member_rels_approved.user_id = 
+	    registered_users.user_id order by decode(role,
                             'instructor',1,
                             'admin',2,
                             'teaching_assistant',3,
                             'course_assistant',4,
                             'course_admin',5,
                             'student',6,
-                            'member',7),
-                     last_name
-            -- note, last_name should be sorted by $ order, but b/c this
-            -- query gets called by ad_table, ad_table would have to know
-            -- to uplevel order.. not going to happen.  So no reversals on 
-            -- last name for now, sorry.
+                            'member',7), $order_by
+            
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql	23 Jul 2002 13:40:45 -0000	1.2
+++ openacs-4/packages/dotlrn/www/members-chunk-table-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.3
@@ -31,12 +31,7 @@
                     WHEN role = 'member'
                     THEN 7
                 END
-            ) asc,
-            last_name
-            -- note, last_name should be sorted by the variable order, but b/c this
-            -- query gets called by ad_table, ad_table would have to know to uplevel
-            -- order.. not going to happen.  So no reversals on last name for now,
-            -- sorry.
+            ) asc, $order_by
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/members-chunk-table.adp	12 Nov 2002 08:44:05 -0000	1.9
+++ openacs-4/packages/dotlrn/www/members-chunk-table.adp	4 Dec 2002 09:51:04 -0000	1.10
@@ -20,24 +20,101 @@
 
 <h3>#dotlrn.Members_of# <%= [dotlrn_community::get_community_name $community_id] %></h3>
 
-@table@
+<if @admin_p@ eq 1 and @subcomm_p@ eq 0>
+<form method="get" action="member-add">
+   #dotlrn.Add_A_Member# <input type="text" name="search_text"><input type="submit" value="#dotlrn.search#">
+   <input type="hidden" name="referer" value="@referer@">
+</form>
 
+
+<form method="post" action="deregister-confirm">
+</if>
+
+
+<table  width="85%" class="table-display" cellpadding="5" cellspacing="0">
+    <tr class="table-header">
+      <td>&nbsp;</td>
+      <td><a href=@referer@?order=first_names&order_direction=@first_names_order_direction@>
+	#dotlrn.First_Name#</a> @first_names_order_html@
+      </td>	
+      <td><a href=@referer@?order=last_name&order_direction=@last_name_order_direction@>
+	#dotlrn.Last_Name#</a> @last_name_order_html@
+      </td>
+      <td><a href=@referer@?order=email&order_direction=@email_order_direction@>
+	#dotlrn.Email_1#</a> @email_order_html@
+      </td>
+      <td>#dotlrn.Role#</td>
+      <td>#dotlrn.Actions#</td>
+    </tr>
+<multiple name="current_members">
+<if @current_members.rownum@ odd>
+    <tr class="odd">
+</if>
+<else>
+    <tr class="even">
+</else>
+  <td>
+   <if @admin_p@ eq 1>
+	<input type=checkbox name=user_id value=@current_members.user_id@>
+   </if>
+ </td>
+  <td><%=[acs_community_member_link -user_id  @current_members.user_id@ -label @current_members.first_names@] %></td>
+  <td><%=[acs_community_member_link -user_id  @current_members.user_id@ -label @current_members.last_name@]%></td>
+  <td>
+    <if @read_private_data_p@ eq 1>
+        <a href="mailto:@current_members.email@">
+	@current_members.email@</a>	
+    </if>
+    <else>
+	<if @my_user_id@ eq @current_members.user_id@>
+    	    <a href="mailto:@current_members.email@">
+	@current_members.email@</a>
+	</if>
+        <else>
+           &nbsp;
+        </else>
+    </else>
+
+   </td>
+  <td><%=[template::util::nvl [dotlrn_community::get_role_pretty_name -community_id @community_id@ -rel_type @current_members.rel_type@] "Student"]%>
+  </td>
+  <td align=center>
+  <if @admin_p@ eq 1>
+     &nbsp; <a href="deregister?user_id=@current_members.user_id@&referer=@referer@">#dotlrn.Drop_Membership#</a> | <a href="member-add-2?user_id=@current_members.user_id@&referer=@referer@">#dotlrn.User_Admin_Page#</a>
+  </if>
+  <else> 
+      <if @my_user_id@ eq @current_members.user_id@>
+	  <a href="deregister?user_id=@current_members.user_id@&referer=@referer@">#dotlrn.Drop_Membership#</a>
+      </if>
+      <else>
+	   &nbsp;
+      </else>
+  </else>
+</td>
+</tr>
+</multiple>
+</table>
+
+<p>
+
+<if @admin_p@ eq 1>
+<input type=hidden name=referer value="@referer@">
+<input type=submit value="Drop selected members">
+</form>
+</if>
+
 <ul>
 
 <if @admin_p@ eq 1 and @subcomm_p@ eq 0>
   <br>
-  <li>
-    <form method="get" action="member-add">
-      #dotlrn.Add_A_Member# <input type="text" name="search_text"><input type="submit" value="#dotlrn.search#">
-      <input type="hidden" name="referer" value="@referer@">
-    </form>
+
   </li>
 </if>
 <if @site_wide_admin_p@ eq 1>
 <% set dotlrn_admin_url [dotlrn::get_admin_url] %>
   <br>
   <li>
-    <a href="@dotlrn_admin_url@/users-add-to-community?users=@user_list@&referer=@referer@">
+    <a href="@dotlrn_admin_url@/community-members-add-to-community?source_community_id=@community_id@&referer=@referer@">
       #dotlrn.lt_Add_members_to_anothe#
     </a>
   </li>
Index: openacs-4/packages/dotlrn/www/members-chunk-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/members-chunk-table.tcl	12 Nov 2002 08:44:05 -0000	1.18
+++ openacs-4/packages/dotlrn/www/members-chunk-table.tcl	4 Dec 2002 09:51:04 -0000	1.19
@@ -23,7 +23,8 @@
     @version $Id$
 }  -query {
     {parent_user_role:multiple,array,optional}
-    {orderby "role"}
+    {order "last_name"}
+    {order_direction "asc"}
 } -properties {
     users:multirow
     n_parent_users:onevalue
@@ -58,92 +59,58 @@
     }
 }
 
-# Get all users for this community, including role
-set community_members [dotlrn_community::list_users $community_id]
 
-set table_def [list]
+if {[string compare $order_direction "asc"]==0} {
+    set order_html "<img src=/graphics/down.gif height=15 width=15>"
+    set opposite_order_direction "desc"
+} else {
+    set order_html "<img src=/graphics/up.gif height=15 width=15>"
+    set opposite_order_direction "asc"
+}
 
-lappend table_def [list \
-    first_names \
-    [_ dotlrn.First_Names] \
-    {upper(first_names) $order} \
-    {<td>[acs_community_member_link -user_id $user_id -label $first_names</td>]} \
-]
+# Variables that will be used if the column
+# is not selected.
+set first_names_order_html ""
+set last_name_order_html ""
+set email_order_html ""
 
-lappend table_def [list \
-    last_name \
-    [_ dotlrn.Last_Name] \
-    {upper(last_name) $order} \
-    {<td>[acs_community_member_link -user_id $user_id -label $last_name</td>]} \
-]
+set first_names_order_direction $order_direction
+set last_name_order_direction $order_direction
+set email_order_direction $order_direction
 
-if {$read_private_data_p || [string equal $my_user_id \$user_id]} {
-    lappend table_def [list \
-        email \
-        [_ dotlrn.Email_1] \
-        {upper(email) $order, upper(role)} \
-        {<td><a href="mailto:$email">$email</a></td>} \
-    ]
-} else {
-    lappend table_def [list \
-        email \
-        [_ dotlrn.Email_1] \
-        {upper(email) $order, upper(role)} \
-        {<td>&nbsp;</td>} \
-    ]
+
+# Special case for the selected column.
+switch $order {
+    "first_names" {
+	set first_names_order_html $order_html
+	set first_names_order_direction $opposite_order_direction
+    }
+    "last_name"  {
+	set last_name_order_html $order_html
+	set last_name_order_direction $opposite_order_direction
+    }
+    "email"  {
+	set email_order_html $order_html
+	set email_order_direction $opposite_order_direction
+    }
 }
 
-lappend table_def [list \
-    role \
-    [_ dotlrn.Role] \
-    {decode(role,'instructor',1,'admin',2,'teaching_assistant',3,'course_assistant',4,'course_admin',5,'student',6,'member',7) asc, last_name $order} \
-    {<td><nobr>[dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]</nobr></td>} \
-]
+# vars to carry over (from previous script)
+# Do a special clause for role!
 
-if {$site_wide_admin_p} {
-    lappend table_def [list \
-        manage \
-        [_ dotlrn.Actions] \
-        {} \
-        {<td>\[<small> <a href=\"deregister?user_id=$user_id&referer=$referer\">[_ dotlrn.Drop_Membership]</a> | <a href=\"[dotlrn::get_url]/admin/user?user_id=$user_id\">[_ dotlrn.Manage]</a> </small>\]</td>} \
-    ]
-} elseif {$admin_p} {
-    lappend table_def [list \
-        manage \
-        [_ dotlrn.Actions] \
-        {} \
-        {<td>\[<small> <a href="deregister?user_id=$user_id&referer=$referer">Drop&nbsp;Membership</a> <small>\]} \
-    ]
-} else {
-    lappend table_def [list \
-        manage \
-        [_ dotlrn.Actions] \
-        {} \
-        {
-            [eval {
-                if {$my_user_id == $user_id} {
-                    return "<td>\[<small> <a href=\"deregister?user_id=$user_id&referer=$referer\">[_ dotlrn.Drop_nbsp_Membership]</a> </small>\]</td>"
-                } else {
-                    return "<td>&nbsp;</td>"
-                }
-            }]
-        } \
-    ]
-}
+# The note in the members-chunk-table.xql indicated that
+# it would be very hard to make sorting work with ad_table
+# and sorting by columns functionality was incomplete.  After 
+# struggling with ad_table for a while, I went to the
+# OpenACS IRC and asked some questions.  The response
+# basically was that ad_table needs a refactoring.
+# Therefore, I (teadams@alum.mit.edu) decided to 
+# simplify and use db_multirow and code my own column
+# sorting.  
 
-set table [ad_table \
-    -Tmissing_text "<blockquote><i>[_ dotlrn.No_members]</i></blockquote>" \
-    -Textra_vars {referer my_user_id community_id rel_type} \
-    -Torderby $orderby \
-    select_current_members \
-    "" \
-    $table_def
-]
+set order_by "$order $order_direction"
 
-set user_list [list]
-foreach user $community_members {
-    lappend user_list [ns_set get $user user_id]
-}
+db_multirow current_members select_current_members {}
 
 db_multirow pending_users select_pending_users {
     select dotlrn_users.*,
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/members.adp	12 Nov 2002 08:44:05 -0000	1.17
+++ openacs-4/packages/dotlrn/www/members.adp	4 Dec 2002 09:51:04 -0000	1.18
@@ -20,5 +20,14 @@
 
 <master src="dotlrn-master">
 <property name="title">#dotlrn.Manage_Membership#</property>
+<property name="link_all">1</property>
 
 <include src="members-chunk-table" referer="members">
+
+<if @spam_p@ true>
+  <ul>
+    <li>        <a href="spam?community_id=@community_id@&referer=@return_url@">#dotlrn.Email_Members#</a>
+  </ul>
+</if>
+
+
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/members.tcl	23 Oct 2002 12:38:39 -0000	1.18
+++ openacs-4/packages/dotlrn/www/members.tcl	4 Dec 2002 09:51:04 -0000	1.19
@@ -34,4 +34,5 @@
 set community_id [dotlrn_community::get_community_id]
 set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
 set admin_p [dotlrn::user_can_admin_community_p -user_id [ad_get_user_id] -community_id $community_id]
-
+set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id]
+set return_url "[ns_conn url]?[ns_conn query]"
Index: openacs-4/packages/dotlrn/www/my-communities-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/my-communities-oracle.xql	31 May 2002 15:14:45 -0000	1.8
+++ openacs-4/packages/dotlrn/www/my-communities-oracle.xql	4 Dec 2002 09:51:04 -0000	1.9
@@ -14,7 +14,7 @@
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
                    '' as role_pretty_name,
-                   decode(dotlrn_community.admin_p(dotlrn_communities.community_id, dotlrn_member_rels_approved.user_id),'f',0,1) as admin_p
+                   decode(dotlrn_community_admin_p(dotlrn_communities.community_id, dotlrn_member_rels_approved.user_id),'f',0,1) as admin_p
             from dotlrn_communities,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
Index: openacs-4/packages/dotlrn/www/my-communities-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/my-communities-postgresql.xql	15 Jul 2002 20:12:46 -0000	1.1
+++ openacs-4/packages/dotlrn/www/my-communities-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.2
@@ -16,7 +16,7 @@
                    '' as role_pretty_name,
                    CASE 
                       WHEN
-                         dotlrn_community__admin_p(dotlrn_communities.community_id, 
+                         dotlrn_community_admin_p(dotlrn_communities.community_id, 
                                                    dotlrn_member_rels_approved.user_id) = 'f'
                       THEN 0
                       ELSE 1
Index: openacs-4/packages/dotlrn/www/my-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/my-communities.adp	23 Oct 2002 12:38:39 -0000	1.13
+++ openacs-4/packages/dotlrn/www/my-communities.adp	4 Dec 2002 09:51:04 -0000	1.14
@@ -26,15 +26,12 @@
     <td><a href="@communities.url@">@communities.pretty_name@</a></td>
     <td>@communities.role_pretty_name@</td>
     <td>
-      [<small>
+      <small>
 <if @communities.admin_p@ eq 1>
-        <a href="@communities.url@one-community-admin">#dotlrn.Administer#</a>
-        |
-        <a href="@communities.url@spam?community_id=@communities.community_id@&referer=@referer@">#dotlrn.Email_Members#</a>
-        |
+  <a href="@communities.url@one-community-admin"><img border=0 valign="bottom" src="graphics/admin.gif" alt="#dotlrn.Administer#"></a> </td>
 </if>
-        <include src="deregister-link" url="deregister?community_id=@communities.community_id@&referer=@referer@">
-      </small>]
+<td>        <include src="deregister-link" url="deregister?community_id=@communities.community_id@&referer=@referer@"></td>
+      </small>
     </td>
   </tr>
 </multiple>
Index: openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl	23 Oct 2002 12:38:39 -0000	1.6
+++ openacs-4/packages/dotlrn/www/one-community-portal-configure-2.tcl	4 Dec 2002 09:51:04 -0000	1.7
@@ -21,12 +21,12 @@
     @version $Id$
 } -query {
 }
-
+ns_log warning "starting one-community-portal-configure"
 set form [ns_getform]
 set portal_id [ns_set get $form portal_id]
 set return_url [ns_set get $form return_url]
 set anchor [ns_set get $form anchor]
-
+ns_log warning "about to call dispatch"
 portal::configure_dispatch -portal_id $portal_id -form $form
 
 #ad_return_complaint 1 "one-community-portal-configure?portal_id=$portal_id&referer=$return_url#$anchor"
Index: openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl	23 Oct 2002 12:38:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/one-community-portal-configure.tcl	4 Dec 2002 09:51:04 -0000	1.5
@@ -32,6 +32,7 @@
     -community_id [dotlrn_community::get_community_id]
 
 set rendered_page [portal::configure \
+    -allow_theme_change_p "0" \
     [dotlrn_community::get_portal_id] \
     $referer
 ]
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/www/one-community.adp	23 Oct 2002 12:38:39 -0000	1.23
+++ openacs-4/packages/dotlrn/www/one-community.adp	4 Dec 2002 09:51:04 -0000	1.24
@@ -20,6 +20,8 @@
 
 <master src="dotlrn-master">
 
+<p></p>
+
 @rendered_page@
 
 
Index: openacs-4/packages/dotlrn/www/register-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register-link.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/register-link.adp	21 Nov 2002 10:26:43 -0000	1.11
+++ openacs-4/packages/dotlrn/www/register-link.adp	4 Dec 2002 09:51:04 -0000	1.12
@@ -17,5 +17,8 @@
     #
 
 %>
+<center>
+ <a href="<if @url@ nil>register?community_id=@community_id@&</if><else>@url@?</else><if @referer@ not nil>referer=@referer@</if>"><if @label@ nil><img src="graphics/join.gif" alt="#dotlrn.Join#" border="0"></if><else><if @label@ eq "Request Membership"><img src=graphics/request.gif alt="@label@" border="0" title="#dotlrn.Request_Membership#"></if><else>@label@</else></else></a>
+</center>
 
-<a href="<if @url@ nil>register</if><else>@url@</else><if @community_id@ not nil>?community_id=@community_id@</if><if @referer@ not nil>&referer=@referer@</if>"><if @label@ nil>#dotlrn.Join#</if><else>@label@</else></a>
+
Index: openacs-4/packages/dotlrn/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/register.tcl	23 Oct 2002 12:38:39 -0000	1.8
+++ openacs-4/packages/dotlrn/www/register.tcl	4 Dec 2002 09:51:04 -0000	1.9
@@ -45,14 +45,95 @@
     where community_id = :community_id
 }]
 
-switch -exact $join_policy {
-    "open" {
-        dotlrn_community::add_user -member_state approved $community_id $user_id
+
+# Check to see if the user is member already.
+# This should prevent most double clicks, leaving
+# the catch below to trap the rest.
+
+if {[dotlrn_community::member_p $community_id $user_id]} {
+    ad_returnredirect $referer
+    ad_script_abort
+}
+
+
+if {[catch {
+    switch -exact $join_policy {
+	"open" {
+	    dotlrn_community::add_user -member_state approved $community_id $user_id
+	}
+	"needs approval" {
+	    dotlrn_community::add_user -member_state "needs approval" $community_id $user_id
+	    
+	    # Following the same proccess as spam.tcl to email
+	    # admins in bulk.
+	    
+	    set segment_id [db_string select_admin_rel_segment_id {}]
+	    set community_name [dotlrn_community::get_community_name $community_id]
+	    set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]"
+	    
+	    set query "select parties.email,
+	              decode(acs_objects.object_type,
+	              'user',
+	               (select first_names
+	               from persons
+                       where person_id = parties.party_id),
+                      'group',
+                      (select group_name
+                       from groups
+                       where group_id = parties.party_id),
+                      'rel_segment',
+                      (select segment_name
+                       from rel_segments
+                       where segment_id = parties.party_id),
+                      '') as first_names,
+               decode(acs_objects.object_type,
+                      'user',
+                      (select last_name
+                       from persons
+                       where person_id = parties.party_id),
+                      '') as last_name
+            from party_approved_member_map,
+                 parties,
+                 acs_objects
+	    where party_approved_member_map.party_id = $segment_id
+            and party_approved_member_map.member_id <> $segment_id
+            and party_approved_member_map.member_id = parties.party_id
+            and parties.party_id = acs_objects.object_id"
+
+
+	set full_name "[dotlrn::get_user_name $user_id]"
+	set email "[cc_email_from_party $user_id]"
+	set subject "$full_name ($email) has requested to join $community_name."
+
+	set message "$full_name ($email) has requested to join $community_name.
+
+Visit this link to approve or reject this request:
+$community_url/members
+
+        "
+
+	bulk_mail::new \
+		-package_id [site_node_apm_integration::get_child_package_id -package_id [dotlrn_community::get_package_id $community_id] -package_key [bulk_mail::package_key]] \
+		-from_addr [ad_system_owner] \
+		-subject $subject \
+		-message $message \
+		-query $query
+
+        }
     }
-    "needs approval" {
-        dotlrn_community::add_user -member_state "needs approval" $community_id $user_id
+} errmsg]} {
+
+    # Check to see if they are already a member 
+    # (in which case this was likely a double click)
+        
+    if {[dotlrn_community::member_p $community_id $user_id]} {
+	ad_returnredirect $referer
+	ad_script_abort
+    } else {
+	ns_log Error "register.tcl failed: $errmsg"
+	
+	ad_return_error "Error adding user to community"  "An error occured while trying to add a user to a community.  This error has been logged."
     }
 }
 
 ad_returnredirect $referer
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/register.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/reject-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/reject-link.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/reject-link.adp	23 Oct 2002 12:38:39 -0000	1.4
+++ openacs-4/packages/dotlrn/www/reject-link.adp	4 Dec 2002 09:51:04 -0000	1.5
@@ -22,3 +22,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/spam-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/spam-2.adp	23 Oct 2002 12:38:39 -0000	1.9
+++ openacs-4/packages/dotlrn/www/spam-2.adp	4 Dec 2002 09:51:04 -0000	1.10
@@ -27,16 +27,30 @@
   #dotlrn.are_you_sure_you_want_to_send# @spam_name@ #dotlrn.Message#?
 </p>
 
-<table bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
-  <tr>
-    <td width="10%">#dotlrn.Subject#</td>
-    <td><pre>@subject@</pre></td>
-  </tr>
-  <tr>
-    <td>#dotlrn.Message#</td>
-    <td><pre>@message@</pre></td>
-  </tr>
-</table>
+<if @message_type@ eq "html">
+  <table class="z_dark" bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
+    <tr>
+      <td width="10%">#dotlrn.Subject#</td>
+      <td><pre>@subject@</pre></td>
+    </tr>
+    <tr>
+      <td>#dotlrn.Message#</td>
+      <td>@preview_message@</td>
+    </tr>
+  </table>
+</if>
+<else>
+  <table class="z_dark" bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
+    <tr>
+      <td width="10%">#dotlrn.Subject#</td>
+      <td>@subject@</td>
+    </tr>
+    <tr>
+      <td>#dotlrn.Message#</td>
+      <td>        <%= [ad_text_to_html --  "$preview_message"] %></td>
+    </tr>
+  </table>
+</else>
 
 <form action="spam" method="post">
   @confirm_data@
@@ -45,3 +59,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/spam-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/spam-2.tcl	23 Oct 2002 12:38:39 -0000	1.5
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	4 Dec 2002 09:51:04 -0000	1.6
@@ -30,12 +30,21 @@
     portal_id:onevalue
 }
 
-form get_values spam_message subject message
-set subject [ad_quotehtml $subject]
-set message [ad_quotehtml $message]
+form get_values spam_message subject message message_type
 
-set spam_name [bulk_mail::parameter -parameter PrettyName -default Spam]
-set context_bar [list [list $referer Admin] "$spam_name Community"]
+# the following is just to make sure the previewing works ok.
+# in case the user types a html message and chooses the messsage 
+# to be a plain text type or vice-versa.
+if {$message_type == "html"} {
+	if [ad_looks_like_html_p $message] {
+	     set preview_message "<pre>$message</pre>"
+           } else {
+	     set preview_message "$message"
+        }
+} else {
+	set preview_message [ad_quotehtml $message]
+}
+
+set context_bar [list [list $referer Admin] "[_ dotlrn.Spam_Community]"]
 set community_id [dotlrn_community::get_community_id]
 set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/spam-policy-toggle.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/spam-variables.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-variables.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/spam-variables.adp	23 Oct 2002 12:38:39 -0000	1.6
+++ openacs-4/packages/dotlrn/www/spam-variables.adp	4 Dec 2002 09:51:04 -0000	1.7
@@ -68,3 +68,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/spam.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/spam.adp	23 Oct 2002 12:38:39 -0000	1.17
+++ openacs-4/packages/dotlrn/www/spam.adp	4 Dec 2002 09:51:04 -0000	1.18
@@ -23,8 +23,6 @@
 <property name="context_bar">@context_bar@</property>
 
 
-
-
 <formtemplate id="spam_message"></formtemplate>
 
 <include src="spam-variables">
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/spam.tcl	23 Oct 2002 12:38:39 -0000	1.18
+++ openacs-4/packages/dotlrn/www/spam.tcl	4 Dec 2002 09:51:04 -0000	1.19
@@ -34,7 +34,7 @@
     set community_id [dotlrn_community::get_community_id]
 }
 
-dotlrn::require_user_admin_community -community_id $community_id
+dotlrn::require_user_spam_community -community_id $community_id
 
 set sender_id [ad_conn user_id]
 set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
@@ -75,6 +75,13 @@
     -widget textarea \
     -html {rows 10 cols 80 wrap soft}
 
+element create spam_message message_type \
+    -label "Message Type" \
+    -datatype text \
+    -widget select \
+    -options {{"Plain text" "text"} {HTML "html"}} \
+    -value "text"
+
 element create spam_message send_date \
     -label [_ dotlrn.Send_Date] \
     -datatype date \
@@ -90,12 +97,14 @@
 
 if {[ns_queryexists "form:confirm"]} {
     form get_values spam_message \
-        community_id from rel_type subject message send_date referer
+        community_id from rel_type subject message message_type send_date referer
 
     set segment_id [db_string select_rel_segment_id {}]
     set community_name [dotlrn_community::get_community_name $community_id]
     set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]"
 
+    set safe_community_name [db_quote $community_name]
+
     set query "
         select '$from' as from_addr,
                '$sender_first_names' as sender_first_names,
@@ -121,7 +130,7 @@
                        from persons
                        where person_id = parties.party_id),
                       '') as last_name,
-               '$community_name' as community_name,
+               '$safe_community_name' as community_name,
                '$community_url' as community_url
             from party_approved_member_map,
                  parties,
@@ -130,15 +139,26 @@
             and party_approved_member_map.member_id <> $segment_id
             and party_approved_member_map.member_id = parties.party_id
             and parties.party_id = acs_objects.object_id
+            and parties.party_id in (select acs_rels.object_id_two  
+                                     from acs_rels, membership_rels
+                                     where acs_rels.object_id_one = 
+                                        acs.magic_object_id('registered_users')
+                                     and acs_rels.rel_id = 
+                                        membership_rels.rel_id
+                                     and membership_rels.member_state 
+                                        = 'approved')
     "
 
+ns_log notice "query: $query"
+
     bulk_mail::new \
         -package_id [site_node_apm_integration::get_child_package_id -package_key [bulk_mail::package_key]] \
         -send_date [template::util::date::get_property linear_date $send_date] \
         -date_format "YYYY MM DD HH24 MI SS" \
         -from_addr $from \
         -subject "\[$community_name\] $subject" \
         -message $message \
+        -message_type $message_type \
         -query $query
 
     ad_returnredirect $referer
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/subscribe-members.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/subscribe-members.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/unsubscribe-members.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/unsubscribe-members.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
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.8 -r1.9
--- openacs-4/packages/dotlrn/www/user-add.adp	23 Oct 2002 12:38:39 -0000	1.8
+++ openacs-4/packages/dotlrn/www/user-add.adp	4 Dec 2002 09:51:04 -0000	1.9
@@ -21,8 +21,30 @@
 <master src="dotlrn-master">
 <property name="title">#dotlrn.Add_A_User#</property>
 <property name="context_bar">@context_bar@</property>
+<h3>#dotlrn.lt_Add_a_new_user_to_Slo#</h3>
+<if @community_p@ eq 1>
+<blockquote>
+ #dotlrn.lt_Note_use_this_feature#
+<ol>
+	<li>#dotlrn.lt_If_this_person_is_a_M#
+	<li>#dotlrn.lt_Be_sure_that_the_pers#
 
+<if @read_private_data_p@ eq t>
+	<li>#dotlrn.lt_Use_this_only_for_an_#
+
+</if>
+<else>
+      <li>#dotlrn.lt_This_allows_you_to_gi#
+      </li>
+<ul>        
+<li>#dotlrn.lt_Information_about_oth#
+<li>#dotlrn.lt_If_you_wish_to_give_g#
+</else>      
+</ul>
+</ol>
+</blockquote>
+</if>
+<center>
 <formtemplate id="add_user"></formtemplate>
+</center>
 
-
-
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.26 -r1.27
--- openacs-4/packages/dotlrn/www/user-add.tcl	23 Oct 2002 12:38:39 -0000	1.26
+++ openacs-4/packages/dotlrn/www/user-add.tcl	4 Dec 2002 09:51:04 -0000	1.27
@@ -40,9 +40,11 @@
 if {![empty_string_p $community_id]} {
     dotlrn::require_user_admin_community -community_id [dotlrn_community::get_community_id]
     set context_bar [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Add_User]]
+    set community_p 1
 } else {
     dotlrn::require_admin
     set context_bar [list [list users [_ dotlrn.Users]] [_ dotlrn.Add_User]]
+    set community_p 0
 }
 
 set target_user_id [db_nextval acs_object_id_seq]
@@ -55,13 +57,6 @@
     -widget hidden \
     -value $target_user_id
 
-element create add_user id \
-    -label [_ dotlrn.ID_1] \
-    -datatype text \
-    -widget text \
-    -html {size 30} \
-    -value $id
-
 element create add_user email \
     -label [_ dotlrn.Email_1] \
     -datatype text \
@@ -120,10 +115,9 @@
 
 if {[form is_valid add_user]} {
     form get_values add_user \
-        target_user_id id email first_names last_name referer type can_browse_p read_private_data_p dotlrn_interactive_p
+        target_user_id email first_names last_name referer type can_browse_p read_private_data_p dotlrn_interactive_p
 
     db_transaction {
-
         if {[empty_string_p [cc_email_from_party $target_user_id]]} {
             # create the ACS user
             set password [ad_generate_random_string]
@@ -135,7 +129,7 @@
 
         if {!${dotlrn_interactive_p}} {
             # make the user a dotLRN user
-            dotlrn::user_add -id $id -type $type -can_browse\=$can_browse_p -user_id $target_user_id
+            dotlrn::user_add -type $type -can_browse\=$can_browse_p -user_id $target_user_id
         }
     }
 
@@ -155,4 +149,3 @@
 }
 
 ad_return_template
-
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/weblog-control-panel.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/weblog-control-panel.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/weblog-new.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp	23 Oct 2002 12:38:40 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.adp	4 Dec 2002 09:51:04 -0000	1.8
@@ -33,3 +33,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/www/admin/class.adp	23 Oct 2002 12:38:40 -0000	1.27
+++ openacs-4/packages/dotlrn/www/admin/class.adp	4 Dec 2002 09:51:04 -0000	1.28
@@ -103,7 +103,7 @@
       <td align="center">
         <nobr>
         <small>
-          [ <a href="@class_instances.url@one-community-admin">#dotlrn.Administer#</a> ]
+          <a href="@class_instances.url@one-community-admin"><img border=0 valign="bottom" src="../graphics/admin.gif" alt="#dotlrn.Administer#"></a>
         </small>
         </nobr>
       </td>
@@ -127,3 +127,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	23 Oct 2002 12:38:40 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	4 Dec 2002 09:51:04 -0000	1.17
@@ -112,3 +112,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/admin/club.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/club.adp	23 Oct 2002 12:38:40 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/club.adp	4 Dec 2002 09:51:04 -0000	1.13
@@ -26,3 +26,4 @@
 
 
 
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/admin/department-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/department-delete.adp	23 Oct 2002 12:38:40 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/department-delete.adp	4 Dec 2002 09:51:04 -0000	1.3
@@ -1,7 +1,7 @@
 <%
 
     #
-    #  Copyright (C) 2001, 2002 OpenForce, Inc.
+    #  Copyright (C) 2001, 2002 MIT
     #
     #  This file is part of dotLRN.
     #
Index: openacs-4/packages/dotlrn/www/admin/department-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/department-delete.tcl	23 Oct 2002 12:38:40 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/department-delete.tcl	4 Dec 2002 09:51:04 -0000	1.3
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2001, 2002 OpenForce, Inc.
+#  Copyright (C) 2001, 2002 MIT
 #
 #  This file is part of dotLRN.
 #
Index: openacs-4/packages/dotlrn/www/admin/department.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/department.adp	23 Oct 2002 12:38:40 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/department.adp	4 Dec 2002 09:51:04 -0000	1.12
@@ -25,31 +25,30 @@
 <ul>
 
   <li>
-    External URL:
+    #dotlrn.External_URL_1#
 <if @external_url@ not nil>
     <a href="@external_url@">@external_url@</a>
 </if>
 <else>
-    &lt;none set up&gt;
+    &lt;#dotlrn.none_set_up#&gt;
 </else>
   </li>
 
   <li>
-    Description:
+    #dotlrn.Description_1#
 <if @description@ not nil>
     @description@
 </if>
 <else>
-    &lt;none set up&gt;
+    &lt;#dotlrn.none_set_up#&gt;
 </else>
   </li>
 
   <br>
 
   <li>
     <a
-    href="department-edit?department_key=@department_key@&referer=@referer@">Edit</a>
-    department properties.
+    href="department-edit?department_key=@department_key@&referer=@referer@">#dotlrn.lt_Edit_department_prope#</a>
   </li>
 
 </ul>
@@ -58,3 +57,4 @@
 
 <include src="classes-chunk" department_key="@department_key@">
 
+
Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp	23 Oct 2002 12:38:40 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp	4 Dec 2002 09:51:04 -0000	1.5
@@ -20,13 +20,13 @@
 
 <master>
 <property name="title">@title@</property>
+<property name="link_all">1</property>
 
+
 <h2>@title@</h2>
 
 <if @context_bar@ not nil>
   <%= [eval dotlrn::admin_navbar $context_bar] %>
 </if>
 <hr>
 <slave>
-
-
Index: openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp	23 Oct 2002 12:38:40 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/edit-preapproved-emails.adp	4 Dec 2002 09:51:04 -0000	1.8
@@ -53,3 +53,4 @@
 
 
 
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/password-update-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/password-update-2.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/password-update.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/password-update.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/password-update.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	23 Oct 2002 12:38:40 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	4 Dec 2002 09:51:04 -0000	1.7
@@ -32,5 +32,5 @@
     ad_permission_revoke $user_id [acs_magic_object "security_context_root"] "admin"
 }
 
+util_memoize_flush_regexp  $user_id
 ad_returnredirect $referer
-
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/dotlrn/www/admin/term.adp	23 Oct 2002 12:38:40 -0000	1.19
+++ openacs-4/packages/dotlrn/www/admin/term.adp	4 Dec 2002 09:51:04 -0000	1.20
@@ -135,3 +135,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	23 Oct 2002 12:38:40 -0000	1.27
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.tcl	4 Dec 2002 09:51:04 -0000	1.28
@@ -25,7 +25,6 @@
     {referer "[dotlrn::get_admin_url]/users"}
 }
 
-
 set context_bar [list [list users [_ dotlrn.Users]] [_ dotlrn.New]]
 
 db_1row select_user_info {
@@ -76,20 +75,55 @@
     -widget hidden \
     -value $referer
 
+
 if {[form is_valid add_user]} {
+
     form get_values add_user \
         user_id id type can_browse_p read_private_data_p referer
 
+    set subject "Your [ad_system_name] membership has been approved"
+    set message "Your [ad_system_name] membership has been approved. Please return to [ad_url] to log into [ad_system_name]."
+
+    set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner]
+
     db_transaction {
         dotlrn::user_add -id $id -type $type -can_browse\=$can_browse_p -user_id $user_id
         acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] -value $read_private_data_p
     }
+    
+    
+    if [catch {ns_sendmail $email $email_from $subject $message} errmsg] {
+	
+	ns_log Error "Error sending email from user-new-2.tcl" $errmsg
+	ad_return_error \
+        "Error sending mail" \
+        "There was an error sending email to $email."
+    } else {
 
+	set admin_subject "The following email was just sent from [ad_system_name]"
+
+	set admin_message "The following email was just sent from [ad_system_name]
+
+Sent by: $email_from
+Sent to: $email
+Subject: $subject
+Message: $message"
+
+
+        if [catch {ns_sendmail $email_from $email_from $admin_subject $admin_message} errmsg] {
+	
+	    ns_log Error "Error sending email from user-new-2.tcl" $errmsg
+	    ad_return_error \
+		    "Error sending mail" \
+		    "There was an error sending email to $email."
+	}
+
+    }
+
     ad_returnredirect $referer
     ad_script_abort
 }
 
 set context_bar [list [list users [_ dotlrn.Users]] [_ dotlrn.New]]
 
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/admin/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/user-new.adp	23 Oct 2002 12:38:40 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/user-new.adp	4 Dec 2002 09:51:04 -0000	1.10
@@ -31,3 +31,4 @@
 
 
 
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/user-nuke.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/user-nuke.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/admin/user-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/user-oracle.xql	21 May 2002 07:46:03 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/user-oracle.xql	4 Dec 2002 09:51:04 -0000	1.9
@@ -6,6 +6,7 @@
     <fullquery name="select_dotlrn_user_info">
         <querytext>
             select dotlrn_users.*,
+                   acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p,
                    acs_permission.permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p
             from dotlrn_users
             where dotlrn_users.user_id = :user_id
@@ -31,8 +32,7 @@
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
-                   '' as role_pretty_name,
-                   acs_permission.permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+                   '' as role_pretty_name
             from dotlrn_class_instances_full,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
@@ -49,8 +49,7 @@
             select dotlrn_clubs_full.*,
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
-                   '' as role_pretty_name,
-                   acs_permission.permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p
+                   '' as role_pretty_name
             from dotlrn_clubs_full,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
@@ -66,8 +65,7 @@
                    dotlrn_community.url(dotlrn_communities.community_id) as url,
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
-                   '' as role_pretty_name,
-                   acs_permission.permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p
+                   '' as role_pretty_name
             from dotlrn_communities,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
Index: openacs-4/packages/dotlrn/www/admin/user-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/user-postgresql.xql	15 Jul 2002 20:12:46 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/user-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.2
@@ -6,6 +6,7 @@
     <fullquery name="select_dotlrn_user_info">
         <querytext>
             select dotlrn_users.*,
+                   acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p,
                    acs_permission__permission_p(:dotlrn_package_id, :user_id, 'read_private_data') as read_private_data_p
             from dotlrn_users
             where dotlrn_users.user_id = :user_id
@@ -31,8 +32,7 @@
             select dotlrn_class_instances_full.*,
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
-                   '' as role_pretty_name,
-                   acs_permission__permission_p(dotlrn_class_instances_full.class_instance_id, :user_id, 'admin') as admin_p
+                   '' as role_pretty_name
             from dotlrn_class_instances_full,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
@@ -49,8 +49,7 @@
             select dotlrn_clubs_full.*,
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
-                   '' as role_pretty_name,
-                   acs_permission__permission_p(dotlrn_clubs_full.club_id, :user_id, 'admin') as admin_p
+                   '' as role_pretty_name
             from dotlrn_clubs_full,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
@@ -66,8 +65,7 @@
                    dotlrn_community__url(dotlrn_communities.community_id) as url,
                    dotlrn_member_rels_approved.rel_type,
                    dotlrn_member_rels_approved.role,
-                   '' as role_pretty_name,
-                   acs_permission__permission_p(dotlrn_communities.community_id, :user_id, 'admin') as admin_p
+                   '' as role_pretty_name
             from dotlrn_communities,
                  dotlrn_member_rels_approved
             where dotlrn_member_rels_approved.user_id = :user_id
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/admin/user.adp	12 Nov 2002 08:44:06 -0000	1.18
+++ openacs-4/packages/dotlrn/www/admin/user.adp	4 Dec 2002 09:51:04 -0000	1.19
@@ -165,19 +165,35 @@
 </if>
 <else>
 <p>
+<if @member_state@ eq "approved">
   <a href="user-new-2?user_id=@user_id@&referer=@return_url@">#dotlrn.Add#</a> #dotlrn.this_user_to_dotLRN#
+</if>
+<else>
+#dotlrn.lt_This_user_is_currentl#.
+</else>
 </p>
 </else>
 
 <h3>#dotlrn.lt_Administrative_Action#</h3>
 
 <ul>
-  <li><a href="/user/password-update?@export_edit_vars@">#dotlrn.lt_Update_this_users_pas#</a></li>
+  <li><a href="password-update?@export_edit_vars@">#dotlrn.lt_Update_this_users_pas#</a></li>
 <if @portrait_p@>
   <br>
   <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
 </if>
   <br>
+  <li>    
+<if @dotlrn_user_p@ eq 1>
+<if @site_wide_admin_p@ eq t>
+#dotlrn.lt_This_user_is_a_site-w# (<a href="site-wide-admin-toggle?user_id=@user_id@&value=revoke&referer=@return_url@">#dotlrn.revoke#</a>)
+    </if>
+    <else>
+      <a href="site-wide-admin-toggle?user_id=@user_id@&value=grant&referer=@return_url@">#dotlrn.lt_Make_this_user_a_site#</a>
+    </else>
+</if>
+  <br>
   <li><a href="/acs-admin/users/become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
 </ul>
 
+
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/user.tcl	18 Nov 2002 17:58:53 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	4 Dec 2002 09:51:04 -0000	1.14
@@ -44,6 +44,8 @@
 set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id"
 set export_edit_vars "user_id=$user_id&return_url=$return_url"
 
+set dotlrn_url [dotlrn::get_url]
+set root_object_id [acs_magic_object security_context_root]
 if {![db_0or1row select_user_info {}]} {
     ad_return_complaint 1 "<li>[_ dotlrn.couldnt_find_user_id [list user_id $user_id]]</li>"
     ad_script_abort
@@ -82,5 +84,8 @@
 
 set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"]
 
-ad_return_template
+set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
 
+set approve_user_url "/acs-admin/users/member-state-change?user_id=$user_id&member_state=approved&return_url=$dual_approve_return_url"
+
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp	23 Oct 2002 12:38:40 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload.adp	4 Dec 2002 09:51:04 -0000	1.9
@@ -105,3 +105,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql	2 Jun 2002 00:05:56 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql	4 Dec 2002 09:51:04 -0000	1.13
@@ -36,11 +36,11 @@
                  acs_rels,
                  membership_rels
             where parties.party_id = users.user_id
+	    and member_state not in ('banned','deleted','rejected')
             and users.user_id = persons.person_id
             and persons.person_id = acs_rels.object_id_two
             and acs_rels.object_id_one = acs.magic_object_id('registered_users')
             and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'approved'
             and not exists (select 1
                             from acs_rels a,
                                  dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql	15 Jul 2002 20:12:46 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.2
@@ -36,11 +36,11 @@
                  acs_rels,
                  membership_rels
             where parties.party_id = users.user_id
+            and member_state not in ('banned','deleted','rejected')
             and users.user_id = persons.person_id
             and persons.person_id = acs_rels.object_id_two
             and acs_rels.object_id_one = acs__magic_object_id('registered_users')
             and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'approved'
             and not exists (select 1
                             from acs_rels a,
                                  dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl	23 Oct 2002 12:38:40 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-large.tcl	4 Dec 2002 09:51:04 -0000	1.12
@@ -70,7 +70,7 @@
         }
     } elseif {[string equal $type pending] == 1} {
         db_multirow users select_non_dotlrn_users {} {
-            set users:${i}(access_level) Limited
+            set users:${i}(access_level) N/A
             incr i
         }
     } else {
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql	5 Jun 2002 05:09:01 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql	4 Dec 2002 09:51:04 -0000	1.14
@@ -47,10 +47,11 @@
                  acs_rels,
                  membership_rels
             where parties.party_id = users.user_id
+	    and member_state not in ('banned','deleted','rejected')
             and users.user_id = persons.person_id
             and persons.person_id = acs_rels.object_id_two
+	    and acs_rels.object_id_one =  acs.magic_object_id('registered_users')	
             and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'approved'
             and not exists (select 1
                             from acs_rels a,
                                  dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql	15 Jul 2002 20:12:46 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.2
@@ -47,10 +47,11 @@
                  acs_rels,
                  membership_rels
             where parties.party_id = users.user_id
+            and member_state not in ('banned','deleted','rejected')
             and users.user_id = persons.person_id
             and persons.person_id = acs_rels.object_id_two
+            and acs_rels.object_id_one =  acs__magic_object_id('registered_users')
             and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'approved'
             and not exists (select 1
                             from acs_rels a,
                                  dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl	23 Oct 2002 12:38:40 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium.tcl	4 Dec 2002 09:51:04 -0000	1.13
@@ -62,7 +62,7 @@
         append query "_other"
     }
     db_multirow users $query {} {
-        set users:${i}(access_level) Limited
+        set users:${i}(access_level) N/A
         incr i
     }
 } else {
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	2 Jun 2002 00:05:56 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql	4 Dec 2002 09:51:04 -0000	1.14
@@ -24,18 +24,18 @@
                    persons.last_name,
                    parties.email,
                    'f' as read_private_data_p,
-                   acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p
+                   acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p, member_state
             from parties,
                  users,
                  persons,
                  acs_rels,
                  membership_rels
             where parties.party_id = users.user_id
+	    and member_state not in ('banned','deleted','rejected')
             and users.user_id = persons.person_id
             and persons.person_id = acs_rels.object_id_two
             and acs_rels.object_id_one = acs.magic_object_id('registered_users')
             and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'approved'
             and not exists (select 1
                             from acs_rels a,
                                  dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql	15 Jul 2002 20:12:46 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.2
@@ -10,7 +10,7 @@
                    dotlrn_users.last_name,
                    dotlrn_users.email,
                    acs_permission__permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p,
-                   acs_permission__permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p
+                   acs_permission__permission_p(:root_object_id,dotlrn_users.user_id, 'admin') as site_wide_admin_p
             from dotlrn_users
             where dotlrn_users.type = :type
             order by dotlrn_users.last_name
@@ -24,18 +24,19 @@
                    persons.last_name,
                    parties.email,
                    'f' as read_private_data_p,
-                   acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p
+                   acs_permission__permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p,
+                   member_state
             from parties,
                  users,
                  persons,
                  acs_rels,
                  membership_rels
             where parties.party_id = users.user_id
+            and member_state not in ('banned','deleted','rejected')
             and users.user_id = persons.person_id
             and persons.person_id = acs_rels.object_id_two
             and acs_rels.object_id_one = acs__magic_object_id('registered_users')
             and acs_rels.rel_id = membership_rels.rel_id
-            and membership_rels.member_state = 'approved'
             and not exists (select 1
                             from acs_rels a,
                                  dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl	23 Oct 2002 12:38:40 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/users-chunk-small.tcl	4 Dec 2002 09:51:04 -0000	1.11
@@ -45,7 +45,7 @@
     }
 } elseif {[string equal $type pending] == 1} {
     db_multirow users select_non_dotlrn_users {} {
-        set users:${i}(access_level) Limited
+        set users:${i}(access_level) N/A
         incr i
     }
 } else {
Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	23 Oct 2002 12:38:40 -0000	1.18
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	4 Dec 2002 09:51:04 -0000	1.19
@@ -18,13 +18,34 @@
 
 %>
 
+<%
+    # The structure of this table is determined by the type of user we
+    # are displaying.  It doesn't make much sense to display access
+    # level, guest status, and admin status for pending users.  Instead we
+    # will offer links to common actions. 
+
+    # Note: There is some redundant logic inside the table and in
+    # other files that display access and guest status fields as N/A
+    # for pending users.  Previous to the change, this page was
+    # displaying "Limited" and "Yes", respectively, which are wrong
+    # and confused our site administrator.
+    # The N/A logic is a failsafe in case these columns come back for
+    # some reason.  aegrumet@mit.edu 2002-08-08.
+
+%>
+
 <center>
 <table bgcolor="#cccccc" cellpadding="5" cellspacing="3" width="95%">
   <tr>
     <th align="left" width="50%">#dotlrn.User#</th>
+    <if @type@ eq "pending">
+    <th align="left">#dotlrn.Actions#</th>
+    </if>
+    <else>
     <th align="left">#dotlrn.Access#</th>
     <th align="left">#dotlrn.Guest#</th>
     <th align="left">#dotlrn.Site-wide_Admin#</th>
+    </else>
   </tr>
 
 <if @users:rowcount@ gt 0>
@@ -49,9 +70,23 @@
     </else>
   </else>
     </td>
+<if @type@ eq "pending">
+    <td align="left">
+    <% # We had to escape to Tcl to get the desired behavior. AG %>
+    <small><a href="/acs-admin/users/member-state-change?user_id=@users.user_id@&member_state=approved&return_url=<%= [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$users(user_id)&referer=$referer] %>">#dotlrn.lt_approve_and_add_to_do#</a> | <a href="user-nuke?user_id=@users.user_id@&referer=@referer@">#dotlrn.nuke#</small>
+    </td>
+</if>
+<else>
     <td align="center">@users.access_level@</td>
-    <td align="center"><if @users.read_private_data_p@ eq t>#dotlrn.no#</if><else>#dotlrn.yes#</else></td>
     <td align="center">
+     <if @type@ eq "pending">
+     #dotlrn.NA#
+     </if>
+     <else>
+     <if @users.read_private_data_p@ eq t>#dotlrn.no#</if><else>#dotlrn.yes#</else>
+     </else>
+    </td>
+    <td align="center">
   <if @user_id@ ne @users.user_id@>
     <if @users.site_wide_admin_p@ eq t>
       <a href="site-wide-admin-toggle?user_id=@users.user_id@&value=revoke&referer=@referer@">#dotlrn.yes#</a>
@@ -62,6 +97,7 @@
   </if>
       <else>#dotlrn.yes#</else>
     </td>
+</else>
   </tr>
 
 </multiple>
@@ -77,3 +113,4 @@
 
 
 
+
Index: openacs-4/packages/dotlrn/www/admin/users-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-delete.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/users-delete.tcl	23 Oct 2002 12:38:40 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/users-delete.tcl	4 Dec 2002 09:51:04 -0000	1.6
@@ -39,6 +39,12 @@
     -widget hidden \
     -value $users
 
+element create confirm_delete referer \
+    -label "&nbsp;" \
+    -datatype text \
+    -widget hidden \
+    -value $referer
+
 if {[form is_valid confirm_delete]} {
     form get_values confirm_delete \
         users
Index: openacs-4/packages/dotlrn/www/admin/users-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-oracle.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/users-oracle.xql	9 Jul 2002 12:39:33 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql	4 Dec 2002 09:51:04 -0000	1.14
@@ -7,8 +7,11 @@
         <querytext>
             select count(*)
             from (select acs_rels.object_id_two
-                  from acs_rels
+                  from acs_rels, membership_rels
                   where acs_rels.object_id_one = (select acs.magic_object_id('registered_users') from dual)
+		  and acs_rels.rel_id = membership_rels.rel_id
+		  and membership_rels.member_state 
+	              not in ('banned','deleted','rejected')
                  minus
                   select acs_rels.object_id_two
                   from acs_rels, dotlrn_user_types
Index: openacs-4/packages/dotlrn/www/admin/users-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/users-postgresql.xql	11 Jul 2002 15:54:13 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/users-postgresql.xql	4 Dec 2002 09:51:04 -0000	1.3
@@ -7,8 +7,11 @@
         <querytext>
             select count(*)
             from (select acs_rels.object_id_two
-                  from acs_rels
+                  from acs_rels, membership_rels
                   where acs_rels.object_id_one = (select acs__magic_object_id('registered_users') from dual)
+                  and acs_rels.rel_id = membership_rels.rel_id
+                  and membership_rels.member_state
+                      not in ('banned','deleted','rejected')
                   and acs_rels.object_id_two not in (                  
                       select acs_rels.object_id_two
                              from acs_rels,
Index: openacs-4/packages/dotlrn/www/admin/users-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/www/admin/users-search.tcl	23 Oct 2002 12:38:40 -0000	1.22
+++ openacs-4/packages/dotlrn/www/admin/users-search.tcl	4 Dec 2002 09:51:04 -0000	1.23
@@ -248,6 +248,7 @@
     if {[llength $wheres]} {
         append sql " where "
         append sql [join $wheres " $join_criteria "]
+	append sql "order by last_name, first_names"
     }
 
     set referer [ns_conn url]
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/www/admin/users.adp	23 Oct 2002 12:38:40 -0000	1.27
+++ openacs-4/packages/dotlrn/www/admin/users.adp	4 Dec 2002 09:51:04 -0000	1.28
@@ -34,6 +34,13 @@
 
 <p></p>
 
+<form method="get" action="users-search">
+  #dotlrn.lt_Search_dotLRN_users_f# <input type="text" name="name"><input type="submit" value="#dotlrn.search#">
+
+  <input type="hidden" name="form:id" value="user_search">
+
+</form>
+
 <form method="get" action="user-new">
   #dotlrn.lt_Add_a_new_dotLRN_user# <input type="text" name="search_text"><input type="submit" value="#dotlrn.search#">
 </form>
@@ -53,8 +60,3 @@
     <include src="users-chunk-small" type=@type@ referer="@referer@?type=@type@">
   </else>
 </else>
-
-
-
-
-
Index: openacs-4/packages/dotlrn/www/admin/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/admin/users.tcl	12 Nov 2002 10:03:56 -0000	1.18
+++ openacs-4/packages/dotlrn/www/admin/users.tcl	4 Dec 2002 09:51:04 -0000	1.19
@@ -21,7 +21,7 @@
     @creation-date 2002-01-30
     @version $Id$
 } -query {
-    {type "admin"}
+    {type "pending"}
 } -properties {
     context_bar:onevalue
     control_bar:onevalue
@@ -53,7 +53,7 @@
 set n_deactivated_users [db_string select_deactivated_users_count {}]
 lappend dotlrn_roles_localized [list deactivated "[_ dotlrn.Deactivated] ($n_deactivated_users)" {}]
 
-set control_bar [ad_dimensional [list [list type "[_ dotlrn.User_Type]:" admin $dotlrn_roles_localized]]]
+set control_bar [ad_dimensional [list [list type "[_ dotlrn.User_Type]:" $type $dotlrn_roles_localized]]]
 
 if {[string equal $type "deactivated"] == 1} {
     set n_users $n_deactivated_users
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/admin.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/dash.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/drop.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/help-comm.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/help-course.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/help-user.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/join.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logo-comm.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logo-course.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logo-user.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logout-comm.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logout-course.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/logout-user.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/myspace-comm.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/myspace-course.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/myspace-user.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/graphics/request.gif'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-forums/dotlrn-forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/dotlrn-forums.info,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-forums/dotlrn-forums.info	21 Jul 2002 21:26:28 -0000	1.6
+++ openacs-4/packages/dotlrn-forums/dotlrn-forums.info	4 Dec 2002 09:51:50 -0000	1.7
@@ -20,9 +20,15 @@
 
         <files>
             <file type="package_spec" path="dotlrn-forums.info"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-forums-admin-portlet-create.sql"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-forums-create.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/dotlrn-forums-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/t.sql"/>
+            <file type="tcl_procs" path="tcl/dotlrn-forums-admin-portlet-procs.tcl"/>
             <file type="tcl_procs" path="tcl/dotlrn-forums-procs.tcl"/>
+            <file type="query_file" path="tcl/dotlrn-forums-procs.xql"/>
+            <file type="content_page" path="www/dotlrn-forums-admin-portlet.adp"/>
+            <file type="content_page" path="www/dotlrn-forums-admin-portlet.tcl"/>
             <file type="query_file" db_type="oracle" path="www/user-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/user-postgresql.xql"/>
             <file type="content_page" path="www/user.adp"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/sql/oracle/dotlrn-forums-admin-portlet-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-forums/sql/oracle/dotlrn-forums-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/sql/oracle/dotlrn-forums-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-forums/sql/oracle/dotlrn-forums-create.sql	9 Aug 2002 18:39:28 -0000	1.3
+++ openacs-4/packages/dotlrn-forums/sql/oracle/dotlrn-forums-create.sql	4 Dec 2002 09:51:50 -0000	1.4
@@ -14,120 +14,138 @@
 --  details.
 --
 
+
 --
--- The forums applet for dotLRN
---
 -- @author Ben Adida (ben@openforce.net)
 -- @creation-date 2002-05-29
 -- @version $Id$
 --
+-- 10/05/2001
+-- redone for Forums by Ben 05/29/2002
+--
 
+
 declare
-    foo                             integer;
+	foo integer;
 begin
+	-- create the implementation
+	foo := acs_sc_impl.new (
+		'dotlrn_applet',
+		'dotlrn_forums',
+		'dotlrn_forums'
+	);
 
-    foo := acs_sc_impl.new(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_owner_name => 'dotlrn_forums'
-    );
+	-- add all the hooks
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'GetPrettyName',
-        impl_alias => 'dotlrn_forums::get_pretty_name',
-        impl_pl => 'TCL'
-    );
+	-- GetPrettyName
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'GetPrettyName',
+	       'dotlrn_forums::get_pretty_name',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'AddApplet',
-        impl_alias => 'dotlrn_forums::add_applet',
-        impl_pl => 'TCL'
-    );
+	-- AddApplet
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'AddApplet',
+	       'dotlrn_forums::add_applet',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'RemoveApplet',
-        impl_alias => 'dotlrn_forums::remove_applet',
-        impl_pl => 'TCL'
-    );
+	-- RemoveApplet
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'RemoveApplet',
+	       'dotlrn_forums::remove_applet',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'AddAppletToCommunity',
-        impl_alias => 'dotlrn_forums::add_applet_to_community',
-        impl_pl => 'TCL'
-    );
+	-- AddAppletToCommunity
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'AddAppletToCommunity',
+	       'dotlrn_forums::add_applet_to_community',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'RemoveAppletFromCommunity',
-        impl_alias => 'dotlrn_forums::remove_applet_from_community',
-        impl_pl => 'TCL'
-    );
+	-- RemoveAppletFromCommunity
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'RemoveAppletFromCommunity',
+	       'dotlrn_forums::remove_applet_from_community',
+	       'TCL'
+	);
+	-- AddUser
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'AddUser',
+	       'dotlrn_forums::add_user',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'AddUser',
-        impl_alias => 'dotlrn_forums::add_user',
-        impl_pl => 'TCL'
-    );
+	-- RemoveUser
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'RemoveUser',
+	       'dotlrn_forums::remove_user',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'RemoveUser',
-        impl_alias => 'dotlrn_forums::remove_user',
-        impl_pl => 'TCL'
-    );
+	-- AddUserToCommunity
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'AddUserToCommunity',
+	       'dotlrn_forums::add_user_to_community',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
-        impl_operation_name => 'AddUserToCommunity',
-        impl_alias => 'dotlrn_forums::add_user_to_community',
-        impl_pl => 'TCL'
-    );
+	-- RemoveUserFromCommunity
+	foo := acs_sc_impl.new_alias (
+	       'dotlrn_applet',
+	       'dotlrn_forums',
+	       'RemoveUserFromCommunity',
+	       'dotlrn_forums::remove_user_from_community',
+	       'TCL'
+	);
 
-    foo := acs_sc_impl.new_alias(
+    -- AddPortlet
+    foo := acs_sc_impl.new_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_forums',
-        impl_operation_name => 'RemoveUserFromCommunity',
-        impl_alias => 'dotlrn_forums::remove_user_from_community',
-        impl_pl => 'TCL'
-    );
-
-    foo := acs_sc_impl.new_alias(
-        impl_contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums',
         impl_operation_name => 'AddPortlet',
         impl_alias => 'dotlrn_forums::add_portlet',
         impl_pl => 'TCL'
     );
 
-    foo := acs_sc_impl.new_alias(
+    -- RemovePortlet
+    foo := acs_sc_impl.new_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_forums',
         impl_operation_name => 'RemovePortlet',
         impl_alias => 'dotlrn_forums::remove_portlet',
         impl_pl => 'TCL'
     );
 
-    foo := acs_sc_impl.new_alias(
+    -- Clone
+    foo := acs_sc_impl.new_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_forums',
         impl_operation_name => 'Clone',
         impl_alias => 'dotlrn_forums::clone',
         impl_pl => 'TCL'
     );
 
+    -- Change Event Handler
+
     foo := acs_sc_impl.new_alias(
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_forums',
@@ -136,11 +154,32 @@
         impl_pl => 'TCL'
     );
 
-    acs_sc_binding.new(
-        contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_forums'
-    );
 
+	-- Add the binding
+	acs_sc_binding.new (
+	    contract_name => 'dotlrn_applet',
+	    impl_name => 'dotlrn_forums'
+	);
 end;
 /
-show errors
+show errors;
+
+-- DRB: This is a bit of a hack but I can't really think of any reason why the dotlrn forums
+-- applet should be forbidden from altering the forums table to track whether or not the
+-- forum is an autosubscribe forum.  We don't want to modify the forums package itself
+-- because autosubscription is very much a dotLRN feature inherited from SSV1.
+
+-- An alternative would be to create an acs relationship to track which forums users should
+-- be autosubscribed to, but each relationship is an object.  This is a heavyweight way to
+-- accomplish something simple.
+
+alter table forums_forums add (
+    autosubscribe_p                 char(1)
+                                    default 'f'
+                                    constraint forums_autosubscribe_p_nn
+                                    not null
+                                    constraint forums_autosubscribe_p_ck
+                                    check (autosubscribe_p in ('t','f'))
+);
+
+@dotlrn-forums-admin-portlet-create
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-admin-portlet-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-create.sql	9 Aug 2002 18:39:28 -0000	1.3
+++ openacs-4/packages/dotlrn-forums/sql/postgresql/dotlrn-forums-create.sql	4 Dec 2002 09:51:50 -0000	1.4
@@ -27,113 +27,111 @@
 
 create function inline_0()
 returns integer as '
-declare
-    foo                             integer;
 begin
 
-    foo := acs_sc_impl__new (
+    perform acs_sc_impl__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''dotlrn_forums''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''GetPrettyName'',
         ''dotlrn_forums::get_pretty_name'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''AddApplet'',
         ''dotlrn_forums::add_applet'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''RemoveApplet'',
         ''dotlrn_forums::remove_applet'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''AddAppletToCommunity'',
         ''dotlrn_forums::add_applet_to_community'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''RemoveAppletFromCommunity'',
         ''dotlrn_forums::remove_applet_from_community'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''AddUser'',
         ''dotlrn_forums::add_user'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''RemoveUser'',
         ''dotlrn_forums::remove_user'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''AddUserToCommunity'',
         ''dotlrn_forums::add_user_to_community'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''RemoveUserFromCommunity'',
         ''dotlrn_forums::remove_user_from_community'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''AddPortlet'',
         ''dotlrn_forums::add_portlet'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''RemovePortlet'',
         ''dotlrn_forums::remove_portlet'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''Clone'',
         ''dotlrn_forums::clone'',
         ''TCL''
     );
 
-    foo := acs_sc_impl_alias__new (
+    perform acs_sc_impl_alias__new (
         ''dotlrn_applet'',
         ''dotlrn_forums'',
         ''ChangeEventHandler'',
@@ -152,3 +150,22 @@
 
 select inline_0();
 drop function inline_0();
+
+-- DRB: This is a bit of a hack but I can't really think of any reason why the dotlrn forums
+-- applet should be forbidden from altering the forums table to track whether or not the
+-- forum is an autosubscribe forum.  We don't want to modify the forums package itself
+-- because autosubscription is very much a dotLRN feature inherited from SSV1.
+
+-- An alternative would be to create an acs relationship to track which forums users should
+-- be autosubscribed to, but each relationship is an object.  This is a heavyweight way to
+-- accomplish something simple.
+
+-- JCD: postgres won't let us do this all as one step like oracle will...
+alter table forums_forums add autosubscribe_p                 char(1)
+                                     constraint forums_autosubscribe_p_ck
+                                     check (autosubscribe_p in ('t','f'));
+update forums_forums set autosubscribe_p = 'f' 
+ where autosubscribe_p is null;
+alter table forums_forums alter column autosubscribe_p  SET DEFAULT 'f';
+
+\i dotlrn-forums-admin-portlet-create.sql
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-admin-portlet-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	11 Nov 2002 10:39:48 -0000	1.10
+++ openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.tcl	4 Dec 2002 09:51:50 -0000	1.11
@@ -97,12 +97,17 @@
         ]
 
         # mount attachments under forums, if available
-        # attachments requires that dotlrn-fs is already mounted
-        if {[apm_package_registered_p attachments] && [dotlrn_community::applet_active_p -community_id $community_id -applet_key [dotlrn_fs::applet_key]]} {
+        # attachments requires that dotlrn-fs is already mounted 
+        if {[apm_package_registered_p attachments]
+            && [dotlrn_community::applet_active_p \
+                    -community_id $community_id \
+                    -applet_key [dotlrn_fs::applet_key]]} {
 
             set attachments_node_id [site_node::new \
                 -name [attachments::get_url] \
-                -parent_id [site_node::get_node_id_from_object_id -object_id $package_id]
+                -parent_id [site_node::get_node_id_from_object_id \
+                    -object_id $package_id
+                ]
             ]
 
             site_node::mount \
@@ -111,16 +116,18 @@
 
             set fs_package_id [dotlrn_community::get_applet_package_id \
                  -community_id $community_id \
-                 -applet_key [dotlrn_fs::applet_key] \
+                 -applet_key [dotlrn_fs::applet_key]
             ]
-
+                                     
             # map the fs root folder to the package_id of the new forums pkg
             attachments::map_root_folder \
                 -package_id $package_id \
-                -folder_id [fs::get_root_folder -package_id $fs_package_id]
-
+                -folder_id [fs::get_root_folder -package_id $fs_package_id] 
+            
+        } else {
+            ns_log Warning "DOTLRN-FORUMS: Warning attachments or dotlrn-fs not found!"
         }
-
+        
         set auto_create_forum_p [parameter::get_from_package_key \
             -package_key [my_package_key] \
             -parameter auto_create_forum_p \
@@ -151,7 +158,7 @@
             -community_id $community_id \
         ]
 
-        forums_admin_portlet::add_self_to_page \
+        dotlrn_forums_admin_portlet::add_self_to_page \
             -portal_id $admin_portal_id \
             -package_id $package_id
 
@@ -216,17 +223,17 @@
 
         dotlrn_forums::add_portlet_helper $portal_id $args
 
-        # Set up notifications for all the forums
-        foreach forum [forum::list_forums -package_id $package_id] {
-            set forum_id [ns_set get $forum forum_id]
+        # Set up notifications for all the forums that have set for autosubscription
 
+        db_foreach select_forums {} {
             notification::request::new \
                 -type_id [notification::type::get_type_id -short_name forums_forum_notif] \
                 -user_id $user_id \
                 -object_id $forum_id \
                 -interval_id [notification::get_interval_id -name instant] \
                 -delivery_method_id [notification::get_delivery_method_id -name email]
         }
+
     }
 
     ad_proc -public remove_user_from_community {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/tcl/dotlrn-forums-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/www/dotlrn-forums-admin-portlet.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-forums/www/dotlrn-forums-admin-portlet.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-fs/www/all-objects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/all-objects.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-fs/www/all-objects.tcl	18 Nov 2002 18:01:20 -0000	1.12
+++ openacs-4/packages/dotlrn-fs/www/all-objects.tcl	4 Dec 2002 09:52:16 -0000	1.13
@@ -63,7 +63,7 @@
 
 set table_def [list]
 
-lappend table_def [list name [_ dotlrn-fs.Name] {fs_objects.name $order} "<td width=\"30%\"><a href=\"\[ad_decode \$type folder \"\[site_node_object_map::get_url -object_id \$object_id]?folder_id=\$object_id\" url \"\[site_node_object_map::get_url -object_id \$parent_id]url-goto?url_id=\$object_id\" \"\[site_node_object_map::get_url -object_id \$parent_id]download/\$name?version_id=\$live_revision\"]\">\$name</a></td>"]
+lappend table_def [list name [_ dotlrn-fs.Name] {fs_objects.name $order} "<td width=\"30%\"><a href=\"\[ad_decode \$type folder \"\[site_node_object_map::get_url -object_id \$object_id]?folder_id=\$object_id\" url \"\[site_node_object_map::get_url -object_id \$parent_id]url-goto?url_id=\$object_id\" \"\[site_node_object_map::get_url -object_id \$parent_id]download/\$file_upload_name?version_id=\$live_revision\"]\">\$name</a></td>"]
 lappend table_def [list folder_name [_ dotlrn-fs.Folder] {} "<td width=\"30%\"><a href=\"\[site_node_object_map::get_url -object_id \$parent_id]?folder_id=\$parent_id\">\$folder_name</a></td>"]
 lappend table_def [list type [_ dotlrn-fs.Type] {fs_objects.type $order} {c}]
 lappend table_def [list content_size [_ dotlrn-fs.Size] {fs_objects.content_size $order} {<td align=\"center\">[ad_decode $type folder "$content_size item[ad_decode $content_size 1 {} s]" url {} "$content_size byte[ad_decode $content_size 1 {} s]"]</td>}]
Index: openacs-4/packages/dotlrn-fs/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-fs/www/index-postgresql.xql	30 Jul 2002 12:27:47 -0000	1.1
+++ openacs-4/packages/dotlrn-fs/www/index-postgresql.xql	4 Dec 2002 09:52:16 -0000	1.2
@@ -9,7 +9,7 @@
     from (select fs_folders.folder_id,
                  fs_folders.parent_id,
                  fs_folders.name,
-                 nvl ((select sum(fs_files.content_size) as content_size
+                 coalesce ((select sum(fs_files.content_size) as content_size
                        from fs_files
                        where fs_files.parent_id in (select cr_items.item_id
                                                     from cr_items
Index: openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml	12 Nov 2002 08:46:39 -0000	1.2
+++ openacs-4/packages/dotlrn-portlet/catalog/dotlrn-portlet.en_US.ISO-8859-1.xml	4 Dec 2002 09:50:07 -0000	1.3
@@ -1,34 +1,38 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 November 11 20:35 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 03 13:18 -->
 <message_catalog package_key="dotlrn-portlet" locale="en_US" charset="ISO-8859-1">
 
-  <msg key="Add_A_Member">Add A Member:</msg>
   <msg key="Administer">Administer</msg>
+  <msg key="All_members">All members</msg>
   <msg key="Archive">Archive</msg>
   <msg key="Archive_this_group">Archive this group</msg>
   <msg key="Closed">Closed</msg>
   <msg key="Copy_this_group">Copy this group</msg>
-  <msg key="Customize_layout">Customize layout</msg>
-  <msg key="Edit_properties">Edit properties</msg>
-  <msg key="List">List</msg>
+  <msg key="Email_Members">Email Members</msg>
   <msg key="Manage_Applets">Manage Applets</msg>
   <msg key="Manage_Membership">Manage Membership</msg>
-  <msg key="Membership">Membership</msg>
+  <msg key="Member_List">Member List</msg>
   <msg key="Needs_Approval">Needs Approval</msg>
   <msg key="New_sub_pretty_name">New %sub_pretty_name%</msg>
   <msg key="No">No</msg>
+  <msg key="Only_admins">Only admins</msg>
   <msg key="Open">Open</msg>
+  <msg key="Sort">Sort</msg>
+  <msg key="Sortmanage">Sort/manage</msg>
   <msg key="admin_pretty_name">Group Administration</msg>
-  <msg key="deregister">deregister</msg>
-  <msg key="lt_-_AddRemove_pretty_na">Add/Remove %pretty_name% members</msg>
-  <msg key="lt_-_This_allows_you_to_">This allows you to register new users and give them access to just this community.</msg>
-  <msg key="lt_-_This_allows_you_to__1">This allows you to register new non-MIT users and give them access to just this community.
-        Information about students who are part of this community will not be available to this user.</msg>
-  <msg key="lt_Add_a_Limited_Access_">Add a Limited Access user to this community</msg>
-  <msg key="lt_Add_a_Limited_Access__1">Add a Limited Access Guest user to this community</msg>
+  <msg key="lt_AddRemove_pretty_name">Add/Remove %pretty_name% members</msg>
+  <msg key="lt_Change_Bulk_Mail_Poli">Change Bulk Mail Policy</msg>
   <msg key="lt_Change_Enrollment_Pol">Change Enrollment Policy</msg>
+  <msg key="lt_Create_a_new_Limited_">Create a new Limited Access user</msg>
+  <msg key="lt_Create_a_new_Limited__1">Create a new Limited Access Guest user</msg>
+  <msg key="lt_Customize_Portal_Layo">Customize Portal Layout</msg>
   <msg key="lt_No_subcomm_pretty_plu">No %subcomm_pretty_plural%</msg>
+  <msg key="lt_Only_use_this_to_crea">Only use this to create an account for cross-registered students who do not have accounts from a previous class.</msg>
+  <msg key="lt_Only_use_this_to_crea_1">Only use this to create accounts for non-affiliated users who do not already have an account.
+        Information about other members of this community will not be available to this user.</msg>
+  <msg key="lt_Sorry_this_functional">Sorry, this functionality is not available to guests</msg>
   <msg key="lt_This_group_is_archive">This group is archived</msg>
+  <msg key="lt_can_send_bulk_mail_to">can send bulk mail to this community.</msg>
   <msg key="members_portlet_pretty_name">Members</msg>
   <msg key="members_staff_portlet_pretty_name">Staff List</msg>
 </message_catalog>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	12 Nov 2002 08:46:39 -0000	1.26
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	4 Dec 2002 09:50:08 -0000	1.27
@@ -31,31 +31,35 @@
   </else>
   <br>
 </if>
+     <li><a href="members">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_AddRemove_pretty_name#</li>
 
-  <li><a href="community-edit">#dotlrn-portlet.Edit_properties#</a></li>
-  <br>
-
-  <li><a href="one-community-portal-configure">#dotlrn-portlet.Customize_layout#</a></li>
-  <br>
-
-  <li>
-    #dotlrn-portlet.Membership#
-    <ul>
-      <li><a href="members">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_-_AddRemove_pretty_na#</li>
       <li>
         #dotlrn-portlet.lt_Change_Enrollment_Pol# -
           <if @join_policy@ eq "open">#dotlrn-portlet.Open#</if><else><a href="join-policy-toggle?policy=open">#dotlrn-portlet.Open#</a></else>
         | <if @join_policy@ eq "closed">#dotlrn-portlet.Closed#</if><else><a href="join-policy-toggle?policy=closed">#dotlrn-portlet.Closed#</a></else>
         |&nbsp;<if @join_policy@ eq "needs approval">#dotlrn-portlet.Needs_Approval#</if><else><a href="join-policy-toggle?policy=needs%20approval">#dotlrn-portlet.Needs_Approval#</a></else>
       </li>
+<p>
+  <li><a href="one-community-portal-configure">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li>
       <li>
-        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t">#dotlrn-portlet.lt_Add_a_Limited_Access_#</a>
-        - #dotlrn-portlet.lt_-_This_allows_you_to_#
+        #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
+          <if @members_can_spam_p@ true>#dotlrn-portlet.All_members#</if><else><a href="spam-policy-toggle?policy=all">#dotlrn-portlet.All_members#</a></else>
+          | <if @members_can_spam_p@ false>#dotlrn-portlet.Only_admins#</if><else><a href="spam-policy-toggle?policy=admins">#dotlrn-portlet.Only_admins#</a></else>
+          #dotlrn-portlet.lt_can_send_bulk_mail_to#
       </li>
-      <li>
-        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=f">#dotlrn-portlet.lt_Add_a_Limited_Access__1#</a>
-        - #dotlrn-portlet.lt_-_This_allows_you_to__1#
-      </li>
+  <li><a href="community-edit">Edit Group Properties</a> - Change name, description, etc.</li>
+
+<if @subcommunity_p@ eq 0>
+<p>
+<if @club_p@ eq 0>
+<li>
+        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea#
+</if>
+<li>        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=f">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
+        - #dotlrn-portlet.lt_Only_use_this_to_crea_1#
+</li>
+</ul>
+</if>
     </ul>
   </li>
   <br>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	10 Nov 2002 16:25:59 -0000	1.13
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	4 Dec 2002 09:50:08 -0000	1.14
@@ -36,6 +36,18 @@
 set admin_pretty_name [ad_parameter -localize dotlrn_admin_pretty_name dotlrn]
 set subcommunity_p [dotlrn_community::subcommunity_p -community_id $community_id]
 
+#The community_type is dotlrn_club for "communties" and the subject name for classes.
+set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+
+if {$comm_type == "dotlrn_club"} {
+    set club_p 1
+} else {
+    set club_p 0
+}
+
+set members_rel_id [dotlrn_community::get_members_rel_id -community_id $community_id]
+set members_can_spam_p [permission::permission_p -party_id $members_rel_id -object_id $community_id -privilege dotlrn_spam_community]
+
 # get the community info
 db_1row select_community_info {}
 
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	10 Nov 2002 16:25:59 -0000	1.11
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	4 Dec 2002 09:50:08 -0000	1.12
@@ -18,44 +18,47 @@
 
 %>
 
-<if @config.shaded_p@ ne "t">
 
-<ul>
-
+<if @config.shaded_p@ ne "t">
+<if @read_private_data_p@ eq 1>
+<table class="table-display" cellpadding=3 cellspacing=0>
+<tr class="table-header"><td align=right colspan=3>
+<a href="members"><if @admin_p@ ne 1>#dotlrn-portlet.Sort#</if><else>#dotlrn-portlet.Sortmanage#</else>
+</if>
+</a>
+</td></tr>
 <multiple name="users">
 <group column="role">
-  <li>
-    <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
-    
-    <if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
-      (<a href="mailto:@users.email@">@users.email@</a>)
-    </if>
-      <i>@users.role@</i>
+<if @users.rownum@ odd>
+<tr class="odd">
+</if>
+<else>
+<tr class="even">
+</else>
 
-    <if @admin_p@ eq 1>
-      [<small> <a href="deregister?user_id=@users.user_id@&amp;referer=members">#dotlrn-portlet.deregister#</a> </small>]
-    </if>
-    <else>
-      <if @user_id@ eq @users.user_id@>
-        [<small> <a href="deregister?">#dotlrn-portlet.deregister#</a> </small>]
-      </if>
-    </else>
-    </li>
-</group>
-<br>
-</multiple>
+<td>
+      <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
+</td><td>    
+      <a href="mailto:@users.email@">@users.email@</a>
+</td><td>
+	<i>@users.role@</i>
+</td></tr>
+  </group>
 
-</ul>
 
-<if @admin_p@ eq 1>
-   <form method="get" action="member-add">
-      #dotlrn-portlet.Add_A_Member# <input type="text" name="search_text"><input type="submit" value="search">
-      <input type="hidden" name="referer" value="@referer@">
-    </form>
+</multiple>
+</table>
+<if @spam_p@ true>
+<ul>
+<li>        <a href="spam?community_id=@community_id@&referer=@referer@">#dotlrn-portlet.Email_Members#</a>
+</ul>
 </if>
 
 </if>
 <else>
-  <br>
+	#dotlrn-portlet.lt_Sorry_this_functional#
 </else>
-
+</if>
+<else>
+<br>
+</else>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	9 Aug 2002 18:39:29 -0000	1.9
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	4 Dec 2002 09:50:08 -0000	1.10
@@ -32,6 +32,7 @@
 
 set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id]
 set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id]
+set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id]
 
 # Get all users for this community, including role
 template::util::list_of_ns_sets_to_multirow \
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	10 Nov 2002 16:25:59 -0000	1.12
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	4 Dec 2002 09:50:08 -0000	1.13
@@ -80,6 +80,6 @@
 
 <if @read_private_data_p@>
 <br>
-<a href="members"><%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_student_rel] %> #dotlrn-portlet.List#</a>
+<a href="members">#dotlrn-portlet.Member_List#</a>
 </if>
 
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp	10 Nov 2002 16:25:59 -0000	1.10
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp	4 Dec 2002 09:50:08 -0000	1.11
@@ -43,4 +43,3 @@
 <else>
   <br>
 </else>
-
Index: openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl	10 Nov 2002 18:16:48 -0000	1.7
+++ openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl	4 Dec 2002 09:53:05 -0000	1.8
@@ -129,6 +129,7 @@
                 lappend out_list [ns_set get $row object_id]
                 lappend out_list [ns_set get $row type]
                 lappend out_list [ns_set get $row live_revision]
+		lappend out_list [ns_set get $row file_upload_name]
             }
         }
 
Index: openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.adp	10 Nov 2002 18:16:48 -0000	1.4
+++ openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.adp	4 Dec 2002 09:53:05 -0000	1.5
@@ -17,14 +17,13 @@
     #
 
 %>
-
 <if @config.shaded_p@ ne "t">
   <if @syllabus_id@ not eq "">
     <if @type@ eq url>
       <a href="file-storage/url-goto?url_id=@syllabus_id@">#dotlrn-syllabus.Go_to#
     </if>
     <else>
-      <a href="file-storage/download/index?version_id=@live_revision@">#dotlrn-syllabus.Download#
+      <a href="file-storage/download/@file_upload_name@?version_id=@live_revision@">#dotlrn-syllabus.Download#
     </else>
     #dotlrn-syllabus.pretty_name#</a>
   </if>
Index: openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.tcl	9 Aug 2002 18:39:30 -0000	1.2
+++ openacs-4/packages/dotlrn-syllabus/www/syllabus-portlet.tcl	4 Dec 2002 09:53:05 -0000	1.3
@@ -36,4 +36,4 @@
 set syllabus_id [lindex $syllabus_info_list 1]
 set type [lindex $syllabus_info_list 2]
 set live_revision [lindex $syllabus_info_list 3]
-
+set file_upload_name [lindex $syllabus_info_list 4]
Index: openacs-4/packages/faq-portlet/catalog/faq-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/catalog/faq-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq-portlet/catalog/faq-portlet.en_US.ISO-8859-1.xml	7 Nov 2002 08:16:51 -0000	1.2
+++ openacs-4/packages/faq-portlet/catalog/faq-portlet.en_US.ISO-8859-1.xml	4 Dec 2002 09:53:40 -0000	1.3
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 October 23 13:21 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 03 13:04 -->
 <message_catalog package_key="faq-portlet" locale="en_US" charset="ISO-8859-1">
 
-  <msg key="pretty_name">Frequently Asked Questions (FAQs)</msg>
+  <msg key="Disable">Disable</msg>
+  <msg key="Disabled">Disabled</msg>
+  <msg key="Enable">Enable</msg>
   <msg key="admin_pretty_name">FAQ Administration</msg>
-  <msg key="one_admin_faq">There should be only one instance of FAQ for admin purposes</msg>
-  <msg key="new_faq">New FAQ</msg>
   <msg key="group">Group</msg>
   <msg key="name">Name</msg>
+  <msg key="new_faq">New FAQ</msg>
   <msg key="no_faqs">No FAQs</msg>
+  <msg key="one_admin_faq">There should be only one instance of FAQ for admin purposes</msg>
+  <msg key="pretty_name">Frequently Asked Questions (FAQs)</msg>
 </message_catalog>
Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	23 Oct 2002 12:30:49 -0000	1.6
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	4 Dec 2002 09:53:40 -0000	1.7
@@ -23,6 +23,12 @@
 <multiple name="faqs">
   <li>
     <a href="@url@admin/one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a>
+	<if @faqs.disabled_p@ eq "t">
+		(#faq-portlet.Disabled# | <a href=faq/admin/faq-enable?faq_id=@faqs.faq_id@&referer=@referer@>#faq-portlet.Enable#</a>)
+	</if>
+	<else>
+		 (<a href=faq/admin/faq-disable?faq_id=@faqs.faq_id@&referer=@referer@>#faq-portlet.Disable#</a>)
+	</else>
   </li>
 </multiple>
   <br>
Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl	23 Oct 2002 12:30:49 -0000	1.6
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl	4 Dec 2002 09:53:40 -0000	1.7
@@ -26,6 +26,8 @@
 # Configuration
 array set config $cf	
 
+set referer [ns_conn url]
+
 # Should be a list already! 
 set list_of_package_ids $config(package_id)
 
@@ -38,7 +40,8 @@
 
 db_multirow faqs select_faqs {
     select f.faq_id, 
-           f.faq_name
+           f.faq_name,
+           f.disabled_p
     from faqs f,
          acs_objects o
     where f.faq_id = o.object_id
Index: openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/Attic/faq-portlet-oracle.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	4 Jun 2002 00:03:44 -0000	1.9
+++ openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	4 Dec 2002 09:53:40 -0000	1.10
@@ -6,7 +6,7 @@
     <fullquery name="select_faqs">
         <querytext>
             select acs_objects.context_id as package_id,
-                   acs_object.name(acs_objects.context_id) as parent_name,
+                   acs_object.name(apm_package.parent_id(acs_objects.context_id)) as parent_name,
                    (select site_node.url(site_nodes.node_id)
                     from site_nodes
                     where site_nodes.object_id = acs_objects.context_id) as url,
@@ -15,8 +15,9 @@
             from faqs,
                  acs_objects
             where faqs.faq_id = acs_objects.object_id
+	    and faqs.disabled_p <> 't'
             and acs_objects.context_id in ([join $list_of_package_ids ", "])
-            order by parent_name
+            order by lower(faq_name)
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/Attic/faq-portlet-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql	17 Jul 2002 20:20:31 -0000	1.1
+++ openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql	4 Dec 2002 09:53:40 -0000	1.2
@@ -6,7 +6,7 @@
     <fullquery name="select_faqs">
         <querytext>
             select acs_objects.context_id as package_id,
-                   acs_object__name(acs_objects.context_id) as parent_name,
+                   acs_object__name(apm_package__parent_id(acs_objects.context_id)) as parent_name,
                    (select site_node__url(site_nodes.node_id)
                     from site_nodes
                     where site_nodes.object_id = acs_objects.context_id) as url,
@@ -15,9 +15,10 @@
             from faqs,
                  acs_objects
             where faqs.faq_id = acs_objects.object_id
+	    and faqs.disabled_p <> 't'
             and acs_objects.context_id in ([join $list_of_package_ids ", "])
-            order by parent_name
+            order by lower(faq_name)
         </querytext>
     </fullquery>
 
-</queryset>
\ No newline at end of file
+</queryset>
Index: openacs-4/packages/faq-portlet/www/faq-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/faq-portlet/www/faq-portlet.adp	23 Oct 2002 12:30:49 -0000	1.14
+++ openacs-4/packages/faq-portlet/www/faq-portlet.adp	4 Dec 2002 09:53:40 -0000	1.15
@@ -28,10 +28,10 @@
 %>
 
     <if @one_instance_p@ false>
-      <table border="0" bgcolor="white" cellpadding="2" cellspacing="3" width="100%">
-        <tr>
-          <td><strong>#faq-portlet.name#</strong></td>
-          <td><strong>#faq-portlet.group#</strong></td>
+      <table border="0" bgcolor="white" cellpadding="2" cellspacing="0" width="100%">
+        <tr class="table-header">
+          <td><strong class="table-header">#faq-portlet.name#</strong></td>
+          <td><strong class="table-header">#faq-portlet.group#</strong></td>
         </tr>
     </if>
 
@@ -50,10 +50,10 @@
     </if>
     <else>
       <if @faqs.rownum@ odd>
-        <tr bgcolor="#eeeeee">
+        <tr class="odd">
       </if>
       <else>
-        <tr bgcolor="#ffffff">
+        <tr class="even">
       </else>
         <td><a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a></td>
         <td>@faqs.parent_name@</td>
Index: openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml	10 Nov 2002 17:33:35 -0000	1.2
+++ openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml	4 Dec 2002 09:53:56 -0000	1.3
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 November 10 20:05 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 03 11:34 -->
 <message_catalog package_key="forums-portlet" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Forum">Forum</msg>
+  <msg key="New">New!</msg>
   <msg key="New_Forum">New Forum</msg>
   <msg key="No_Forums">No Forums</msg>
   <msg key="admin_pretty_name">Forums Administration</msg>
   <msg key="disabled">disabled</msg>
   <msg key="lt_There_should_be_only_">There should be only one instance of forums for admin purposes</msg>
-  <msg key="pretty_name">Bulletin Boards</msg>
+  <msg key="pretty_name">Forums</msg>
 </message_catalog>
Index: openacs-4/packages/forums-portlet/www/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/forums-portlet/www/forums-portlet.adp	2 Dec 2002 12:39:45 -0000	1.11
+++ openacs-4/packages/forums-portlet/www/forums-portlet.adp	4 Dec 2002 09:53:56 -0000	1.12
@@ -33,19 +33,17 @@
 <% set new_package_id $forums(package_id) %>
 
   <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
-      <br>
     </ul>
   </if>
 
   <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-    <div class="portlet-group">@forums.parent_name@</div>
+    @forums.parent_name@
     <ul>
   </if>
 
     <li>
-      <if @forums.new_p@><b></if>
       <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
-      <if @forums.new_p@></b></if>
+<if @forums.new_p@ eq t><img src="/doc/acs-datetime/pics/new.gif" align="absmiddle" border="0" alt="#forums-portlet.New#" align="baseline"></if>
     </li>
 
 <%
Index: openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml	23 Oct 2002 12:32:12 -0000	1.1
+++ openacs-4/packages/fs-portlet/catalog/fs-portlet.en_US.ISO-8859-1.xml	4 Dec 2002 09:54:15 -0000	1.2
@@ -3,13 +3,10 @@
 <message_catalog package_key="fs-portlet" locale="en_US" charset="ISO-8859-1">
 
   <msg key="view_details">view details</msg>
-  <msg key="view_past_mod_files">View files modified in the last</msg>
   <msg key="byte">byte</msg>
   <msg key="bytes">bytes</msg>
   <msg key="pretty_name">Documents</msg>
   <msg key="create_new_folder">Create a new folder</msg>
-  <msg key="all">All</msg>
-  <msg key="days">days</msg>
   <msg key="items">items</msg>
   <msg key="upload_file">Upload a file</msg>
   <msg key="create_url">Create a URL</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/oracle/fs-contents-portlet-mods.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/fs-portlet/sql/postgresql/fs-contents-portlet-mods.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/Attic/fs-contents-portlet-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet-oracle.xql	31 May 2002 06:34:27 -0000	1.1
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet-oracle.xql	4 Dec 2002 09:54:15 -0000	1.2
@@ -13,6 +13,7 @@
                                             from site_nodes
                                             where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
                    fs_objects.object_id,
+		   fs_objects.file_upload_name,
                    fs_objects.name,
                    fs_objects.live_revision,
                    fs_objects.type,
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/Attic/fs-contents-portlet-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet-postgresql.xql	12 Aug 2002 13:40:08 -0000	1.2
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet-postgresql.xql	4 Dec 2002 09:54:15 -0000	1.3
@@ -16,6 +16,7 @@
                                             where site_nodes.object_id = file_storage__get_package_id(fs_objects.object_id))
                    END) as url,
                    fs_objects.object_id,
+                   fs_objects.file_upload_name,
                    fs_objects.name,
                    fs_objects.live_revision,
                    fs_objects.type,
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	23 Oct 2002 12:32:12 -0000	1.8
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	4 Dec 2002 09:54:15 -0000	1.9
@@ -34,45 +34,6 @@
         </td>
       </tr>
 </if>
+</table>
 
-<multiple name="folders">
-
-      <tr>
-
-<if @folders.type@ eq "folder">
-        <td><img border="0" src="@folders.url@graphics/folder.gif"></td>
-        <td><a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a></td>
-        <td><small>@folders.type@</small></td>
-<if @folders.content_size@ eq 0>
-        <td><small>0 #fs-portlet.items#</small></td>
-</if>
-<else>
-<if @folders.content_size@ gt 1>
-        <td><small>@folders.content_size@ #fs-portlet.items#</small></td>
-</if>
-<else>
-        <td><small>@folders.content_size@ #fs-portlet.item#</small></td>
-</else>
-</else>
-</if>
-<else>
-<if @folders.type@ eq "url">
-        <td><img border="0" src="@folders.url@graphics/file.gif"></td>
-        <td><a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a></td>
-        <td><small>@folders.type@</small></td>
-        <td>&nbsp;</td>
-</if>
-<else>
-        <td><img border="0" src="@folders.url@graphics/file.gif"></td>
-        <td><a href="@folders.url@download/@folders.name@?version_id=@folders.live_revision@">@folders.name@</a></td>
-        <td><small>@folders.type@</small></td>
-        <td><small>@folders.content_size@ <if @folders.content_size@ eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else></small></td>
-</else>
-</else>
-
-      </tr>
-
-</multiple>
-
-    </table>
-
+<include src=@scope_fs_url@ folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	9 Aug 2002 18:39:32 -0000	1.4
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	4 Dec 2002 09:54:15 -0000	1.5
@@ -48,6 +48,8 @@
 }
 
 set folder_id [lindex $list_of_folder_ids 0]
+set scope_fs_url "/packages/file-storage/www/folder-chunk"
+set n_past_days ""
 set url [site_node_object_map::get_url -object_id $folder_id]
 set recurse_p 1
 set contents_url "${url}folder-contents?[export_vars {folder_id recurse_p}]&"
Index: openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	22 May 2002 08:50:54 -0000	1.9
+++ openacs-4/packages/fs-portlet/www/fs-portlet-oracle.xql	4 Dec 2002 09:54:15 -0000	1.10
@@ -14,6 +14,7 @@
                                             where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
                    fs_objects.object_id,
                    fs_objects.name,
+		   fs_objects.file_upload_name,
                    fs_objects.live_revision,
                    fs_objects.type,
                    fs_objects.content_size
@@ -36,6 +37,7 @@
                                             where site_nodes.object_id = file_storage.get_package_id(fs_objects.object_id))) as url,
                    fs_objects.object_id,
                    fs_objects.name,
+		   fs_objects.file_upload_name,
                    fs_objects.live_revision,
                    fs_objects.type,
                    fs_objects.content_size
@@ -49,3 +51,10 @@
     </fullquery>
 
 </queryset>
+
+
+
+
+
+
+
Index: openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql	24 Jul 2002 15:34:40 -0000	1.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet-postgresql.xql	4 Dec 2002 09:54:15 -0000	1.2
@@ -17,6 +17,7 @@
                    END) as url,
                    fs_objects.object_id,
                    fs_objects.name,
+                   fs_objects.file_upload_name,
                    fs_objects.live_revision,
                    fs_objects.type,
                    fs_objects.content_size
@@ -42,6 +43,7 @@
                    END) as url,
                    fs_objects.object_id,
                    fs_objects.name,
+                   fs_objects.file_upload_name,
                    fs_objects.live_revision,
                    fs_objects.type,
                    fs_objects.content_size
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	23 Oct 2002 12:32:12 -0000	1.22
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	4 Dec 2002 09:54:15 -0000	1.23
@@ -20,9 +20,8 @@
 
 <if @config.shaded_p@ false>
 
-<if @n_folders@ eq 1 or @user_root_folder_present_p@ true>
 <if @write_p@ true>
-  <table>
+  <table width="100%">
     <tr>
       <td>
         <nobr>
@@ -36,98 +35,82 @@
         </nobr>
       </td>
     </tr>
-    <tr>
-      <td>
-        <br>
-        <nobr>
-          <small>
-            #fs-portlet.view_past_mod_files#
-            <a href="@contents_url@n_past_days=999999">#fs-portlet.all#</a>
-            |
-            <a href="@contents_url@n_past_days=1">1</a>
-            |
-            <a href="@contents_url@n_past_days=2">2</a>
-            |
-            <a href="@contents_url@n_past_days=3">3</a>
-            |
-            <a href="@contents_url@n_past_days=7">7</a>
-            |
-            <a href="@contents_url@n_past_days=14">14</a>
-            |
-            <a href="@contents_url@n_past_days=30">30</a>
-            #fs-portlet.days#.
-          </small>
-        </nobr>
-      </td>
-    </tr>
   </table>
 
-  <br>
 </if>
-</if>
 
-  <table border="0" cellpadding="2" cellspacing="2" width="100%">
-<multiple name="folders">
-    <tr>
-<if @folders.type@ eq "folder">
-      <td>
-        <img border="0" src="@folders.url@graphics/folder.gif">
-      </td>
-      <td>
-        <a href="@folders.url@?folder_id=@folders.object_id@">
-          @folders.name@
-        </a>
-      </td>
-      <td><small>@folders.type@</small></td>
-<if @folders.content_size@ eq 0>
-      <td><small>0 #fs-portlet.items#</small></td>
-      <td>&nbsp;</td>
+
+<if @scoped_p@ eq 1>
+<include src=@scope_fs_url@ folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@ fs_url="@url@">
 </if>
+
 <else>
-  <if @folders.content_size@ gt 1>
-      <td><small>@folders.content_size@ #fs-portlet.items#</small></td>
-  </if>
-  <else>
-      <td><small>@folders.content_size@ #fs-portlet.item#</small></td>
-  </else>
+  <table class="table-display" border="0" cellpadding="3" cellspacing="0" width="100%">
+    <multiple name="folders">
+       <if @folders.rownum@ odd>
+          <tr class="odd">
+       </if>
+       <else>
+          <tr class="even">
+       </else>
+
+       <if @folders.type@ eq "folder">
+          <td>
+          <a href="@folders.url@?folder_id=@folders.object_id@">
+	  <img border="0" src="/graphics/folder.gif" height="14" width="14">
+ 	  </a>
+          </td>
+          <td>
+          <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>
+          </td>
+          <td><small>@folders.type@</small></td>
+          <if @folders.content_size@ eq 0>
+            <td><small>0 #fs-portlet.items#</small></td>
+          </if>
+          <else>
+            <if @folders.content_size@ gt 1>
+               <td><small>@folders.content_size@ #fs-portlet.items#</small></td>
+            </if>
+            <else>
+                <td><small>@folders.content_size@ #fs-portlet.item#</small></td>
+            </else>
+          <td>&nbsp;</td>
+          </else>
+        </if>
+        <else>
+          <if @folders.type@ eq "url">
+             <td>
+              <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/graphics/file.gif"></a>
+             </td>
+             <td>
+             <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
+             </td>
+             <td><small>@folders.type@</small></td>
+             <td><small>&nbsp;</small></td>
+             <td><small>&nbsp;</small></td>
+          </if>
+          <else>
+             <td>
+              <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@"><img border="0" src="/graphics/file.gif"></a>
+             </td>
+             <td>
+             <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
+             </td>
+             <td><small>@folders.type@</small></td>
+             <td><small>@folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else></small></td>
+            <td>
+            <nobr> <small>[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>]</small>
+            </nobr>
+            </td>
+         </else>
+      </else>
+      </tr>  
+   </multiple>
+   </table>
+
 </else>
-</if>
-<else>
-<if @folders.type@ eq "url">
-      <td>
-          <img border="0" src="@folders.url@graphics/file.gif">
-      </td>
-      <td>
-        <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
-      </td>
-      <td><small>@folders.type@</small></td>
-      <td><small>&nbsp;</small></td>
-      <td><small>&nbsp;</small></td>
-</if>
-<else>
-      <td>
-          <img border="0" src="@folders.url@graphics/file.gif">
-      </td>
-      <td>
-        <a href="@folders.url@download/@folders.name@?version_id=@folders.live_revision@">@folders.name@</a>
-      </td>
-      <td><small>@folders.type@</small></td>
-      <td><small>@folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else></small></td>
-      <td>
-        <nobr>
-          <small>[
-            <a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>
-          ]</small>
-        </nobr>
-      </td>
-</else>
-</else>
-    </tr>  
-</multiple>
-  </table>
 
 </if>
 <else>
   &nbsp;
 </else>
-
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	9 Aug 2002 18:39:32 -0000	1.15
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	4 Dec 2002 09:54:15 -0000	1.16
@@ -72,11 +72,11 @@
     set delete_p [permission::permission_p -object_id $folder_id -privilege "delete"]
 }
 
-set query "select_folder_contents"
-if {!$scoped_p} {
-    set query "select_folders"
+set query "select_folders"
+if {$scoped_p} {
+    set scope_fs_url "/packages/file-storage/www/folder-chunk"
+} else {
+    db_multirow folders $query {}
 }
 
-db_multirow folders $query {}
-
 ad_return_template 
Index: openacs-4/packages/new-portal/sql/oracle/add-sloan-theme.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/Attic/add-sloan-theme.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/sql/oracle/add-sloan-theme.sql	16 Oct 2002 15:39:16 -0000	1.1
+++ openacs-4/packages/new-portal/sql/oracle/add-sloan-theme.sql	4 Dec 2002 09:54:47 -0000	1.2
@@ -1,5 +1,5 @@
 --
---  Copyright (C) 2001, 2002 OpenForce, Inc.
+--  Copyright (C) 2001, 2002 MIT
 --
 --  This file is part of dotLRN.
 --
@@ -15,10 +15,6 @@
 --
 
 --
--- The New Portal Package
--- copyright 2001, OpenForce, Inc.
--- distributed under the GNU GPL v2
---
 -- Arjun Sanyal (arjun@openforce.net)
 -- $Id$
 --
Index: openacs-4/packages/new-portal/sql/postgresql/add-sloan-theme.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/Attic/add-sloan-theme.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/sql/postgresql/add-sloan-theme.sql	16 Oct 2002 15:39:16 -0000	1.1
+++ openacs-4/packages/new-portal/sql/postgresql/add-sloan-theme.sql	4 Dec 2002 09:54:47 -0000	1.2
@@ -1,5 +1,5 @@
 --
---  Copyright (C) 2001, 2002 OpenForce, Inc.
+--  Copyright (C) 2001, 2002 MIT
 --
 --  This file is part of dotLRN.
 --
@@ -15,11 +15,6 @@
 --
 
 --
--- The New Portal Package
--- copyright 2001, OpenForce, Inc.
--- distributed under the GNU GPL v2
---
--- Arjun Sanyal (arjun@openforce.net)
 -- $Id$
 --
 
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.161 -r1.162
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	17 Nov 2002 13:12:58 -0000	1.161
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	4 Dec 2002 09:54:47 -0000	1.162
@@ -431,7 +431,7 @@
 
         append theme_chunk "<input type=submit name=op value=\"[_ new-portal.Change_Theme_1]\"></form>"
 	if {$allow_theme_change_p} {
-        append template "$theme_chunk"
+            append template "$theme_chunk"
 	}
 
         #
@@ -2316,4 +2316,3 @@
     }
 
 }
-
Index: openacs-4/packages/new-portal/www/show-here.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/show-here.tcl	16 Oct 2002 15:39:17 -0000	1.1
+++ openacs-4/packages/new-portal/www/show-here.tcl	4 Dec 2002 09:54:47 -0000	1.2
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2001, 2002 OpenForce, Inc.
+#  Copyright (C) 2001, 2002 MIT
 #
 #  This file is part of dotLRN.
 #
Index: openacs-4/packages/new-portal/www/themes/sloan-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/sloan-theme.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/themes/sloan-theme.adp	16 Oct 2002 15:39:17 -0000	1.1
+++ openacs-4/packages/new-portal/www/themes/sloan-theme.adp	4 Dec 2002 09:54:47 -0000	1.2
@@ -1,8 +1,8 @@
 <%
 
     #
-    #  Copyright (C) 2001, 2002 OpenForce, Inc.
-    #
+   #  Copyright (C) 2001, 2002 MIT
+   #
     #  This file is part of dotLRN.
     #
     #  dotLRN is free software; you can redistribute it and/or modify it under the
Index: openacs-4/packages/news-portlet/www/news-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/Attic/news-portlet-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/news-portlet/www/news-portlet-oracle.xql	18 Nov 2002 17:59:27 -0000	1.6
+++ openacs-4/packages/news-portlet/www/news-portlet-oracle.xql	4 Dec 2002 09:55:27 -0000	1.7
@@ -18,7 +18,9 @@
             and (news_items_approved.archive_date >= sysdate or news_items_approved.archive_date is null)
             and news_items_approved.package_id in ([join $list_of_package_ids ", "])
             order by parent_name,
-                     news_items_approved.publish_title
+                     news_items_approved.publish_date desc,
+                     news_items_approved.publish_title			
+
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/news-portlet/www/news-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/Attic/news-portlet-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news-portlet/www/news-portlet-postgresql.xql	18 Nov 2002 17:59:27 -0000	1.2
+++ openacs-4/packages/news-portlet/www/news-portlet-postgresql.xql	4 Dec 2002 09:55:27 -0000	1.3
@@ -18,7 +18,9 @@
             and (news_items_approved.archive_date >= current_timestamp or news_items_approved.archive_date is null)
             and news_items_approved.package_id in ([join $list_of_package_ids ", "])
             order by parent_name,
-                     news_items_approved.publish_title
+                     news_items_approved.publish_date desc,
+                     news_items_approved.publish_title			
+
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/news-portlet/www/news-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/news-portlet/www/news-portlet.adp	10 Nov 2002 16:24:42 -0000	1.9
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	4 Dec 2002 09:55:27 -0000	1.10
@@ -32,15 +32,20 @@
 <% set new_package_id $news_items(package_id) %>
 
     <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
-        <br>
       </ul>
     </if>
 
     <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-      <li>@news_items.parent_name@
+      @news_items.parent_name@
       <ul>
     </if>
 
+<if @news_items:rowcount@ eq 1>
+	<include src=summary 
+	item_id=@news_items.item_id@ 
+	url=@news_items.url@?item_id=@news_items.item_id@>
+</if>
+<else>
       <li>
         <a href="@news_items.url@item?item_id=@news_items.item_id@">@news_items.publish_title@</a>
         <small>(@news_items.publish_date@)</small>
@@ -49,7 +54,7 @@
 <%
     set old_package_id $new_package_id
 %>
-
+</else>
 </multiple>
 
   </if>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/news-portlet/www/summary.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/news-portlet/www/summary.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml	10 Nov 2002 17:44:39 -0000	1.2
+++ openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml	4 Dec 2002 09:56:14 -0000	1.3
@@ -10,6 +10,6 @@
   <msg key="admin_portlet_pretty_name">Custom Portlet Administration</msg>
   <msg key="lt_Delete_element_pretty">Delete %element_pretty_name% %pretty_name%</msg>
   <msg key="lt_Editing_element_prett">Editing %element_pretty_name% %pretty_name%</msg>
-  <msg key="lt_Use_this_form_to_crea">Use this form to create a new %element_pretty_name%.  The %element_pretty_name% will be created and automatically placed on the first page of %portal_name% portal. Goto the %control_panel_text% and select Customize Layout to move the this %element_pretty_name%.</msg>
+  <msg key="lt_Use_this_form_to_crea">Use this form to create a new %element_pretty_name%.  The %element_pretty_name% will be created and automatically placed on the first page of %portal_name% portal. Goto the %control_panel_text% and select Customize Layout to move this %element_pretty_name%.</msg>
   <msg key="lt_strongNotestrong_You_">&lt;strong&gt;Note&lt;/strong&gt;: You can use plain text or HTML in the Content area.</msg>
 </message_catalog>
Index: openacs-4/packages/static-portlet/www/element-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/Attic/element-new.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/static-portlet/www/element-new.tcl	10 Nov 2002 17:44:39 -0000	1.11
+++ openacs-4/packages/static-portlet/www/element-new.tcl	4 Dec 2002 09:56:14 -0000	1.12
@@ -41,6 +41,15 @@
     set control_panel_text "[_ static-portlet.Control_Panel]"
 }
 
+#these are set for display and instructions.
+set community_id $package_id
+
+set portal_name [portal::get_name $portal_id]
+
+if {![info exists control_panel_text]} {
+    set control_panel_text "[_ static-portlet.Control_Panel]"
+}
+
 form create new_static_element
 
 element create new_static_element pretty_name \