Index: openacs-4/packages/chat/chat.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/chat/chat.info	25 Jun 2007 08:01:47 -0000	1.8.2.2
+++ openacs-4/packages/chat/chat.info	3 Jul 2007 07:49:50 -0000	1.8.2.3
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.0d7" url="http://openacs.org/repository/download/apm/chat-5.0d7.apm">
+    <version name="5.0d6" url="http://openacs.org/repository/download/apm/chat-5.0d6.apm">
         <owner url="http://www.openacs.org">Peter Alberer</owner>
         <summary>Server based chat with an html and ajax client.</summary>
         <release-date>2006-04-11</release-date>
@@ -16,10 +16,9 @@
 Adapted by Tekne 2006/03/01 to replace JAVA server with AJAX; make use of generalized chat class from xotcl-core.</description>
         <maturity>0</maturity>
 
-        <provides url="chat" version="5.0d7"/>
-        <requires url="dotlrn" version="2.3.0"/>
-        <requires url="acs-kernel" version="5.3.1"/>
-        <requires url="xotcl-core" version="0.46"/>
+        <provides url="chat" version="5.0d6"/>
+        <requires url="acs-kernel" version="5.0d13"/>
+        <requires url="xotcl-core" version="0.36"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/chat/catalog/chat.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.de_DE.ISO-8859-1.xml,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/chat/catalog/chat.de_DE.ISO-8859-1.xml	24 Jun 2006 14:23:40 -0000	1.2
+++ openacs-4/packages/chat/catalog/chat.de_DE.ISO-8859-1.xml	3 Jul 2007 07:49:50 -0000	1.2.2.1
@@ -92,7 +92,6 @@
   <msg key="Room_name">Raumname</msg>
   <msg key="Room_no_active">Raum nicht aktiv</msg>
   <msg key="Room_not_found">Raum nicht gefunden</msg>
-  <msg key="rooms">R�ume</msg>
   <msg key="Send_Refresh">Senden</msg>
   <msg key="sending_message">Sende Nachricht...</msg>
   <msg key="There_are_no_rooms_available">Es sind keine R�ume verf�gbar</msg>
Index: openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml	24 Jun 2006 14:23:40 -0000	1.2
+++ openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml	3 Jul 2007 07:49:50 -0000	1.2.2.1
@@ -94,7 +94,6 @@
   <msg key="Room_name">Room name</msg>
   <msg key="Room_no_active">Room no active</msg>
   <msg key="Room_not_found">Room not found, Invalid room id</msg>
-  <msg key="rooms">rooms</msg>
   <msg key="Send_Refresh">Send/Refresh</msg>
   <msg key="sending_message">Sending message...</msg>
   <msg key="There_are_no_rooms_available">There are no rooms available</msg>
Index: openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml	22 Mar 2007 10:13:58 -0000	1.2.2.1
+++ openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml	3 Jul 2007 07:49:50 -0000	1.2.2.2
@@ -94,7 +94,6 @@
   <msg key="Room_name">Nombre de la sala</msg>
   <msg key="Room_no_active">Sala no activa</msg>
   <msg key="Room_not_found">Sala no encontrada. Id de sala incorrecto</msg>
-  <msg key="rooms">salas</msg>
   <msg key="Send_Refresh">Enviar/Actualizar</msg>
   <msg key="sending_message">Enviando mensaje...</msg>
   <msg key="There_are_no_rooms_available">No hay salas disponibles</msg>
Index: openacs-4/packages/chat/catalog/chat.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.pt_BR.ISO-8859-1.xml,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/chat/catalog/chat.pt_BR.ISO-8859-1.xml	23 Apr 2007 05:54:57 -0000	1.2.2.1
+++ openacs-4/packages/chat/catalog/chat.pt_BR.ISO-8859-1.xml	3 Jul 2007 07:49:50 -0000	1.2.2.2
@@ -79,6 +79,7 @@
   <msg key="Moderated">Moderada</msg>
   <msg key="msg">Mensagem</msg>
   <msg key="Name">Nome</msg>
+  <msg key="No">N�o</msg>
   <msg key="No_information_available">Sem informa��es dispon�veis</msg>
   <msg key="noactive">Desativada</msg>
   <msg key="Refresh">Atualizar</msg>
