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.3
--- 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	21 Jun 2007 11:06:29 -0000	1.3
@@ -97,6 +97,7 @@
   <msg key="rooms">rooms</msg>
   <msg key="Send_Refresh">Send/Refresh</msg>
   <msg key="sending_message">Sending message...</msg>
+  <msg key="There">There are no messages to delete</msg>
   <msg key="There_are_no_rooms_available">There are no rooms available</msg>
   <msg key="to">to</msg>
   <msg key="Transcript">Transcript</msg>
Index: openacs-4/packages/chat/sql/postgresql/upgrade/upgrade-5.0d6-5.1d.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/upgrade/Attic/upgrade-5.0d6-5.1d.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/chat/sql/postgresql/upgrade/upgrade-5.0d6-5.1d.sql	21 Jun 2007 11:06:29 -0000	1.1
@@ -0,0 +1,692 @@
+-- upgrade script 
+
+alter table chat_rooms add open boolean;
+alter table chat_rooms add auto_transcript_p boolean;
+alter table chat_rooms add private boolean;
+alter table chat_rooms add file_sent boolean;
+alter table chat_rooms add frequency1 varchar;
+
+---------------------------------
+
+alter table chat_transcripts add date date;
+alter table chat_transcripts add keywords varchar;
+
+---------------------------------
+
+alter table chat_registered_users add frequency_mail varchar;
+alter table chat_registered_users add registered_date timestamp(0) without time zone;
+
+---------------------------------
+
+CREATE TABLE chat_keywords (
+  room_id INTEGER, 
+  keyword VARCHAR, 
+  CONSTRAINT chat_keywords_fk FOREIGN KEY (room_id)
+    REFERENCES chat_rooms(room_id)
+    ON DELETE cascade
+    NOT DEFERRABLE
+) WITH OIDS;
+
+
+---------------------------------
+
+CREATE TABLE chat_private_room_users (
+  room_id INTEGER, 
+  user_id1 INTEGER, 
+  user_id2 INTEGER, 
+  CONSTRAINT chat_private_room_users_fk FOREIGN KEY (room_id)
+    REFERENCES chat_rooms(room_id)
+    ON DELETE cascade
+    NOT DEFERRABLE
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_room_user_id (
+  room_id INTEGER NOT NULL references chat_rooms
+                           on delete cascade, 
+  user_id INTEGER NOT NULL, 
+  CONSTRAINT chat_room_user_id_fk FOREIGN KEY (user_id)
+    REFERENCES users(user_id)
+    ON DELETE cascade
+    NOT DEFERRABLE
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_rooms_files_sent (
+  file VARCHAR, 
+  title VARCHAR, 
+  room_id INTEGER NOT NULL, 
+  date DATE, 
+  send_file_id INTEGER references cr_revisions
+                       on delete cascade, 
+  description VARCHAR, 
+  message BOOLEAN, 
+  creation_user INTEGER, 
+  CONSTRAINT chat_rooms_files_sent_fk FOREIGN KEY (room_id)
+    REFERENCES chat_rooms(room_id)
+    ON DELETE cascade
+    NOT DEFERRABLE
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_rss (
+  room_name VARCHAR, 
+  creator VARCHAR, 
+  end_date DATE, 
+  description VARCHAR, 
+  comm_name VARCHAR, 
+  user_registered VARCHAR, 
+  rss_id INTEGER NOT NULL, 
+  date TIMESTAMP(0) WITHOUT TIME ZONE, 
+  entry_timestamp TIMESTAMP(0) WITHOUT TIME ZONE, 
+  CONSTRAINT "chat_rss_pkey" PRIMARY KEY("rss_id")
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_file_transcript (
+  transcript_id INTEGER, 
+  file_id INTEGER
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_files_rss (
+  file_id INTEGER, 
+  rss_id INTEGER
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_key_rss (
+  rss_id INTEGER, 
+  key VARCHAR
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_partitipants_rss (
+  partitipant VARCHAR, 
+  rss_id INTEGER
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_partitipants_transcript (
+  transcript_id INTEGER, 
+  partitipant VARCHAR
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_room_transcript_keywords (
+  keyword VARCHAR, 
+  transcript_id INTEGER
+) WITH OIDS;
+
+---------------------------------
+
+CREATE TABLE chat_transcription_rss (
+  rss_id INTEGER, 
+  transcription_id INTEGER
+) WITH OIDS;
+ 
+---------------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__new (varchar, varchar, varchar, varchar, integer, timestamp, boolean, boolean, boolean, boolean, boolean, integer, integer, integer, varchar, varchar, varchar, varchar) RETURNS integer AS'
+declare
+   p_pretty_name    alias for $1;
+   p_alias          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_frequency1     alias for $17;
+   p_frequency2	    alias for $18;
+   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   );
+
+     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,auto_transcript_p,file_sent,private,frequency1)
+       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,''true'',''false'',''false'',p_frequency1);
+     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,auto_transcript_p, file_sent,private,frequency1)
+         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'',''true'', ''false'',''false'',p_frequency1);
+     end if;
+
+
+   insert into chat_registered_users
+       (alias, room_id, user_id, RSS_service, mail_service, registered_id, frequency_mail)
+   values
+       (p_alias, v_room_id, p_creation_user, p_Rss_service, p_Mail_service, v_registered_id, p_frequency2);
+
+return v_room_id;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+ 
+-------------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__del (integer) RETURNS integer AS'
+declare
+   p_room_id        alias for $1;
+begin
+
+    --TO DO: delete transcriptions?
+
+    -- Erase all the users relate to this chat room.
+    delete from chat_private_room_users where room_id = p_room_id;
+    
+    -- Erase all the files sent relate to this chat room.
+    delete from chat_rooms_files_sent where room_id = p_room_id;
+
+    -- Erase all the messages relate to this chat room.
+    delete from chat_msgs where room_id = p_room_id;
+
+    -- Erase all the registered users relate to this chat room.
+    delete from chat_registered_users where room_id = p_room_id;
+    
+    -- Erase all the transcripts relate to this chat room.
+    delete from chat_transcripts where room_id = p_room_id;
+    
+    -- Erase all the keywords to this chat room.
+    delete from chat_keywords where room_id = p_room_id;
+    
+     -- Delete all privileges associate with this room
+     delete from acs_permissions where object_id = p_room_id;
+
+     -- Now delete the chat room itself.
+     delete from chat_rooms where room_id = p_room_id;
+     
+     delete from rss_gen_subscrs where summary_context_id = p_room_id;
+     
+     delete from acs_objects where context_id = p_room_id;
+
+     PERFORM acs_object__delete(p_room_id);
+
+   return 0;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+---------------------------------
+
+CREATE OR REPLACE FUNCTION chat_room_registered__user (varchar, integer, integer, boolean, boolean, integer, varchar, varchar) RETURNS integer AS'
+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;
+   p_frequency_mail alias for $8;
+   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, frequency_mail, registered_date)
+   values
+       (p_alias, p_room_id, p_user_id, p_RSS_service, p_mail_service, v_registered_id, p_frequency_mail, now());
+return v_registered_id;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+ 
+---------------------------------
+
+CREATE OR REPLACE FUNCTION 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 chat_transcript__new (varchar, varchar, varchar, integer, integer, timestamptz, integer, varchar, varchar) RETURNS integer AS'
+declare
+
+   p_pretty_name      alias for $1;
+   p_contents         alias for $2;
+   p_description      alias for $3;
+   p_room_id          alias for $4;
+   p_context_id       alias for $5;
+   p_creation_date    alias for $6;
+   p_creation_user    alias for $7;
+   p_creation_ip      alias for $8;
+   p_object_type      alias for $9;
+   v_transcript_id    chat_transcripts.transcript_id%TYPE;
+begin
+   v_transcript_id := acs_object__new (
+     null,
+     ''chat_transcript'',
+     now(),
+     p_creation_user,
+     p_creation_ip,
+     p_context_id
+   );
+
+   insert into chat_transcripts (transcript_id,   pretty_name,   contents,   description,   room_id, date)
+                        values  (v_transcript_id, p_pretty_name, p_contents, p_description, p_room_id, now());
+
+   return v_transcript_id;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+----------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__edit (varchar, varchar, varchar, varchar, integer, timestamp, boolean, boolean, boolean, boolean, boolean, integer, integer, varchar, varchar) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
+declare
+   p_pretty_name    alias for $1;
+   p_alias          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_frequency1     alias for $14;
+   p_frequency_mail alias for $15;
+begin
+
+     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,
+            frequency1 = p_frequency1
+            where
+                 room_id = p_room_id;
+         
+     update chat_registered_users
+            set alias = p_alias,
+            RSS_service = p_Rss_service,
+            mail_service = p_Mail_service,
+	    frequency_mail = p_frequency_mail
+            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 chat_room__insert_keywords (varchar, integer) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
+declare
+p_word      alias for $1;
+p_room_id           alias for $2;
+begin
+insert into chat_keywords
+               (keyword,room_id)
+       values
+             (p_word, p_room_id);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+----------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__private_new (varchar, varchar, varchar, varchar, integer, timestamp, boolean, boolean, boolean, boolean, boolean, integer, integer, integer, varchar, varchar, boolean) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
+declare
+   p_pretty_name    alias for $1;
+   p_alias          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_private        alias for $17;
+   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   );
+
+     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,auto_transcript_p,file_sent,private)
+       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,''true'',''false'',p_private);
+     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,auto_transcript_p, file_sent,private)
+         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'',''true'', ''false'',p_private);
+     end if;
+
+
+   insert into chat_registered_users
+       (alias, room_id, user_id, RSS_service, mail_service, registered_id)
+   values
+       (p_alias, v_room_id, p_creation_user, p_Rss_service, p_Mail_service, v_registered_id);
+
+return v_room_id;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__send_files (integer, varchar, varchar, varchar, date, integer, integer, varchar, integer) RETURNS integer AS'
+/* Nuevo cuerpo de Function */
+
+declare
+   p_chat_id    alias for $1;
+   p_file    alias for $2;
+   p_title          alias for $3;
+   p_description    alias for $4;
+   p_date      alias for $5;
+   p_context_id     alias for $6;
+   p_creation_user  alias for $7;
+   p_creation_ip    alias for $8;
+   p_send_file_id   alias for $9;
+
+begin
+
+   insert into chat_rooms_files_sent
+       (room_id, file, title, description, date, send_file_id, message,creation_user)
+   values
+       (p_chat_id, p_file, p_title, p_description, p_date, p_send_file_id,''false'',p_creation_user);
+
+return p_send_file_id;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+-----------------------------------------
+
+
+CREATE OR REPLACE FUNCTION chat_room__send_files_message (integer) RETURNS integer AS'
+declare
+p_chat_id       alias for $1;
+begin
+update chat_rooms_files_sent set
+            message = ''true''
+            where room_id = p_chat_id;
+return 0;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+-----------------------------------------
+
+
+CREATE OR REPLACE FUNCTION chat_rss__store_db (varchar, varchar, date, varchar,
+varchar, varchar, timestamp) RETURNS integer AS'
+declare
+p_room_name           alias for $1;
+p_room_description    alias for $2;
+p_end_date            alias for $3;
+p_r_creator           alias for $4;
+p_comm_name           alias for $5;
+p_registered_users    alias for $6;
+p_entry_timestamp     alias for $7;
+
+v_rss_id                  chat_rss.rss_id%TYPE;
+
+begin
+v_rss_id := acs_object__new(null,''chat_room'',now(),null,null,null );
+
+insert into chat_rss
+               ( room_name, creator, end_date, description, comm_name,
+user_registered, rss_id,date, entry_timestamp)
+       values
+             (p_room_name, p_r_creator,p_end_date,
+p_room_description,p_comm_name,p_registered_users,v_rss_id,now(),p_entry_timestamp);
+return v_rss_id;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+------------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_update_rss (varchar, varchar, timestamp, varchar, varchar, varchar, varchar) RETURNS integer AS'
+declare
+p_room_name     alias for $1;
+p_room_creator  alias for $2;
+p_end_date      alias for $3;
+p_room_description    alias for $4;
+p_comm_name           alias for $5;
+p_msg_creator         alias for $6;
+p_registered_users    alias for $7;
+
+begin
+
+     update chat_rss set
+            room_name = p_room_name,
+            creator = p_room_creator,
+            end_date = p_end_date,
+            description = p_room_description,
+            comm_name = p_comm_name,
+            user_registered = p_registered_users
+            where room_id = p_room_id;
+            
+    return 0;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+-------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_upload (varchar, varchar, timestamp, varchar, varchar, varchar, varchar) RETURNS integer AS'
+declare
+p_room_name     alias for $1;
+p_room_creator  alias for $2;
+p_end_date      alias for $3;
+p_room_description    alias for $4;
+p_comm_name           alias for $5;
+p_msg_creator         alias for $6;
+p_registered_users    alias for $7;
+
+begin
+
+     update chat_rss set
+            room_name = p_room_name,
+            creator = p_room_creator,
+            end_date = p_end_date,
+            description = p_room_description,
+            comm_name    = p_comm_name,
+            user_registered = p_registered_users
+            where rss_id = p_rss_id;
+
+    return 0;
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+-----------------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__edit_admin (varchar, boolean, boolean, integer, integer, varchar, integer, varchar) RETURNS integer AS'
+declare
+   
+   p_alias          alias for $1;
+   p_Rss_service    alias for $2;
+   p_Mail_service   alias for $3;
+   p_context_id     alias for $4;
+   p_creation_user  alias for $5;
+   p_creation_ip    alias for $6;
+   p_room_id        alias for $7;
+   p_frequency_mail alias for $8;
+   v_registered_id  chat_rooms.room_id%TYPE;
+   
+   begin
+   
+   v_registered_id := acs_object__new(null,''chat_room'',now(),p_creation_user,p_creation_ip,p_context_id   );
+   if exists (select ru.user_id from chat_registered_users as ru where ru.room_id = p_room_id and ru.user_id = p_creation_user) then
+
+   else
+   insert into chat_registered_users
+       (alias, room_id, user_id, RSS_service, mail_service, registered_id, frequency_mail)
+   values
+       (p_alias, p_room_id, p_creation_user, p_Rss_service, p_Mail_service, v_registered_id, p_frequency_mail);
+   end if;
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+-------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_room__store_transcripts_keywords (varchar, integer) RETURNS integer AS'
+declare
+p_keyword         alias for $1;
+p_transcript_id  alias for $2;
+begin
+insert into chat_room_transcript_keywords
+               ( transcript_id,keyword)
+       values
+             (p_transcript_id,p_keyword);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+------------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_rss__store_keywords_rss (integer, varchar) RETURNS integer AS'
+declare
+p_rss_id          alias for $1;
+p_keywords    alias for $2;
+
+begin
+insert into chat_key_rss
+               (rss_id,key)
+       values
+             (p_rss_id, p_keywords);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+---------------------------------------------
+ 
+CREATE OR REPLACE FUNCTION chat_rss__store_partitipants_rss (integer, varchar) RETURNS integer AS'
+declare
+p_rss_id          alias for $1;
+p_partitipant    alias for $2;
+begin
+insert into chat_partitipants_rss
+               ( partitipant,rss_id)
+       values
+             (p_partitipant,p_rss_id);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+----------------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_rss__store_sent_files_rss (integer, integer) RETURNS integer AS'
+declare
+p_rss_id          alias for $1;
+p_file_id   alias for $2;
+begin
+insert into chat_files_rss
+               ( rss_id,file_id)
+       values
+             (p_rss_id, p_file_id);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+---------------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_rss__store_transcripts_rss (integer, integer) RETURNS integer AS'
+declare
+p_rss_id          alias for $1;
+p_t_id   alias for $2;
+
+begin
+insert into chat_transcription_rss
+               ( rss_id,transcription_id)
+       values
+             (p_rss_id, p_t_id);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+----------------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_transcript__store_partitipants_transcript (integer, varchar) RETURNS integer AS'
+declare
+p_transcript_id          alias for $1;
+p_partitipant    alias for $2;
+begin
+insert into chat_partitipants_transcript
+               ( transcript_id,partitipant)
+       values
+             (p_transcript_id,p_partitipant);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+------------------------------------------------
+
+CREATE OR REPLACE FUNCTION chat_transcript__store_sent_files_tanscript (integer, integer) RETURNS integer AS'
+declare
+p_transcript_id          alias for $1;
+p_f_id   alias for $2;
+begin
+insert into chat_file_transcript
+               ( transcript_id,file_id)
+       values
+             (p_transcript_id, p_f_id);
+return 0;
+
+end;
+'LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+ 
+ 
+ 
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.5 -r1.6
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	7 Jun 2007 09:14:24 -0000	1.5
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	21 Jun 2007 11:06:29 -0000	1.6
@@ -4,32 +4,77 @@
     @creation-date 2006-02-02
     @author Gustaf Neumann
     @author Peter Alberer
