Index: openacs-4/packages/chat-portlet/chat-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/chat-portlet.info,v
diff -u -N -r1.3.2.6 -r1.3.2.7
--- openacs-4/packages/chat-portlet/chat-portlet.info	22 Apr 2007 18:49:14 -0000	1.3.2.6
+++ openacs-4/packages/chat-portlet/chat-portlet.info	3 Jul 2007 07:24:57 -0000	1.3.2.7
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="2.3.0" url="http://openacs.org/repository/download/apm/chat-portlet-2.3.0.apm">
+    <version name="2.2.1" url="http://openacs.org/repository/download/apm/chat-portlet-2.2.1.apm">
         <owner url="http://opeancs.org">OpenACS</owner>
-        <release-date>2007-04-22</release-date>
+        <release-date>2006-12-31</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="chat-portlet" version="2.3.0"/>
-        <requires url="dotlrn" version="2.3.0"/>
-        <requires url="new-portal" version="2.3.0"/>
+        <provides url="chat-portlet" version="2.2.1"/>
+        <requires url="dotlrn" version="2.2.1"/>
+        <requires url="new-portal" version="2.2.1"/>
         <requires url="chat" version="5.0d6"/>
 
     </version>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.ca_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.ca_ES.ISO-8859-1.xml,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.ca_ES.ISO-8859-1.xml	23 Apr 2007 05:54:57 -0000	1.3.2.1
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.ca_ES.ISO-8859-1.xml	3 Jul 2007 07:24:57 -0000	1.3.2.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="2.3.0" locale="ca_ES" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="2.2.0" locale="ca_ES" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">Afegeix una sala de xat</msg>
   <msg key="admin_pretty_name">Administraci� de xat</msg>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.de_DE.ISO-8859-1.xml	23 Apr 2007 05:54:57 -0000	1.3.2.1
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.de_DE.ISO-8859-1.xml	3 Jul 2007 07:24:57 -0000	1.3.2.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="2.3.0" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="2.2.0" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">Add a chat room</msg>
   <msg key="admin_pretty_name">Chat administration</msg>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml	23 Apr 2007 05:54:57 -0000	1.3.2.1
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml	3 Jul 2007 07:24:57 -0000	1.3.2.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="2.3.0" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="2.2.0" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">Add a chat room</msg>
   <msg key="admin_pretty_name">Chat administration</msg>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml	23 Apr 2007 05:54:57 -0000	1.3.2.2
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml	3 Jul 2007 07:24:57 -0000	1.3.2.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="2.3.0" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="2.2.0" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">A�adir una sala</msg>
   <msg key="admin_pretty_name">Administraci�n de chat</msg>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.pt_BR.ISO-8859-1.xml,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.pt_BR.ISO-8859-1.xml	23 Apr 2007 05:54:57 -0000	1.3.2.1
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.pt_BR.ISO-8859-1.xml	3 Jul 2007 07:24:57 -0000	1.3.2.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="2.3.0" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="2.2.0" locale="pt_BR" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">Adicionar uma sala de chat</msg>
   <msg key="admin_pretty_name">Administra��o do chat</msg>
Index: openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp	16 Dec 2006 19:39:21 -0000	1.4
+++ openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp	3 Jul 2007 07:24:57 -0000	1.4.2.1
@@ -18,5 +18,5 @@
 
 <ul>
   <li><a href="@url@" title="#chat-portlet.Rooms_admin#">#chat-portlet.Rooms_admin#</a></li>
-  <li><a href="@url@room-new" title="#chat-portlet.Add_a_Chat_Item#">#chat-portlet.Add_a_Chat_Item#</a></li>
+  <li><a href="@url@room-edit" title="#chat-portlet.Add_a_Chat_Item#">#chat-portlet.Add_a_Chat_Item#</a></li>
 </ul>
Index: openacs-4/packages/chat-portlet/www/chat-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/chat-portlet/www/chat-portlet.adp	28 Mar 2007 10:18:54 -0000	1.5.2.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.adp	3 Jul 2007 07:24:57 -0000	1.5.2.2
@@ -20,7 +20,7 @@
 <property name="title">#chat.Chat_main_page#</property>
 
 <if @community_id@ gt 0 and @room_create_p@ ne 0>
-[<a href="@chat_url@room-new" title="#chat.Create_a_new_room#">#chat.Create_a_new_room#</a>]
+[<a href="@chat_url@room-edit" title="#chat.Create_a_new_room#">#chat.Create_a_new_room#</a>]
 </if>
 
 <if @rooms:rowcount@ eq 0 or @num_rooms@ eq 0>
@@ -31,21 +31,21 @@
     <multiple name=rooms>
     <if @rooms.can_see_p@ eq 1>
       <tr>
-        <td valign=top><a href="@rooms.room_url@">@rooms.pretty_name@</a></td>
+        <td valign=top><a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=@default_mode@">@rooms.pretty_name@</a></td>
         <td valign=top>
-            [&nbsp;<a href="@rooms.html_room_url@">#chat-portlet.html_mode#</a>&nbsp;]
+            [&nbsp;<a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=html">#chat-portlet.html_mode#</a>&nbsp;]
         </td>
         <td valign=top>
         <if @rooms.admin_p@ eq "t">
-          [<a href="@rooms.admin_url@">#chat.room_admin#</a>]
+          [<a href="@rooms.base_url@room?room_id=@rooms.room_id@">#chat.room_admin#</a>] 
         </if>
         <if @rooms.active_p@ ne "t">
           (NO #chat.Active#)
         </if>
         <td valign=top>
             <I>@rooms.description@</I>
         </td>
-      </tr>
+      </tr>            
     </if>
     </multiple>
   </table>
Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v
diff -u -N -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl	28 Mar 2007 10:18:54 -0000	1.2.2.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl	3 Jul 2007 07:24:57 -0000	1.2.2.2
@@ -45,15 +45,12 @@
 } else {
 	set query_name "rooms_list"
 }
-db_multirow -extend { can_see_p room_url html_room_url admin_url} rooms $query_name {} {
+db_multirow -extend { can_see_p } rooms $query_name {} {
 	set can_see_p 0
 	if {($active_p eq "t" && $user_p eq "t") || ($admin_p eq "t")} {
 		set can_see_p 1
 		set num_rooms [expr $num_rooms + 1]
 	}   
-    set room_url [export_vars -base ${base_url}/room-enter {{client $default_mode} room_id}]
-    set html_room_url [export_vars -base ${base_url}/room-enter {{client html} room_id}]
-    set admin_url [export_vars -base ${base_url}/room {room_id}]
 }
 
 ad_return_template