@@ -106,18 +107,22 @@
   <msg key="transcription_msg">transcri��o de todas as mensgens do chat</msg>
   <msg key="Transcripts">Transcri��es</msg>
   <msg key="transcripts_of_room">Transcri��es dispon�veis na sala</msg>
+  <msg key="Trascript">Transcri��o</msg>
+  <msg key="Trasncript">Transcri��o</msg>
   <msg key="Unauthorized">N�o autorizado</msg>
   <msg key="Unauthorized_privilege">Privil�gio n�o autorizado</msg>
   <msg key="Unban">Desbanir</msg>
   <msg key="unban">desbanir</msg>
   <msg key="Unban_user">Desbanir usu�rio</msg>
   <msg key="Untitled">Sem T�tulo</msg>
   <msg key="Update_room">Atualizar sala</msg>
+  <msg key="Users_allow">Usu�rios permitidos</msg>
   <msg key="Users_ban">Usu�rios banidos</msg>
   <msg key="View">Ver</msg>
   <msg key="View_transcript">Ver transcri��o</msg>
   <msg key="What_search">para nome ou e-mail ou usu�rio limitado a</msg>
   <msg key="xotcl_missing">&lt;b&gt;Aviso&lt;/b&gt; O par�emtro do pacote &quot;DefaultClient&quot; est� configurado para &quot;Ajax&quot; mas o pacote xotcl-core n�o est� instalado. Chat em Ajax n�o funciona sem o xotcl-core!</msg>
+  <msg key="Yes">Sim</msg>
   <msg key="You_dont_have_permission_room">Voc� n�o tem permiss�o para entrar nesta sala de chat</msg>
   <msg key="your_name_is">seu nome �</msg>
 </message_catalog>
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.4 -r1.4.2.1
--- openacs-4/packages/chat/sql/postgresql/chat-create.sql	26 Oct 2006 11:11:19 -0000	1.4
+++ openacs-4/packages/chat/sql/postgresql/chat-create.sql	3 Jul 2007 07:49:51 -0000	1.4.2.1
@@ -180,38 +180,36 @@
 SELECT inline_0();
 DROP function inline_0();
 
----------------------------------------------
 
-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;
+create table chat_rooms (
 
+    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()
@@ -342,86 +340,43 @@
 );
 
 
---------------------------------
-
-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 "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 */
+create or replace function chat_room__new (integer, varchar, varchar, boolean, boolean, boolean, boolean, boolean, integer, timestamptz, integer, varchar, varchar)
+returns integer as '
 declare
-   p_pretty_name    alias for $1;
-   p_alias          alias for $2;
+   p_room_id        alias for $1;
+   p_pretty_name    alias for $2;
    p_description    alias for $3;
-   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;
+   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;
    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_registered_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
+   );
 
-     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)
+   insert into chat_rooms
+       (room_id, pretty_name, description, moderated_p, active_p, archive_p, auto_flush_p, auto_transcript_p)
    values
-       (p_alias, v_room_id, p_creation_user, p_Rss_service, p_Mail_service, v_registered_id);
+       (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);
 
 return v_room_id;
 
-end;
-'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+end;' language 'plpgsql';
 
 
 
@@ -487,9 +442,6 @@
 
     -- 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;
@@ -505,45 +457,7 @@
 
 ---------------------------------
 
-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
@@ -595,44 +509,31 @@
 ----------------------------
 
 
-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 */
+create or replace function chat_room__edit (integer, varchar, varchar, boolean, boolean, boolean, boolean, boolean)
+returns integer as '
 declare
-   p_pretty_name    alias for $1;
-   p_alias          alias for $2;
+   p_room_id        alias for $1;
+   p_pretty_name    alias for $2;
    p_description    alias for $3;
-   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;
+   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;
 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
-            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;
+            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';
 
 
 ---------------------------
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.2 -r1.2.2.1
--- openacs-4/packages/chat/sql/postgresql/chat-drop.sql	26 Oct 2006 11:11:19 -0000	1.2
+++ openacs-4/packages/chat/sql/postgresql/chat-drop.sql	3 Jul 2007 07:49:51 -0000	1.2.2.1
@@ -47,14 +47,13 @@
 drop   function chat_transcript__edit (integer, varchar, 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__new (integer, varchar, varchar, boolean, boolean, boolean, integer, timestamptz, 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);
@@ -64,7 +63,6 @@
 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.4 -r1.4.2.1
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	30 Oct 2006 14:42:09 -0000	1.4
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	3 Jul 2007 07:49:51 -0000	1.4.2.1
@@ -13,9 +13,7 @@
   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]