+<<<<<<< chat-ajax-procs.tcl
     @cvs-id $Id$  
+=======
+    @cvs-id $Id$  
+>>>>>>> 1.5
 }
 
 namespace eval ::chat {
   ::xo::ChatClass Chat -superclass ::xo::Chat
-
-  Chat instproc render {} {
-    my orderby time
-    set result ""
+  
+  
+  Chat instproc login {} {        
+    my instvar array user_id now 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]}]
-      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
-  }
+    
+    db_1row room_info {
+		select maximal_participants as maximal
+		from chat_rooms as cp
+		where cp.room_id = :chat_id
+	}
+	db_1row room_info {
+		select count(cr.room_id) as count
+		from chat_room_user_id as cr
+		where cr.room_id = :chat_id
+	}	
+	if { $count < $maximal} {		
+        	db_1row room_info {
+			select count(cr.room_id) as count2
+			from chat_room_user_id as cr
+			where cr.user_id = :user_id
+			and cr.room_id = :chat_id		
+		}
+        	if { $count2 == 0 } {
+        		db_dml insert_users {insert into chat_room_user_id (room_id,user_id) values (:chat_id,:user_id);}
+        	}
+        } 
+        if { $count == $maximal} {
+              
+		db_1row room_info {
+			select count(chat_room_user_id.user_id) as count
+			from chat_room_user_id
+			where chat_room_user_id.user_id = :user_id
+			and chat_room_user_id.room_id = :chat_id
+		}	
+		if { $count == 0 } {
+			if { [permission::permission_p -party_id $user_id -object_id [dotlrn::get_package_id] -privilege admin] } {
+				
+			} else {
+				
+				ns_return 200 text/html "<HTML><BODY>\
+				<div id='messages'>[_ chat.You_dont_have_permission_room]</div>\
+				</BODY></HTML>"
+  				ad_script_abort
+  			}
+  		}
+  	}
+    
+    if {![nsv_exists $array-last-activity $user_id]} {        
+        my add_msg -get_new false [_ xotcl-core.has_entered_the_room]
+        
+	
 
-  Chat proc login {-chat_id -package_id} {
+    }    
+    my encoder noencode      
+    my get_all 
+  }
+  
+  
+   
+  
+  Chat proc login {-chat_id -package_id -folder_id} {
     auth::require_login
     if {![info exists package_id]} {set package_id [ad_conn package_id] }
     if {![info exists chat_id]}    {set chat_id $package_id }
@@ -45,11 +90,26 @@
     set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file
     set path      [site_node::get_url_from_object_id -object_id $package_id]
     set login_url ${path}ajax/chat?m=login&$context
+<<<<<<< chat-ajax-procs.tcl
     set send_url  ${path}ajax/chat?m=add_msg&$context&msg=    
+    
+=======
+    set send_url  ${path}ajax/chat?m=add_msg&$context&msg=    
     #$send_file
+>>>>>>> 1.5
    
+<<<<<<< chat-ajax-procs.tcl
     set user_id [ad_conn user_id]
     set return_url [ad_return_url]
+        
+    set users_url ${path}ajax/chat?m=get_users&$context  
+    
+    set files_url ${path}ajax/chat?m=get_files&$context      
+    
+    
+=======
+    set user_id [ad_conn user_id]
+    set return_url [ad_return_url]
     db_1row room_info {
         select room.comm_name
         from chat_rooms as room
@@ -88,6 +148,7 @@
     set files_url ${path}ajax/chat?m=get_files&$context      
     
     
+>>>>>>> 1.5
     return "\
       <script type='text/javascript' language='javascript'>
       $js
@@ -127,11 +188,16 @@
 "
   }  
   
+<<<<<<< chat-ajax-procs.tcl
+  Chat instproc render {} {
+=======
   Chat instproc render2 {-chat_id} {
+>>>>>>> 1.5
     my orderby time
     set result ""
     set msg_true "f"
       
+    my instvar chat_id
     
     
     
@@ -176,24 +242,38 @@
       }
             
       set user_id   [$child user_id]
+<<<<<<< chat-ajax-procs.tcl
       set color     [$child color]           
      set timelong  [clock format [$child time]]
       set timeshort [clock format [$child time] -format {[%H:%M:%S]}]
       set timeshort2 [clock format [$child time] -format {[%D]}]
     
+    
+=======
+      set color     [$child color]           
+     set timelong  [clock format [$child time]]
+      set timeshort [clock format [$child time] -format {[%H:%M:%S]}]
+      set timeshort2 [clock format [$child time] -format {[%D]}]
+    
       
       
       
       
       
+>>>>>>> 1.5
       db_1row room_info {
         select count(1) as info
         from chat_registered_users
         where room_id = :chat_id
         and user_id = :user_id
+<<<<<<< chat-ajax-procs.tcl
       }
+   
+=======
+      }
         
     
+>>>>>>> 1.5
     
     if { $info > 0 } {
     	set timeshort [clock format [$child time] -format {[%H:%M:%S]}]
@@ -287,7 +367,101 @@
 	}
     }
     }
