Index: openacs-4/packages/chat/sql/postgresql/chat-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/chat-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/sql/postgresql/chat-create.sql	8 Aug 2006 21:26:19 -0000	1.3
+++ openacs-4/packages/chat/sql/postgresql/chat-create.sql	26 Oct 2006 11:11:19 -0000	1.4
@@ -180,36 +180,38 @@
 SELECT inline_0();
 DROP function inline_0();
 
+---------------------------------------------
 
-create table chat_rooms (
+CREATE TABLE "public"."chat_rooms" (
+  "room_id" INTEGER NOT NULL, 
+  "pretty_name" VARCHAR(100) NOT NULL, 
+  "description" VARCHAR(2000), 
+  "moderated_p" BOOLEAN DEFAULT false, 
+  "active_p" BOOLEAN DEFAULT true, 
+  "archive_p" BOOLEAN DEFAULT false, 
+  "maximal_participants" INTEGER, 
+  "end_date" DATE, 
+  "creator" INTEGER, 
+  "context_id" INTEGER, 
+  "comm_name" VARCHAR, 
+  CONSTRAINT "chat_rooms_room_id_pk" PRIMARY KEY("room_id"), 
+  CONSTRAINT "chat_rooms_active_p_ck" CHECK ((active_p = true) OR (active_p = false)), 
+  CONSTRAINT "chat_rooms_archive_p_ck" CHECK ((archive_p = true) OR (archive_p = false)), 
+  CONSTRAINT "chat_rooms_moderate_p_ck" CHECK ((moderated_p = true) OR (moderated_p = false)), 
+  CONSTRAINT "chat_rooms_fk" FOREIGN KEY ("creator")
+    REFERENCES "public"."users"("user_id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+    NOT DEFERRABLE, 
+  CONSTRAINT "chat_rooms_room_id_fk" FOREIGN KEY ("room_id")
+    REFERENCES "public"."acs_objects"("object_id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+    NOT DEFERRABLE
+) WITH OIDS;
 
-    room_id            integer
-                       constraint chat_rooms_room_id_pk primary key
-                       constraint chat_rooms_room_id_fk
-                       references acs_objects(object_id),
-    -- This is room name.
-    pretty_name        varchar(100)
-                       constraint chat_rooms_pretty_name_nn not null,
-    description        varchar(2000),
-    moderated_p        boolean
-                       default 'f'
-                       constraint chat_rooms_moderate_p_ck
-                       check (moderated_p in ('t','f')),
-    active_p           boolean
-                       default 't'
-                       constraint chat_rooms_active_p_ck
-                       check (active_p in ('t','f')),
-    -- if set then log all chat messages in this room.
-    archive_p          boolean
-                        default 't'
-                       constraint chat_rooms_archive_p_ck
-                        check (archive_p in ('t', 'f')),
-    -- flush the rooms messages every night at 00:05                    
-    auto_flush_p        boolean default 't',
-    -- automatically create a transcript after flushing the room
-    auto_transcript_p   boolean default 'f'
-);
 
+---------------------------------------
 
 -- create chat transcript object type
 CREATE FUNCTION inline_0()
@@ -340,43 +342,86 @@
 );
 
 
+--------------------------------
+
+CREATE TABLE "public"."chat_registered_users" (
+  "alias" VARCHAR(20) NOT NULL, 
+  "room_id" INTEGER, 
+  "user_id" INTEGER, 
+  "rss_service" BOOLEAN, 
+  "mail_service" BOOLEAN, 
+  "registered_id" INTEGER NOT NULL, 
+  CONSTRAINT "chat_registered_users_pkey" PRIMARY KEY("registered_id"), 
+  CONSTRAINT "chat_registered_users_fk" FOREIGN KEY ("room_id")
+    REFERENCES "public"."chat_rooms"("room_id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+    NOT DEFERRABLE, 
+  CONSTRAINT "chat_registered_users_fk1" FOREIGN KEY ("user_id")
+    REFERENCES "public"."users"("user_id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+    NOT DEFERRABLE, 
+  CONSTRAINT "chat_registered_users_fk2" FOREIGN KEY ("registered_id")
+    REFERENCES "public"."acs_objects"("object_id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION
+    NOT DEFERRABLE
+) WITH OIDS;
+
+
+
 ---------------------------------
 
-create or replace function chat_room__new (integer, varchar, varchar, boolean, boolean, boolean, boolean, boolean, integer, timestamptz, integer, varchar, varchar)
-returns integer as '
+CREATE OR REPLACE FUNCTION "public"."chat_room__new" (varchar, varchar, varchar, varchar, integer, timestamp, boolean, boolean, boolean, boolean, boolean, integer, integer, integer, varchar, varchar) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
 declare
-   p_room_id        alias for $1;
-   p_pretty_name    alias for $2;
+   p_pretty_name    alias for $1;
+   p_alias          alias for $2;
    p_description    alias for $3;
-   p_moderated_p    alias for $4;
-   p_active_p       alias for $5;
-   p_archive_p      alias for $6;
-   p_auto_flush_p      alias for $7;
-   p_auto_transcript_p      alias for $8;
-   p_context_id     alias for $9;
-   p_creation_date  alias for $10;
-   p_creation_user  alias for $11;
-   p_creation_ip    alias for $12;
-   p_object_type    alias for $13;
+   p_key_words      alias for $4;
+   p_maxP           alias for $5;
+   p_end_date       alias for $6;
+   p_Rss_service    alias for $7;
+   p_Mail_service   alias for $8;
+   p_moderated_p    alias for $9;
+   p_active_p       alias for $10;
+   p_archive_p      alias for $11;
+   p_context_id     alias for $12;
+   p_comm_id        alias for $13;
+   p_creation_user  alias for $14;
+   p_creation_ip    alias for $15;
+   p_object_type    alias for $16;
    v_room_id        chat_rooms.room_id%TYPE;
+   v_registered_id  chat_rooms.room_id%TYPE;
+   v_comm_name      varchar;
 begin
-   v_room_id := acs_object__new (
-     null,
-     ''chat_room'',
-     now(),
-     p_creation_user,
-     p_creation_ip,
-     p_context_id
-   );
+     v_room_id := acs_object__new(null,''chat_room'',now(),p_creation_user,p_creation_ip,p_context_id   );
+     v_registered_id := acs_object__new(null,''chat_room'',now(),p_creation_user,p_creation_ip,p_context_id   );
 
-   insert into chat_rooms
-       (room_id, pretty_name, description, moderated_p, active_p, archive_p, auto_flush_p, auto_transcript_p)
+     if exists (select dot.pretty_name from dotlrn_communities_all as dot where dot.community_id = p_comm_id) then
+        select into v_comm_name dot.pretty_name from dotlrn_communities_all as dot where dot.community_id = p_comm_id;
+        insert into chat_rooms
+               (room_id, pretty_name, description, moderated_p, active_p, archive_p, maximal_participants, end_date, creator, context_id,comm_name)
+       values
+             (v_room_id, p_pretty_name, p_description, p_moderated_p, p_active_p, p_archive_p, p_maxP, p_end_date,p_creation_user, p_context_id,v_comm_name);
+     else
+         insert into chat_rooms
+                (room_id, pretty_name, description, moderated_p, active_p, archive_p, maximal_participants, end_date, creator, context_id,comm_name)
+         values
+               (v_room_id, p_pretty_name, p_description, p_moderated_p, p_active_p, p_archive_p, p_maxP, p_end_date,p_creation_user, p_context_id,''Dotlrn'');
+     end if;
+
+
+   insert into chat_registered_users
+       (alias, room_id, user_id, RSS_service, mail_service, registered_id)
    values
-       (v_room_id, p_pretty_name, p_description, p_moderated_p, p_active_p, p_archive_p, p_auto_flush_p, p_auto_transcript_p);
+       (p_alias, v_room_id, p_creation_user, p_Rss_service, p_Mail_service, v_registered_id);
 
 return v_room_id;
 
-end;' language 'plpgsql';
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
 
 
 
@@ -442,6 +487,9 @@
 
     -- First erase all the messages relate to this chat room.
     delete from chat_msgs where room_id = p_room_id;
+    
+     -- Secondly erase all the registered users relate to this chat room.
+    delete from chat_registered_users where room_id = p_room_id;
 
      -- Delete all privileges associate with this room
      delete from acs_permissions where object_id = p_room_id;
@@ -457,7 +505,45 @@
 
 ---------------------------------
 
+CREATE OR REPLACE FUNCTION "public"."chat_room__delete_registered_users" (integer, integer) RETURNS integer AS'
+declare
+   p_room_id        alias for $1;
+   p_user_id        alias for $2;
+begin
+    delete from chat_registered_users where room_id = p_room_id
+    and user_id = p_user_id;
+    return 0;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
 
+
+
+---------------------------------
+
+CREATE OR REPLACE FUNCTION "public"."chat_room_registered__user" (varchar, integer, integer, boolean, boolean, integer, varchar) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
+declare
+   p_alias          alias for $1;
+   p_user_id        alias for $2;
+   p_room_id        alias for $3;
+   p_RSS_service    alias for $4;
+   p_mail_service   alias for $5;
+   p_context_id     alias for $6;
+   p_creation_ip    alias for $7;
+   v_registered_id          chat_rooms.room_id%TYPE;
+begin
+   v_registered_id := acs_object__new(null,''chat_room'',now(),p_user_id,p_creation_ip,p_context_id   );
+   insert into chat_registered_users
+       (alias, room_id, user_id, RSS_service, mail_service, registered_id)
+   values
+       (p_alias, p_room_id, p_user_id, p_RSS_service, p_mail_service, v_registered_id);
+return v_registered_id;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+---------------------------------
+
+
 create function chat_transcript__new (varchar, varchar, varchar, integer, integer, timestamptz, integer,  varchar, varchar)
 returns integer as '
 declare
@@ -509,31 +595,44 @@
 ----------------------------
 
 
-create or replace function chat_room__edit (integer, varchar, varchar, boolean, boolean, boolean, boolean, boolean)
-returns integer as '
+CREATE OR REPLACE FUNCTION "public"."chat_room__edit" (varchar, varchar, varchar, varchar, integer, timestamp, boolean, boolean, boolean, boolean, boolean, integer, integer) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
 declare
-   p_room_id        alias for $1;
-   p_pretty_name    alias for $2;
+   p_pretty_name    alias for $1;
+   p_alias          alias for $2;
    p_description    alias for $3;
-   p_moderated_p    alias for $4;
-   p_active_p       alias for $5;
-   p_archive_p      alias for $6;
-   p_auto_flush_p      alias for $7;
-   p_auto_transcript_p      alias for $8;
+   p_key_words      alias for $4;
+   p_maxP           alias for $5;
+   p_end_date       alias for $6;
+   p_Rss_service    alias for $7;
+   p_Mail_service   alias for $8;
+   p_moderated_p    alias for $9;
+   p_active_p       alias for $10;
+   p_archive_p      alias for $11;
+   p_user_id        alias for $12;
+   p_room_id        alias for $13;
 begin
 
-        update chat_rooms set
+     update chat_rooms set
             pretty_name = p_pretty_name,
             description = p_description,
+            maximal_participants = p_maxP,
+            end_date = p_end_date,
             moderated_p = p_moderated_p,
             active_p    = p_active_p,
-            archive_p   = p_archive_p,
-            auto_flush_p   = p_auto_flush_p,
-            auto_transcript_p   = p_auto_transcript_p
-        where
-            room_id = p_room_id;
-        return 0;
-end;' language 'plpgsql';
+            archive_p   = p_archive_p
+            where room_id = p_room_id;
+         
+     update chat_registered_users set
+            alias = p_alias,
+            RSS_service = p_Rss_service,
+            mail_service = p_Mail_service
+            where room_id = p_room_id
+            and user_id = p_user_id;
+            
+            return 0;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
 
 
 ---------------------------
Index: openacs-4/packages/chat/sql/postgresql/chat-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/chat-drop.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/chat/sql/postgresql/chat-drop.sql	14 Mar 2006 12:16:09 -0000	1.1
+++ openacs-4/packages/chat/sql/postgresql/chat-drop.sql	26 Oct 2006 11:11:19 -0000	1.2
@@ -47,13 +47,14 @@
 drop   function chat_transcript__edit (integer, varchar, varchar, varchar );
 
 
-drop   function chat_room__new (integer, varchar, varchar, boolean, boolean, boolean, integer, timestamptz, integer, varchar, varchar);
+drop   function chat_room__new (varchar, varchar, varchar, varchar, integer, timestamp, boolean, boolean, boolean, boolean, boolean, integer, integer, integer, varchar, varchar);
 drop   function chat_room__name (integer);
 
 drop   function chat_room__message_post (integer, varchar, integer, varchar);
 
+drop   function chat_room__delete_registered_users (integer, integer);
+drop   funciton chat_room_registered__user (varchar, integer, integer, boolean, boolean, integer, varchar);
 
-
 drop   function chat_room__edit (integer, varchar, varchar, boolean, boolean, boolean);
 drop   function chat_room__message_count (integer);
 drop   function chat_room__delete_all_msgs (integer);
@@ -63,6 +64,7 @@
 drop table chat_msgs;
 drop table chat_transcripts;
 drop table chat_rooms;
+drop table chat_registered_users;
 
 
 --
Index: openacs-4/packages/chat/tcl/chat-ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-ajax-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	26 Oct 2006 11:11:20 -0000	1.3
@@ -13,7 +13,9 @@
   Chat instproc render {} {
     my orderby time
     set result ""
-    foreach child [my children] {
+    
+    foreach child [my children] {      
+      
       set msg       [$child msg]
       set user_id   [$child user_id]
       set color     [$child color]
@@ -23,7 +25,7 @@
       append result "<p class='line'><span class='timestamp'>$timeshort</span>" \
 	  "<span class='user'>$userlink:</span>" \
 	  "<span class='message'>[my encode $msg]</span></p>\n"
-    }
+    }        
     return $result
   }
 
@@ -41,7 +43,8 @@
     set path      [site_node::get_url_from_object_id -object_id $package_id]
     set login_url ${path}ajax/chat?m=login&$context
     set send_url  ${path}ajax/chat?m=add_msg&$context&msg=
-    set users_url ${path}ajax/chat?m=get_users&$context
+   
+    set users_url ${path}ajax/chat?m=get_users&$context    
     return "\
       <script type='text/javascript' language='javascript'>
       $js
@@ -62,6 +65,59 @@
       </div>
       </form> 
     "
+    
   }
-}
+  
+  
+  Chat instproc render2 {-chat_id } {
+    my orderby time
+    set result ""
 
+    db_1row room_info {
+        select room.maximal_participants as maxp
+        from chat_rooms as room
+        where room.room_id = :chat_id        
+      }
+     
+     
+    foreach child [my children] {
+      set msg       [$child msg]
+      set user_id   [$child user_id]
+      set color     [$child color]
+      set timelong  [clock format [$child time]]
+      set timeshort [clock format [$child time] -format {[%H:%M:%S]}]
+      
+      db_1row room_info {
+        select count(1) as info
+        from chat_registered_users
+        where room_id = :chat_id
+        and user_id = :user_id
+      }    
+    
+    if { $info > 0 } {
+	db_1row room_info {	
+        	select alias as alias
+        	from chat_registered_users
+        	where room_id = :chat_id
+        	and user_id = :user_id
+	}	
+	set userlink  [my user_link2 -user_id $user_id -color $color -alias $alias]
+        append result "<p class='line'><span class='timestamp'>$timeshort</span>" \
+	  "<span class='user'>$userlink:</span>" \
+	  "<span class='message'>[my encode $msg]</span></p>\n"
+    }
+    if {$info eq 0} {   
+    	set userlink  [my user_link -user_id $user_id -color $color]
+        	append result "<p class='line'><span class='timestamp'>$timeshort</span>" \
+	  	"<span class='user'>$userlink:</span>" \
+	  	"<span class='message'>[my encode $msg]</span></p>\n"
+	  }
+    }
+    
+    
+    return $result
+  }
+  
+  
+  
+}	
\ No newline at end of file
Index: openacs-4/packages/chat/tcl/chat-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/Attic/chat-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/tcl/chat-procs-postgresql.xql	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/tcl/chat-procs-postgresql.xql	26 Oct 2006 11:11:20 -0000	1.3
@@ -3,20 +3,23 @@
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 <fullquery name="chat_room_new.create_room">
       <querytext>
-            select chat_room__new (
-             NULL,
+            select chat_room__new (            
              :pretty_name,
+             :alias,
              :description,
-             :moderated_p,
-             :active_p,
-             :archive_p,
-             :auto_flush_p,
-             :auto_transcript_p,
-             :context_id,
-             now(),
-             :creation_user,
-             :creation_ip,
-             'chat_room'
+             :key_words,
+             :maxP,
+             timestamp :end_date,
+             boolean :Rss_service,
+             boolean :Mail_service,
+             boolean :moderated_p,
+             boolean :active_p,
+             boolean :archive_p,
+             integer :context_id,
+             integer :comm_id,             
+             integer :creation_user,
+             varchar :creation_ip,
+             varchar 'chat_room'                          
             )
       </querytext>
 </fullquery>
@@ -112,21 +115,25 @@
            return 0;
 	end;
      </querytext>
-</fullquery>
+</fullquery>   
 
-
 <fullquery name="chat_room_edit.edit_room">
       <querytext>
          begin
 	    perform chat_room__edit (
-	        :room_id,
 	        :pretty_name,
+	        :alias,
 	        :description,
+	        :key_words,
+	        :maxP,
+	        :end_date,
+	        :Rss_service,
+	        :Mail_service,
 	        :moderated_p,
 	        :active_p,
             :archive_p,
-            :auto_flush_p,
-            :auto_transcript_p
+            :user_id,
+            :room_id
 	    );
             return 0;
 	end;
@@ -141,10 +148,11 @@
 </fullquery>
 
 
-<fullquery name="chat_room_message_delete.delete_message">
+
+<fullquery name="chat_room_delete_registered_users.delete_users">
       <querytext>
-          begin
-	    perform chat_room__delete_all_msgs(:room_id);
+          begin          
+	    perform chat_room__delete_registered_users(:room_id,:user_id);
             return 0;
 	end;
      </querytext>
@@ -221,5 +229,21 @@
       </querytext>
 </fullquery>
 
+<fullquery name="chat_registered_user.register">
+      <querytext>
+            select chat_room_registered__user (
+             varchar :alias,
+             integer :user_id,
+             integer :room_id,
+             boolean :RSS_service,
+             boolean :mail_service,
+             integer :context_id,
+             varchar :creation_ip
+            )
+      </querytext>
+</fullquery>
+
+
+
 </queryset>
 
Index: openacs-4/packages/chat/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/chat/tcl/chat-procs.tcl	8 Aug 2006 21:26:19 -0000	1.7
+++ openacs-4/packages/chat/tcl/chat-procs.tcl	26 Oct 2006 11:11:20 -0000	1.8
@@ -146,18 +146,24 @@
     db_exec_plsql post_message {}
 
 }
-ad_proc -public chat_room_new {
-    {-description ""}
-    {-moderated_p f}
-    {-active_p t}
-    {-archive_p f}
-    {-auto_flush_p t}
-    {-auto_transcript_p f}
-    {-context_id ""}
+ad_proc -public chat_room_new {    
+    {-alias ""}    
+    {-key_words ""}
+    {-maxP ""}
+    {-end_date ""}
+    {-Rss_service ""}
+    {-Mail_service ""}
+    {-moderated_p ""}
+    {-active_p ""}
+    {-archive_p ""}
+    {-auto_flush_p ""}
+    {-auto_transcript_p ""}
+    {-context_id ""}    
+    {-comm_id ""}
     {-creation_user ""}
     {-creation_ip ""}
+    description
     pretty_name
-
 } {
     Create new chat room. Return room_id if successful else raise error.
 } {
@@ -172,18 +178,23 @@
 }
 
 ad_proc -public chat_room_edit {
-    room_id
-    pretty_name
+    {-alias ""}
+    {-key_words ""}
+    {-maxP ""}
+    {-end_date ""}
+    {-Rss_service ""}
+    {-Mail_service ""}
+    {-moderated_p ""}
+    {-active_p ""}
+    {-archive_p ""}
+    {-user_id ""}
+    {-room_id ""}
     description
-    moderated_p
-    active_p
-    archive_p
-    auto_flush_p
-    auto_transcript_p
+    pretty_name
 } {
     Edit information on chat room. All information require.
 } {
-   db_exec_plsql edit_room {}
+  db_exec_plsql edit_room {}
 }
 
 ad_proc -public chat_room_delete {
@@ -375,14 +386,16 @@
 }
 
 
+
+
 ad_proc -public chat_moderate_message_post {
     room_id
     user_id
     message
 } {
     Post moderate message to the chat room and broadcast to all applet clients. Only use by HTML client.
 } {
-    set chat_msg "<message><from>[chat_user_name $user_id]</from><from_user_id>$user_id</from_user_id><room_id>$room_id</room_id><body>$message</body><status>pending</status></message>"
+    set chat_msg "<message><from>[chat_user_name2 $user_id $alias]</from><from_user_id>$user_id</from_user_id><room_id>$room_id</room_id><body>$message</body><status>pending</status></message>"
 
     # Add message to queue. Notify thread responsible for broadcast message to applets.
     nsv_set chat html_message $chat_msg
@@ -521,7 +534,7 @@
         if { $room_info(auto_transcript_p) eq "t" } {
             # build a list of all messages
             db_foreach get_archives_messages {} {
-                append contents "\[$creation_date\] <b>[chat_user_name $creation_user]</b>: $msg<br>\n"
+                append contents "\[$creation_date\] <b>[chat_user_name $alias]</b>: $msg<br>\n"
             }
             if { $contents ne "" } {
                 chat_transcript_new \
@@ -534,3 +547,77 @@
     }
 }
 
+ad_proc -public chat_registered_user {     
+    {-RSS_service ""}
+    {-mail_service ""}
+    {-context_id ""}
+    {-creation_ip ""}
+    room_id   
+    alias    
+    user_id
+} {
+    A user is regitered in a chat room.
+} {
+
+    db_transaction {
+    	set registered_id [db_exec_plsql register {}]
+    }  
+
+    return $registered_id
+}
+
+
+ad_proc -public chat_message_post2 {
+    room_id
+    user_id
+    alias
+    message
+    moderator_p
+} {
+    Post message to the chat room and broadcast to all applet clients. Used by ajax + html.
+} {
+    if {$moderator_p == "1" } {
+        set status "approved"
+    } else {
+        set status "pending"
+    }
+    	
+	set default_client [parameter::get -parameter "DefaultClient" -default "ajax"]
+	if {$default_client eq "java"} {
+		set chat_msg "<message><from>[chat_user_name2 $user_id $alias]</from><from_user_id>$user_id</from_user_id><room_id>$room_id</room_id><body>$message</body><status>$status</status></message>"
+		# Add message to queue. Notify thread responsible for 
+		# broadcast message to applets.
+		nsv_set chat html_message $chat_msg
+		ns_mutex unlock [nsv_get chat new_message]  
+	}
+    
+        # do not write messages to the database if the room should not be archived
+        chat_room_get -room_id $room_id -array room_info
+        if { $room_info(archive_p) eq "f" } { return }
+        
+        # write message to the database
+        if {[catch {chat_post_message_to_db -creation_user $user_id $room_id $message} errmsg]} {
+            ns_log error "chat_post_message_to_db: error: $errmsg"
+        }
+}
+
+ad_proc -public chat_user_name2 {
+    user_id
+    alias
+} {
+    Return display name of this user to use in chat.
+} {
+	acs_user::get -user_id $user_id -array user
+	set name [expr {$alias ne "" ? $alias : $alias}]
+    return $name
+
+}
+
+ad_proc -public chat_room_delete_registered_users {
+    room_id
+    user_id
+} {
+    Delete the registered users in a room.
+} {
+   db_exec_plsql delete_users {}
+}
\ No newline at end of file
Index: openacs-4/packages/chat/www/ajax-chat-script.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/ajax-chat-script.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/ajax-chat-script.tcl	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/www/ajax-chat-script.tcl	26 Oct 2006 11:11:20 -0000	1.3
@@ -9,4 +9,3 @@
 }
 
 set chat_frame [ ::chat::Chat login -chat_id $room_id]
-
Index: openacs-4/packages/chat/www/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/chat/www/chat.tcl	8 Aug 2006 21:26:19 -0000	1.7
+++ openacs-4/packages/chat/www/chat.tcl	26 Oct 2006 11:11:20 -0000	1.8
@@ -58,6 +58,7 @@
     chat_message_post $room_id $user_id $message $moderator_p
 }
 
+
 # Determine which template to use for html or ajax client
 switch $client {
     "html" {
@@ -69,10 +70,10 @@
             c1 add_msg $message
         }
     }
-    "ajax" {
+    "ajax" {        
         set template_use "ajax-chat-script"
     }
-    "java" {
+    "java" {    
         set template_use "java-chat"
 
         # Get config paramater for applet.
@@ -83,6 +84,5 @@
         set port [ad_parameter ServerPort "" 8200]
      }
 }
-
 ad_return_template $template_use
 
Index: openacs-4/packages/chat/www/html-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/chat/www/html-chat.adp	24 Jun 2006 14:23:42 -0000	1.6
+++ openacs-4/packages/chat/www/html-chat.adp	26 Oct 2006 11:11:20 -0000	1.7
@@ -35,6 +35,5 @@
 <input type=hidden name="room_id" value="@room_id@">
 <input type=hidden name="client" value="html">
 <input type=submit value="#chat.Send_Refresh#">
-<input type=submit value="#chat.Refresh#">
 </form>
 
Index: openacs-4/packages/chat/www/java-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/java-chat.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/chat/www/java-chat.adp	22 May 2003 14:26:08 -0000	1.4
+++ openacs-4/packages/chat/www/java-chat.adp	26 Oct 2006 11:11:20 -0000	1.5
@@ -4,8 +4,8 @@
 
 <center>
    <applet code=adChatApplet.class archive=chat.jar width=@width@ height=@height@>
-   <param name="user_id" value="@user_id@">
-   <param name="user_name" value="@user_name@">
+   <param name="user_id" value="@user_id@">   	   
+   <param name="user_name" value="@user_name@">    
    <param name="room_id" value="@room_id@">
    <param name="host" value="@host@">
    <param name="port" value="@port@">
Index: openacs-4/packages/chat/www/room-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/chat/www/room-edit.tcl	24 Jun 2006 14:23:42 -0000	1.5
+++ openacs-4/packages/chat/www/room-edit.tcl	26 Oct 2006 11:11:20 -0000	1.6
@@ -16,82 +16,129 @@
     set title "[_ chat.Edit_room] \"[chat_room_name $room_id]\""
 }
 
+set user_id [ad_conn user_id]
+
+
+db_1row room_info {
+        select rm.room_id,
+           rm.pretty_name as pretty_name,
+           rm.description as description,
+           rm.moderated_p as moderated,
+           rm.maximal_participants as max_p,
+           rm.active_p as active_p,
+           rm.archive_p as archive_p,
+           rm.end_date as end_date,    
+           (select ru.alias
+           from chat_registered_users ru
+           where rm.room_id = ru.room_id
+           and ru.user_id = :user_id) as alias,
+           (select ru.RSS_service
+           from chat_registered_users ru
+           where rm.room_id = ru.room_id
+           and ru.user_id = :user_id) as rss_service,
+           (select ru.mail_service
+           from chat_registered_users ru
+           where rm.room_id = ru.room_id
+           and ru.user_id = :user_id) as mail_service
+    from chat_rooms rm
+    where rm.room_id = :room_id
+}
+
+
 ad_form -name "edit-room" -edit_buttons [list [list [_ chat.Update_room] next]] -has_edit 1 -form {
-    {room_id:key}    
-    {moderated_p:boolean(hidden)
-        {value "f"}
-    }    
+    {room_id:key} 
     {pretty_name:text(text)
         {label "#chat.Room_name#" }
     }
+    {alias:text(text)
+    	{label "Alias" }
+    	{help_text "Alias in this room"}
+    }
     {description:text(textarea),optional
         {label "#chat.Description#" }
         {html {rows 6 cols 65}}
     }
+    {key_words:text(textarea),optional
+        {label "Key words" }
+        {html {rows 3 cols 25}}
+        {help_text "Main words of the room, in order to describe it"}
+
+    }
+    {end_date:date(date)
+        {label "End date (dd/mm/yyyy)" }
+        {help_text "From this date the room will be closed"}
+    }
+    {max_p:text(text)
+        {label "Maximal participants"}
+        {help_text "Maximal number of participants in this room"}
+
+    }       
+    {rss_service:boolean(radio)
+        {label "Rss_service" }
+        {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
+        {help_text "Sindicate into RSS"}     
+    }
+    {frequency:boolean(select),optional
+        {label "frequency" }
+        {options {{"daily"} {"monthly" } {"weekly" }}}
+        {help_text "Frecuency of RSS service"}            
+    }
+    {mail_service:boolean(radio)
+        {label "Mail_service" }
+        {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
+        {help_text "Receive brief mails"}    
+    }
+    {frequency2:boolean(select),optional
+        {label "frequency" }
+        {options {{"daily"} {"monthly" } {"weekly" }}}
+        {help_text "Frecuency of mail service"}            
+    }   
     {active_p:boolean(radio)
         {label "#chat.Active#" }
         {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
-        {value "t"}
+        
     }
     {archive_p:boolean(radio)
         {label "#chat.Archive#" }
         {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
-        {value "t"}
-    }    
-    {auto_flush_p:boolean(radio)
-        {label "#chat.AutoFlush#" }
+    }
+    {moderated:boolean(radio)
+        {label "Moderated" }
         {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
-        {value "t"}
-        {help_text "[_ chat.AutoFlushHelp]"}
-    }  
-    {auto_transcript_p:boolean(radio)
-        {label "#chat.AutoTranscript#" }
-        {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
-        {value "f"}
-        {help_text "[_ chat.AutoTranscriptHelp]"}
-    }      
-} -new_data {
-    if {[catch {set room_id [chat_room_new -moderated_p $moderated_p \
-                              -description $description \
+            
+    }    
+#    {auto_flush_p:boolean(radio)
+ #       {label "#chat.AutoFlush#" }
+  #      {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
+   #     {help_text "[_ chat.AutoFlushHelp]"}
+ #   }  
+ #   {auto_transcript_p:boolean(radio)
+ #       {label "#chat.AutoTranscript#" }
+  #      {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
+   #     {help_text "[_ chat.AutoTranscriptHelp]"}
+  #  }
+} -edit_request {
+    
+} -edit_data {
+    
+}  -after_submit {
+	set date [lrange $end_date 0 2]									
+	if {[catch {set room_edit [chat_room_edit \
+	                      -alias $alias \
+                              -key_words $key_words \
+                              -maxP $max_p \
+                              -end_date $date \
+                              -Rss_service $rss_service \
+                              -Mail_service $mail_service \
+                              -moderated_p $moderated \
                               -active_p $active_p \
                               -archive_p $archive_p \
-                              -auto_flush_p $auto_flush_p \
-                              -auto_transcript_p $auto_transcript_p \
-                              -context_id [ad_conn package_id] \
-                              -creation_user [ad_conn user_id] \
-                              -creation_ip [ad_conn peeraddr] $pretty_name]} errmsg]} {
+                              -user_id [ad_conn user_id] \
+                              -room_id $room_id \
+                              $description $pretty_name]} errmsg]} {
         ad_return_complaint 1 "[_ chat.Create_new_room_failed]: $errmsg"
         break
-    }
-    set comm_id ""
-    if {[info command dotlrn_community::get_community_id] ne ""} {
-      set comm_id [dotlrn_community::get_community_id] 
-    }
-    if {$comm_id ne ""} {
-      chat_user_grant $room_id $comm_id
-    } else {
-      #-2 Registered Users
-      #chat_user_grant $room_id -2 
-      #0 Unregistered Visitor
-      #chat_user_grant $room_id 0
-      #-1 The Public
-      chat_user_grant $room_id -2
-    }
-} -edit_request {
-    if {[catch {db_1row room_info {
-        select pretty_name, description, moderated_p, archive_p, active_p, auto_flush_p, auto_transcript_p
-        from chat_rooms
-        where room_id = :room_id}} errmsg]} {
-        ad_return_complaint 1 "[_ chat.Room_not_found]."
-        break
-    }
-} -edit_data {
-    if {[catch {chat_room_edit $room_id $pretty_name $description $moderated_p $active_p $archive_p $auto_flush_p $auto_transcript_p} errmsg]} {
-        ad_return_complaint 1 "[_ chat.Could_not_update_room]: $errmsg"
-        break
-    }
-    util_memoize_flush [list chat_room_get_not_cached $room_id]
-} -after_submit {
+    }      
     ad_returnredirect "room?room_id=$room_id"
     ad_script_abort    
 }
Index: openacs-4/packages/chat/www/room-enter.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-enter.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/chat/www/room-enter.tcl	24 Jun 2006 14:23:42 -0000	1.4
+++ openacs-4/packages/chat/www/room-enter.tcl	26 Oct 2006 11:11:20 -0000	1.5
@@ -30,12 +30,13 @@
 if {$default_client eq "java"} {
 	chat_start_server
 }
-
 switch $client {
-    "html" - "ajax" - "html-chat-script" {
-        ns_log Notice "YY room-enter: has_entered_the room"
-        chat_message_post $room_id $user_id "[_ chat.has_entered_the_room]." "1"
-    }
+    		"html" - "ajax" - "html-chat-script" {
+        	ns_log Notice "YY room-enter: has_entered_the room"        	
+        	chat_message_post $room_id $user_id "[_ chat.has_entered_the_room]." "1"
+        	}
 }
 
+
+
 ad_returnredirect "chat?room_id=$room_id&client=$client"
Index: openacs-4/packages/chat/www/room.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/chat/www/room.adp	24 Jun 2006 14:23:42 -0000	1.6
+++ openacs-4/packages/chat/www/room.adp	26 Oct 2006 11:11:20 -0000	1.7
@@ -28,15 +28,9 @@
         <td class="form-label">#chat.Archive#</td>
         <td>@archive_p@</td>
     </tr>   
+     
+          
     <tr class="form-element">
-        <td class="form-label">#chat.AutoFlush#</td>
-        <td>@auto_flush_p@</td>
-    </tr>  
-    <tr class="form-element">
-        <td class="form-label">#chat.AutoTranscript#</td>
-        <td>@auto_transcript_p@</td>
-    </tr>      
-    <tr class="form-element">
         <td class="form-label">#chat.message_count#</td>
         <td>@message_count@</td>
     </tr>
Index: openacs-4/packages/chat/www/room.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/chat/www/room.tcl	24 Jun 2006 14:23:42 -0000	1.4
+++ openacs-4/packages/chat/www/room.tcl	26 Oct 2006 11:11:20 -0000	1.5
@@ -51,7 +51,7 @@
 # Get room basic information.
 ###
 db_1row room_info {
-    select pretty_name, description, moderated_p, active_p, archive_p, auto_flush_p, auto_transcript_p
+    select pretty_name, description, moderated_p, active_p, archive_p
     from chat_rooms
     where room_id = :room_id
 }