@@ -25,7 +23,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
   }
 
@@ -43,8 +41,7 @@
     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
@@ -65,160 +62,6 @@
       </div>
       </form> 
     "
-    
-  }  
-  
-  Chat instproc render2 {-chat_id } {
-    my orderby time
-    set result ""
-    set msg_true "f"
-      
-    
-    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 msg_all ""
-     
-      for {set i 0} {$i < [llength $msg]} {incr i 1} {
-      	set word [lindex $msg $i]
-      	
-     
-      	for {set j 0} {$j < [llength $word]} {incr j 1} {     	
-      		if { [string range $word $j $j] eq "h" } {      	      		
-      			set aux [expr $j+1]      		
-      			if { [string range $word $aux [expr $aux+5] ] eq "ttp://" } { 
-      		  		set url [lindex $msg $i]  		  		
-      		  		lappend msg_all $i
-      		  		set msg_true "t"
-      		  		
-      			}      		      		
-      		} else {
-      			if { [string range $word $j $j] eq "w" } { 
-      			set aux [expr $j+1]      		
-      				if { [string range $word $aux [expr $aux+1] ] eq "ww" } { 
-      		  			set url [lindex $msg $i]  		  		
-      		  			lappend msg_all $i
-      		  			set msg_true "t"
-      		  		
-      				}
-      			}
-      		}
-      	}
-      }
-            
-      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]
-	
-	if {$msg_true eq  "t"} {
-	
-	append result "<p class='line'><span class='timestamp'>$timeshort</span>" \
-	  "<span class='user'>$userlink:</span>"
-	
-	append result "<span class='message'>"
-	set k 0
-	for {set l 0} {$l < [llength $msg]} {incr l 1} {
-		
-		
-			if { $l eq [lindex $msg_all $k] } {
-			
-				if { [string range [lindex $msg $l] 0 0] eq "w" } {
-					set msg_url  [my user_link4 -url [lindex $msg $l] -color $color]
-				} else {
-					set msg_url  [my user_link3 -url [lindex $msg $l] -color $color]
-				}
-				
-				append result $msg_url
-				append result " "
-				if { $k < [llength $msg_all]} {
-					set k [expr $k+1]
-				}
-			} else {
-				append result [lindex $msg $l]
-				append result " "
-			}
-		
-	  	
-	}
-	append result "</span></p>\n"
-	} else {
-
-        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]
-    	
-    	if {$msg_true eq  "t"} {
-	
-	append result "<p class='line'><span class='timestamp'>$timeshort</span>" \
-	  "<span class='user'>$userlink:</span>"
-	
-	append result "<span class='message'>"
-	set k 0
-	for {set l 0} {$l < [llength $msg]} {incr l 1} {
-		
-		
-			if { $l eq [lindex $msg_all $k] } {
-			
-				if { [string range [lindex $msg $l] 0 0] eq "w" } {
-					set msg_url  [my user_link4 -url [lindex $msg $l] -color $color]
-				} else {
-					set msg_url  [my user_link3 -url [lindex $msg $l] -color $color]
-				}				
-				append result $msg_url
-				append result " "
-				if { $k < [llength $msg_all]} {
-					set k [expr $k+1]
-				}
-			} else {
-				append result [lindex $msg $l]
-				append result " "
-			}
-		
-	  	
-	}
-	append result "</span></p>\n"
-	} else {
-
-        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.3 -r1.3.2.1
--- openacs-4/packages/chat/tcl/chat-procs-postgresql.xql	26 Oct 2006 11:11:20 -0000	1.3
+++ openacs-4/packages/chat/tcl/chat-procs-postgresql.xql	3 Jul 2007 07:49:51 -0000	1.3.2.1
@@ -3,23 +3,20 @@
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 <fullquery name="chat_room_new.create_room">
       <querytext>
-            select chat_room__new (            
+            select chat_room__new (
+             NULL,
              :pretty_name,
-             :alias,
              :description,
-             :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'                          
+             :moderated_p,
+             :active_p,
+             :archive_p,
+             :auto_flush_p,
+             :auto_transcript_p,
+             :context_id,
+             now(),
+             :creation_user,
+             :creation_ip,
+             'chat_room'
             )
       </querytext>
 </fullquery>
@@ -115,25 +112,21 @@
            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,
-            :user_id,
-            :room_id
+            :auto_flush_p,
+            :auto_transcript_p
 	    );
             return 0;
 	end;
@@ -148,11 +141,10 @@
 </fullquery>
 
 
-
-<fullquery name="chat_room_delete_registered_users.delete_users">
+<fullquery name="chat_room_message_delete.delete_message">
       <querytext>
-          begin          
-	    perform chat_room__delete_registered_users(:room_id,:user_id);
+          begin
+	    perform chat_room__delete_all_msgs(:room_id);
             return 0;
 	end;
      </querytext>
@@ -229,21 +221,5 @@
       </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.8 -r1.8.2.1
--- openacs-4/packages/chat/tcl/chat-procs.tcl	26 Oct 2006 11:11:20 -0000	1.8
+++ openacs-4/packages/chat/tcl/chat-procs.tcl	3 Jul 2007 07:49:51 -0000	1.8.2.1
@@ -9,7 +9,7 @@
 
 ad_proc -private chat_start_server {} { Start Java chat server. } {
 
-    if {[nsv_get chat server_started]} {
+    if [nsv_get chat server_started] {
         return
     }
     ns_log notice "chat_start_server: Starting chat server"
@@ -62,7 +62,7 @@
     while { 1 } {
         # Wait until there is new message in queue.
         ns_mutex lock [nsv_get chat new_message]
-        if {[nsv_exists chat html_message]} {
+        if [nsv_exists chat html_message] {
             # Get message from queue.
             puts $w [nsv_get chat html_message]
             flush $w
@@ -98,7 +98,7 @@
                 regexp "<from>(.*)</from>" $line match screen_name
                 regexp "<body>(.*)</body>" $line match msg
                 regexp "<from_user_id>(.*)</from_user_id>" $line match user_id
-                if {![nsv_exists chat_room $room_id]} {
+                if ![nsv_exists chat_room $room_id] {
                     nsv_set chat_room $room_id {}                   
                 }
 
@@ -118,12 +118,12 @@
                     }
                 }
 
-                chat_room_get -room_id $room_id -array room_info
-                if { $room_info(archive_p) eq "t" } { 
-                    if {[catch {chat_post_message_to_db -creation_user $user_id $room_id $msg} errmsg]} {
-                        ns_log error "chat_post_message_to_db: error: $errmsg"
-                    }
-                }
+				chat_room_get -room_id $room_id -array room_info
+				if { $room_info(archive_p) eq "t" } { 
+					if [catch {chat_post_message_to_db -creation_user $user_id $room_id $msg} errmsg] {
+						ns_log error "chat_post_message_to_db: error: $errmsg"
+					}
+				}
 
                 nsv_lappend chat_room $room_id $line
 
@@ -146,24 +146,18 @@
     db_exec_plsql post_message {}
 
 }
-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 ""}
+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 ""}
     {-creation_user ""}
     {-creation_ip ""}
-    description
     pretty_name
+
 } {
     Create new chat room. Return room_id if successful else raise error.
 } {
@@ -178,23 +172,18 @@
 }
 
 ad_proc -public chat_room_edit {
-    {-alias ""}
-    {-key_words ""}
-    {-maxP ""}
-    {-end_date ""}
-    {-Rss_service ""}
-    {-Mail_service ""}
-    {-moderated_p ""}
-    {-active_p ""}
-    {-archive_p ""}
-    {-user_id ""}
-    {-room_id ""}
-    description
+    room_id
     pretty_name
+    description
+    moderated_p
+    active_p
+    archive_p
+    auto_flush_p
+    auto_transcript_p
 } {
     Edit information on chat room. All information require.
 } {
-  db_exec_plsql edit_room {}
+   db_exec_plsql edit_room {}
 }
 
 ad_proc -public chat_room_delete {
@@ -380,22 +369,20 @@
         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]} {
+        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_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_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>"
+    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>"
 
     # Add message to queue. Notify thread responsible for broadcast message to applets.
     nsv_set chat html_message $chat_msg
@@ -414,7 +401,7 @@
 
     # The first time html client enter chat room, chat_room variable is not initialize correctly.
     # Therefore I just hard code the variable.
-    if {![nsv_exists chat_room $room_id]} {
+    if ![nsv_exists chat_room $room_id] {
         nsv_set chat_room $room_id [list "<message><from>[chat_user_name $user_id]</from><room_id>$room_id</room_id><body>[_ chat.has_entered_the_room]</body><status>approved</status></message>"]
     }
 
@@ -430,14 +417,14 @@
     set counter 0
 
     #foreach msg $chat_messages 
-    for { set i [expr {$cnt - 1}] } { $i >= 0 } { set i [expr {$i - 1}] } {
+    for { set i [expr $cnt - 1] } { $i >= 0 } { set i [expr $i - 1] } {
         set msg [lindex $chat_messages $i]
         regexp "<from>(.*)</from>" $msg match screen_name
         regexp "<body>(.*)</body>" $msg match chat_msg
         regexp "<status>(.*)</status>" $msg match status
 
 
-        if {$status eq "pending" || $status eq "rejected"} {
+        if {$status == "pending" || $status == "rejected"} {
             continue;
         }
 
@@ -448,7 +435,7 @@
         incr counter
         set array_val(rownum) $counter
 
-        if {$screen_name == $user_name && $chat_msg eq "has entered the room."} {
+        if {$screen_name == $user_name && $chat_msg == "has entered the room."} {
             return
         }
     }
@@ -534,7 +521,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 $alias]</b>: $msg<br>\n"
+                append contents "\[$creation_date\] <b>[chat_user_name $creation_user]</b>: $msg<br>\n"
             }
             if { $contents ne "" } {
                 chat_transcript_new \
@@ -547,77 +534,3 @@
     }
 }
 
-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.3 -r1.3.2.1
--- openacs-4/packages/chat/www/ajax-chat-script.tcl	26 Oct 2006 11:11:20 -0000	1.3
+++ openacs-4/packages/chat/www/ajax-chat-script.tcl	3 Jul 2007 07:49:51 -0000	1.3.2.1
@@ -9,3 +9,4 @@
 }
 
 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.8 -r1.8.2.1
--- openacs-4/packages/chat/www/chat.tcl	26 Oct 2006 11:11:20 -0000	1.8
+++ openacs-4/packages/chat/www/chat.tcl	3 Jul 2007 07:49:51 -0000	1.8.2.1
@@ -37,7 +37,7 @@
 set ban_p [permission::permission_p -object_id $room_id -privilege "chat_ban"]
 set moderate_room_p [chat_room_moderate_p $room_id]
 
-if { $moderate_room_p eq "t" } {
+if { $moderate_room_p == "t" } {
     set moderator_p [permission::permission_p -object_id $room_id -privilege "chat_moderator"]
 } else {
     # This is an unmoderate room, therefore everyone is a moderator.
@@ -54,35 +54,35 @@
 set user_name [chat_user_name $user_id]
 
 # send message to the database 
-if { $message ne "" } {
+if { ![empty_string_p $message] } {
     chat_message_post $room_id $user_id $message $moderator_p
 }
 
-
 # Determine which template to use for html or ajax client
 switch $client {
     "html" {
         set template_use "html-chat"
         # forward to ajax if necessary
-        if { $message ne "" } {
+        if { ![empty_string_p $message] } {
             set session_id [ad_conn session_id]
             ::chat::Chat c1 -volatile -chat_id $room_id -session_id $session_id
             c1 add_msg $message
         }
     }
-    "ajax" {        
+    "ajax" {
         set template_use "ajax-chat-script"
     }
-    "java" {    
-        set template_use "java-chat"
+	"java" {
+		set template_use "java-chat"
 
-        # Get config paramater for applet.
-        set width [ad_parameter AppletWidth "" 500]
-        set height [ad_parameter AppletHeight "" 400]   
+		# Get config paramater for applet.
+		set width [ad_parameter AppletWidth "" 500]
+		set height [ad_parameter AppletHeight "" 400]   
     
-        set host [ad_parameter ServerHost "" [ns_config "ns/server/[ns_info server]/module/nssock" Hostname]]
-        set port [ad_parameter ServerPort "" 8200]
-     }
+		set host [ad_parameter ServerHost "" [ns_config "ns/server/[ns_info server]/module/nssock" Hostname]]
+		set port [ad_parameter ServerPort "" 8200]
+	}
 }
+
 ad_return_template $template_use
 
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/html-chat-script-form.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/html-chat-script-form.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/html-chat-script-msg.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/html-chat-script-msg.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/html-chat-script.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/html-chat-script.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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.7 -r1.7.2.1
--- openacs-4/packages/chat/www/html-chat.adp	26 Oct 2006 11:11:20 -0000	1.7
+++ openacs-4/packages/chat/www/html-chat.adp	3 Jul 2007 07:49:51 -0000	1.7.2.1
@@ -35,5 +35,6 @@
 <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/html-chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/chat/www/html-chat.tcl	24 Jun 2006 14:23:42 -0000	1.2
+++ openacs-4/packages/chat/www/html-chat.tcl	3 Jul 2007 07:49:51 -0000	1.2.2.1
@@ -17,7 +17,7 @@
 set richclient(msg) "[_ chat.${richclient(short)}_client_msg]"
 set richclient(title) "[_ chat.[string totitle $richclient(short)]]"
 
-if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") || ($active eq "f") } {
+if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") || ($active == "f") } {
     #Display unauthorize privilege page.
     ad_returnredirect unauthorized
     ad_script_abort
Index: openacs-4/packages/chat/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/chat/www/index.adp	6 Dec 2006 12:33:57 -0000	1.7
+++ openacs-4/packages/chat/www/index.adp	3 Jul 2007 07:49:51 -0000	1.7.2.1
@@ -17,7 +17,7 @@
 
 <if @rooms:rowcount@ eq 0>
 <p><i>#chat.There_are_no_rooms_available#</i></p>
-<if @room_create_p@ eq 1><p><a class="button" href="room-new">#chat.Create_a_new_room#</a></p></if>
+<if @room_create_p@ eq 1><p><a class="button" href="room-edit">#chat.Create_a_new_room#</a></p></if>
 </if>
 <else>
 <listtemplate name="rooms"></listtemplate>
Index: openacs-4/packages/chat/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/chat/www/index.tcl	9 May 2007 11:52:43 -0000	1.4.2.1
+++ openacs-4/packages/chat/www/index.tcl	3 Jul 2007 07:49:51 -0000	1.4.2.2
@@ -26,7 +26,7 @@
 }
 
 if { $room_create_p } {
-    lappend actions "#chat.Create_a_new_room#" room-new "#chat.Create_a_new_room#"
+    lappend actions "#chat.Create_a_new_room#" room-edit "#chat.Create_a_new_room#"
 }
 
 db_multirow -extend { active_users last_activity } rooms rooms_list {} {
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.5 -r1.5.2.1
--- openacs-4/packages/chat/www/java-chat.adp	26 Oct 2006 11:11:20 -0000	1.5
+++ openacs-4/packages/chat/www/java-chat.adp	3 Jul 2007 07:49:51 -0000	1.5.2.1
@@ -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/message-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/www/message-delete-2.tcl	8 Aug 2006 21:26:19 -0000	1.5
+++ openacs-4/packages/chat/www/message-delete-2.tcl	3 Jul 2007 07:49:51 -0000	1.5.2.1
@@ -17,4 +17,4 @@
 
 ::chat::Chat flush_messages -chat_id $room_id
 
-ad_returnredirect .
+ad_returnredirect .
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/options.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/options.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/room-edit-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/room-edit.postgresql'.
Fisheye: No comparison available.  Pass `N' to diff?
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.6 -r1.6.2.1
--- openacs-4/packages/chat/www/room-edit.tcl	26 Oct 2006 11:11:20 -0000	1.6
+++ openacs-4/packages/chat/www/room-edit.tcl	3 Jul 2007 07:49:51 -0000	1.6.2.1
@@ -16,129 +16,82 @@
     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} 
+    {room_id:key}    
+    {moderated_p:boolean(hidden)
+        {value "f"}
+    }    
     {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}}}
-    }
-    {moderated:boolean(radio)
-        {label "Moderated" }
-        {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
-            
+        {value "t"}
     }    
-#    {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 \
+    {auto_flush_p:boolean(radio)
+        {label "#chat.AutoFlush#" }
+        {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 \
                               -active_p $active_p \
                               -archive_p $archive_p \
-                              -user_id [ad_conn user_id] \
-                              -room_id $room_id \
-                              $description $pretty_name]} errmsg]} {
+                              -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]} {
         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.5 -r1.5.2.1
--- openacs-4/packages/chat/www/room-enter.tcl	26 Oct 2006 11:11:20 -0000	1.5
+++ openacs-4/packages/chat/www/room-enter.tcl	3 Jul 2007 07:49:51 -0000	1.5.2.1
@@ -19,7 +19,7 @@
 ns_log notice "--query ban $ban_p: permission::permission_p -object_id $room_id -privilege chat_ban -party_id [ad_conn user_id]"
 set active  [room_active_status $room_id]
 
-if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") || ($active eq "f") } {
+if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") || ($active == "f") } {
     #Display unauthorize privilege page.
     ad_returnredirect unauthorized
     ad_script_abort
@@ -30,13 +30,12 @@
 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"
Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/room-entry.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/room-new-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/room-new.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/chat/www/room.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/chat/www/room.adp	26 Oct 2006 11:11:20 -0000	1.7
+++ openacs-4/packages/chat/www/room.adp	3 Jul 2007 07:49:51 -0000	1.7.2.1
@@ -28,9 +28,15 @@
         <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.5 -r1.5.2.1
--- openacs-4/packages/chat/www/room.tcl	26 Oct 2006 11:11:20 -0000	1.5
+++ openacs-4/packages/chat/www/room.tcl	3 Jul 2007 07:49:51 -0000	1.5.2.1
@@ -51,7 +51,7 @@
 # Get room basic information.
 ###
 db_1row room_info {
-    select pretty_name, description, moderated_p, active_p, archive_p
+    select pretty_name, description, moderated_p, active_p, archive_p, auto_flush_p, auto_transcript_p
     from chat_rooms
     where room_id = :room_id
 }
Index: openacs-4/packages/chat/www/search-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/chat/www/search-2.tcl	24 Jun 2006 14:23:42 -0000	1.2
+++ openacs-4/packages/chat/www/search-2.tcl	3 Jul 2007 07:49:51 -0000	1.2.2.1
@@ -27,27 +27,27 @@
 
 set context [list [list "./" "Users"] "Search"]
 
-if {[info exists keyword]} {
+if [info exists keyword] {
     # this is an administrator 
-    if { $keyword eq "" } {
+    if { [empty_string_p $keyword] } {
         incr exception_count
         append exception_text "<li>You forgot to type a search string!\n"
     }
 } else {
     # from one of the user pages
-    if { (![info exists email] || $email eq "") && \
-            (![info exists last_name] || $last_name eq "") } {
+    if { (![info exists email] || [empty_string_p $email]) && \
+            (![info exists last_name] || [empty_string_p $last_name]) } {
         incr exception_count
         append exception_text "<li>You must specify either an email address or last name to search for.\n"
     }
 
     if { [info exists email] && [info exists last_name] && \
-            $email ne "" && $last_name ne "" } {
+            ![empty_string_p $email] && ![empty_string_p $last_name] } {
         incr exception_count
         append exception_text "<li>You can only specify either email or last name, not both.\n"
     }
 
-    if { ![info exists target] || $target eq "" } {
+    if { ![info exists target] || [empty_string_p $target] } {
         incr exception_count
         append exception_text "<li>Target was not specified. This shouldn't have happened,
 please contact the <a href=\"mailto:[ad_host_administrator]\">administrator</a>
@@ -68,7 +68,7 @@
     set search_type "keyword"
     set sql_keyword "%[string tolower $keyword]%"
     lappend where_clause "(username like :sql_keyword or email like :sql_keyword or lower(first_names || ' ' || last_name) like :sql_keyword)"
-} elseif { [info exists email] && $email ne "" } {
+} elseif { [info exists email] && ![empty_string_p $email] } {
     set search_type "email"    
     set sql_email "%[string tolower $email]%"
     lappend where_clause "email like :sql_email"
@@ -124,7 +124,7 @@
     set user_search:[set rowcount](member_state) $member_state
 
     
-    if { $member_state ne "approved" } {
+    if { $member_state != "approved" } {
         set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_url_vars email last_name keyword target passthrough limit_users_in_group_id only_authorized_p]"] " | "]
     } else {
         set user_search:[set rowcount](user_finite_state_links) ""
Index: openacs-4/packages/chat/www/transcript-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-edit-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/www/transcript-edit-2.tcl	8 Aug 2006 21:26:20 -0000	1.5
+++ openacs-4/packages/chat/www/transcript-edit-2.tcl	3 Jul 2007 07:49:51 -0000	1.5.2.1
@@ -19,4 +19,4 @@
     ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
 }
 
-ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
+ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
\ No newline at end of file
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-grant-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-grant-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-grant.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-revoke-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-revoke-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-revoke.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/user-revoke.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?