+<<<<<<< chat-ajax-procs.tcl
      
+         
+    
+    db_1row room_info1 {
+        select count(files.message) as message
+        from chat_rooms_files_sent as files
+        where files.room_id = :chat_id
+        and files.message = false
+      }
+    
+    if { $message > 0 } {
+      db_1row room_info1 {
+      select files.title as title,files.file as fil
+        from chat_rooms_files_sent as files
+        where files.room_id = :chat_id
+        and files.message = false
+      }      
+           
+      db_1row room_info {
+        select room.comm_name
+        from chat_rooms as room
+        where room.room_id = :chat_id        
+      }  		
+    	set folder_id "$comm_name's Public Files" 
+    	   
+    	db_1row room_info {
+        select count(acs.object_id) as count
+        from acs_objects as acs
+        where acs.title = :folder_id        
+      	}  
+      	if { $count > 0 } {
+      		db_1row room_info {
+        		select acs.object_id as id
+        		from acs_objects as acs
+        		where acs.title = :folder_id        
+      		}
+      		set url [ad_conn url]  
+      		set folder_id $id
+      		set inicio 0
+      		set final [expr [string length $url]-16]
+      		set comm_name [string range $url $inicio $final]  
+      		if { [string length $comm_name] > 0 } {      			 
+      			set url "$comm_name/file-storage/index?folder_id=$folder_id"
+      		}
+      	} else {
+      		
+      		acs_user::get -user_id $user_id -array user      		
+      		set name [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]      		
+      		set folder_id "$name's Shared Files" 
+      		
+      		
+      		
+      		db_1row room_info {
+        		select fs.folder_id as id
+        		from fs_folders as fs
+        		where fs.name = :folder_id        
+      		}  
+      		set folder_id $id
+      		set url "/dotlrn/file-storage/index?folder_id=$folder_id"  
+      	}
+   	   	
+      
+      
+      set user_file -1
+      
+      
+      set userlink  [my user_link -user_id "-1" -color ""]
+      set msg_file  [my user_link4 -url "I has uploaded the '$title' file ($fil) to the " -color ""]    
+      append result2 "<span class='message'>"
+      
+      append msg_file [my user_link5 -url "$url" -msg "public files of the community" -color ""]      
+         
+      append result2 $msg_file
+      append result2 " "
+      append result2 "</span>\n"
+      set delete_message [send_file_message $chat_id]
+      set uid -1
+      set m [my add_msg -get_new true -uid $user_id "$result2"]
+      
+      set userlink  [my user_link -user_id $user_file -color ""]        
+      append result "<p class='line'><span class='timestamp'>$timeshort</span><span class='user'>$userlink:</span>"
+      append result "<span class='message'>"
+      set msg_file  [my user_link4 -url "The file '$title' has been sent to the " -color ""]
+      append msg_file [my user_link5 -url "$url" -msg "public files of the community." -color ""]      
+     append result $msg_file
+      append result " "
+      append result "</span></p>\n"
+      
+     
+    }
+    
+    
+=======
+     
           #test send files
     
     db_1row room_info1 {
@@ -384,9 +558,301 @@
     }
     
     
+>>>>>>> 1.5
     return $result
   }
   
   
+  Chat instproc get_files {} {
+    my instvar chat_id
+    set output ""
+    set count 0    
+       	ns_log Notice "en el get files...     $output"
+   
+   
+    db_foreach file "select distinct fil.file as file
+        from chat_rooms_files_sent as fil
+        where fil.room_id = :chat_id " {
+          
+   
+    set url [ad_conn url]
+    
+    set inicio 0
+    set final [expr [string length $url]-16]
+    set comm_name [string range $url $inicio $final]
+    
+    if { [string length $comm_name] > 0 } {    	
+    	append output "<tr><td class='files'><a href='$comm_name/file-storage/view/public\/$file' target='_blank'>$file</a></td></tr>"
+    } else {   
+    	set user_id [ad_conn user_id]
+    	acs_user::get -user_id $user_id -array user      		
+      		set name [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]      		
+      		set folder_id "$name's Shared Files"
+      		
+      		db_1row room_info {
+        		select fs.folder_id as id
+        		from fs_folders as fs
+        		where fs.name = :folder_id
+      		}  
+      		set folder_id $id
+      		append url_file "dotlrn_fs_" $user_id
+      		append url_file "_root_folder"
+      		append url_file2 "dotlrn_fs_" $user_id
+      		append url_file2 "_shared_folder"
+      		
+      		append output "<tr><td class='files'><a href='/dotlrn/file-storage/view/$url_file/$url_file2/\/$file' target='_blank'>$file</a></td></tr>"     	
+        
+    }    
+    } if_no_rows {
+       append output "<tr><td class='files'>[_ chat.no_files]</td></tr>"
+    }	 
+        
+    return $output
+  }
   
+  
+  
+  
+  Chat instproc sweeper {} {
+    my instvar array now chat_id
+    my log "-- starting"
+       
+   
+    foreach {user timestamp} [nsv_array get $array-last-activity] {
+      ns_log Notice "YY at user $user with $timestamp"
+      set ago [expr {($now - $timestamp) / 1000}]
+      
+          
+      if {$ago > 1000} { 
+		my add_msg -get_new false -uid $user "auto logout"		
+     		db_dml insert_users {delete from chat_room_user_id where room_id = :chat_id and user_id = :user;}
+		nsv_unset $array-last-activity $user
+		nsv_unset $array-color $user 
+		nsv_unset $array-login $user
+					
+      }
+          
+    }    
+    my log "-- ending"
+  }
+  
+  
+  Chat instproc get_users {} {
+    my instvar chat_id
+    set output ""
+    set count 0
+    
+	
+    
+    foreach {user_id timestamp} [my active_user_list] {
+    
+    	
+      set count [expr $count+1]
+      if {$user_id > 0} {
+      	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 pp [my sweeper]
+		
+	
+		
+	set color [my user_color $user_id]
+	set diff [clock format [expr {[clock seconds] - $timestamp}] -format "%H:%M:%S" -gmt 1]
+	
+	set package_id [ad_conn package_id]
+	db_1row url { 
+     		   select site_node__url(node_id) as url
+        		from site_nodes
+        		where object_id=:package_id
+    	}
+	
+	set userlink  [my user_link2 -user_id $user_id -alias $alias]
+	set user_id2 [ad_conn user_id]
+      		set url2 "private-room?room_id=$chat_id&user_id1=$user_id&user_id2=$user_id2"     		      		      		 
+    		append link $url $url2
+    		set address [my encode $link]
+      		set narrow [dt_right_arrow]      		
+      		ns_log Notice "URL---------------$link---------$userlink"      		
+		append output "<tr><td><a target='_blank' title='[_ chat-portlet.private_room]' href='$address'><img src='$narrow' /></a></td><td class='user'>$userlink</td> <td class='timestamp'>$diff</td></tr>"
+	
+	}
+	if { $info eq 0 } {
+		set link ""
+		set package_id [ad_conn package_id]
+		db_1row url { 
+     		   select site_node__url(node_id) as url
+        		from site_nodes
+        		where object_id=:package_id
+    		}
+		set diff [clock format [expr {[clock seconds] - $timestamp}] -format "%H:%M:%S" -gmt 1]
+		set userlink  [my user_link -user_id $user_id]
+		set user_id2 [ad_conn user_id]
+      		set url2 "private-room?room_id=$chat_id&user_id1=$user_id&user_id2=$user_id2"     		      		      		 
+    		append link $url $url2
+    		set address [my encode $link]
+      		set narrow [dt_right_arrow]      		
+      		ns_log Notice "URL---------------$link---------$userlink"      		
+		append output "<tr><td><a target='_blank' title='[_ chat-portlet.private_room]' href='$address'><img src='$narrow' /></a></td><td class='user'>$userlink</td> <td class='timestamp'>$diff</td></tr>"
+	}
+      }
+    }  
+     
+    return $output
+  }
+
+
+
+Chat instproc logout {} {  
+    my instvar array user_id chat_id    
+    my add_msg -get_new false [_ chat.has_left_the_room].
+    
+    db_dml insert_users {delete from chat_room_user_id where room_id = :chat_id and user_id = :user_id;}
+
+    catch {        
+        nsv_unset $array-last-activity $user_id
+        nsv_unset $array-login $user_id
+        nsv_unset $array-color $user_id
+    }
+  }  
+  
+  
+  
+   Chat instproc user_link { -user_id -color } {  
+  my instvar chat_id
+   if {$user_id > 0} {
+        set name [my user_name $user_id]
+      set url "/shared/community-member?user%5fid=$user_id"
+      if {![info exists color]} {
+	set color [my user_color $user_id]
+      }
+      set user_id2 [ad_conn user_id]
+      set user_info "#chat.user_info#"
+      set creator "<a style='color:$color;' title='[_ chat.user_info]' target='_blank' href='$url'>$name</a>"
+    } elseif { $user_id == 0 } {
+      set creator "Nobody"
+    } else {
+      set creator "System"
+    }  
+    return [my encode $creator]  
+  }
+  
+ 
+  
+  Chat instproc user_link2 { -user_id -color -alias} {    
+  my instvar chat_id
+   if {$user_id > 0} {
+        set name $alias
+      set url "/shared/community-member?user%5fid=$user_id"
+      set user_id2 [ad_conn user_id]
+      if {![info exists color]} {
+	set color [my user_color $user_id]
+      }
+      set user_info "#chat.user_info#"
+      set creator "<a style='color:$color;' title='[_ chat.user_info]' target='_blank' href='$url'>$alias</a>"
+      ns_log Notice "El creator vale---------------$creator"
+    } elseif { $user_id == 0 } {
+      set creator "Nobody"
+    } else {
+      set creator "System"
+    }  
+    set tt [my encode $creator]
+    ns_log Notice "El creator a string vale          $tt"
+    return [my encode $creator]  
+  }
+  
+  Chat instproc user_link3 { -url -color} {    
+      set creator "<a style='color:$color;' title='[_ chat.user_info]' target='_blank' href='$url'>$url</a>"
+   
+    return [my encode $creator]  
+  }
+  
+  Chat instproc user_link4 { -url -color} {    
+      set creator "<a style='color:$color;' title='[_ chat.user_info]' target='_blank' href='http://$url/'>$url</a>"
+   
+    return [my encode $creator]  
+  }
+  
+  Chat instproc user_link5 { -url -msg -color} {    
+      set creator "<a style='color:$color;' title='[_ chat.user_info]' target='_blank' href='/../$url'>$msg</a>"
+   
+    return [my encode $creator]  
+  }    
+  
+  
+  Chat instproc add_msg {{-get_new:boolean true} -uid msg} {  
+    my instvar array now user_id chat_id    
+  
+     if { $get_new eq "true" } {
+    	
+	db_1row room_info {
+		select count(cr.room_id) as count
+		from chat_room_user_id as cr
+		where cr.room_id = :chat_id
+		and cr.user_id = :user_id
+	}
+	if { $count == 1 || [permission::permission_p -party_id $user_id -object_id [dotlrn::get_package_id] -privilege admin]} {    	       
+    		set user_id [expr {[info exists uid] ? $uid : [my set user_id]}]
+    		set color   [my user_color $user_id]        		
+    		set msg $msg    		
+    
+    		if {$get_new && [info command ::thread::mutex] ne ""} { 
+      				
+      		my broadcast_msg [Message new -volatile -time [clock seconds] \
+			    -user_id $user_id -msg $msg -color $color]
+	
+    	}
+
+    	set msg_id $now.$user_id
+    	if { ![nsv_exists $array-login $user_id] } {
+      			nsv_set $array-login $user_id [clock seconds]
+      	}
+    	
+    	nsv_set $array $msg_id [list $now [clock seconds] $user_id $msg $color]    
+    	nsv_set $array-seen newest $now
+    	nsv_set $array-seen last [clock seconds]
+    	nsv_set $array-last-activity $user_id $now
+    	if {$get_new} {my get_new}
+    	}
+    
+    
+    } else {
+    	
+    	set user_id [expr {[info exists uid] ? $uid : [my set user_id]}]
+    	set color   [my user_color $user_id]    
+    	
+    	set msg $msg
+    	
+    
+    	if {$get_new && [info command ::thread::mutex] ne ""} { 
+    	  
+    	  my broadcast_msg [Message new -volatile -time [clock seconds] \
+			    -user_id $user_id -msg $msg -color $color]
+	
+    	}
+
+   	 set msg_id $now.$user_id
+   	 if { ![nsv_exists $array-login $user_id] } {
+   	   nsv_set $array-login $user_id [clock seconds]
+   	 }
+   	 nsv_set $array $msg_id [list $now [clock seconds] $user_id $msg $color]    
+   	 nsv_set $array-seen newest $now
+   	 nsv_set $array-seen last [clock seconds]
+   	 nsv_set $array-last-activity $user_id $now
+   	 if {$get_new} {my get_new}
+    }
+    
+  }  
+  
+  
 }	
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.4 -r1.5
--- openacs-4/packages/chat/www/ajax-chat-script.tcl	7 Jun 2007 09:14:25 -0000	1.4
+++ openacs-4/packages/chat/www/ajax-chat-script.tcl	21 Jun 2007 11:06:29 -0000	1.5
@@ -1,11 +1,12 @@
 ad_page_contract {
   a tiny chat client
 
-  @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at)
+  @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at) and Pablo Mu�oz (pablomp@tid.es)
   @creation-date Jan 31, 2006
   @cvs-id $Id$
 } -query {
   msg:optional   
 }
 
-set chat_frame [ ::chat::Chat login -chat_id $room_id]
+set chat_frame [ ::chat::Chat login -chat_id $room_id -folder_id $folder_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.9 -r1.10
--- openacs-4/packages/chat/www/chat.tcl	7 Jun 2007 09:14:25 -0000	1.9
+++ openacs-4/packages/chat/www/chat.tcl	21 Jun 2007 11:06:29 -0000	1.10
@@ -29,21 +29,58 @@
     ad_return_complaint 1 "[_ chat.Room_not_found]"
 }
 
+    set user_id [ad_conn user_id]
+    set return_url [ad_return_url]
+    db_1row room_info {
+        select room.comm_name
+        from chat_rooms as room
+        where room.room_id = :room_id        
+      }  		
+    	set folder_id "$comm_name's Public Files" 
+    	db_1row room_info {
+        	select count(acs.object_id) as count
+        	from acs_objects as acs
+        	where acs.title = :folder_id        
+      	}  
+    	if { $count > 0 } {   
+    		db_1row room_info {
+        		select acs.object_id as id
+        		from acs_objects as acs
+        		where acs.title = :folder_id        
+      		}
+      		set folder_id $id  
+      	} else {
+      		acs_user::get -user_id $user_id -array user      		
+      		set name [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]      		
+      		set folder_id "$name's Shared Files"      		
+      		  
+      		#$folder_id
+      		db_1row room_info {
+        		select fs.folder_id as id
+        		from fs_folders as fs
+        		where fs.name = :folder_id
+      		}  
+      		set folder_id $id  
+      	}
+
+
+
 set context_bar $room_name
 auth::require_login
 set user_id [ad_conn user_id]
 set read_p [permission::permission_p -object_id $room_id -privilege "chat_read"]
 set write_p [permission::permission_p -object_id $room_id -privilege "chat_write"]
 set ban_p [permission::permission_p -object_id $room_id -privilege "chat_ban"]
-set moderate_room_p [chat_room_moderate_p $room_id]
+#set moderate_room_p [chat_room_moderate_p $room_id]
 
-if { $moderate_room_p eq "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.
-    set moderator_p "1"
-}
 
+#if { $moderate_room_p eq "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.
+#    set moderator_p "1"
+#}
+
 if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") } {
 	db_1row room_info {
 		select cr.private as private
@@ -79,7 +116,7 @@
         }
     }
     "ajax" {        
-        set template_use "ajax-chat-script"
+        set template_use "ajax-chat-script"        
     }
     "java" {    
         set template_use "java-chat"
Index: openacs-4/packages/chat/www/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/chat/www/message-delete.adp	24 Jun 2006 14:23:42 -0000	1.6
+++ openacs-4/packages/chat/www/message-delete.adp	21 Jun 2007 11:06:29 -0000	1.7
@@ -9,8 +9,13 @@
 <property name="context">@context_bar;noquote@</property>
 <property name="title">#chat.Confirm_message_delete#</property>
 
+<if @message_count@ gt 0>
 <form method="post" action="message-delete-2">
 <input type=hidden name=room_id value=@room_id@>
 #chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@?
 <p><input type=submit value=#acs-kernel.common_Yes#>
 </form>
+</if>
+<else>
+#chat.There#
+</else>
\ No newline at end of file