Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/www/element-layout-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/new-portal/www/element-layout.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/new-portal/www/portal-config-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/Attic/portal-config-2.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/portal-config-2.tcl	24 Oct 2001 15:30:35 -0000	1.1
@@ -0,0 +1,99 @@
+# www/element-layout-2.tcl
+ad_page_contract {
+    Do the actual moving/removing of the elements, or redirect to add.
+
+    @author Arjun Sanyal
+    @creation-date 9/28/2001
+    @cvs_id $Id: portal-config-2.tcl,v 1.1 2001/10/24 15:30:35 oracle Exp $
+} {
+    portal_id:naturalnum,notnull,permission(write)
+    {element_ids:naturalnum,multiple,optional ""}
+}
+
+# What did the user want to do?  It's necessary to access the query
+# string directly here, because we don't know for sure what the
+# parameter is called, and you need to know that sort of thing for
+# ad_page_contract to work.
+if { ! [regexp {[\?&](add|move|remove)_(i?\d+)} [ad_conn query] match mode region ]} {
+    ad_return_complaint 1 "No mode.  (region $region, mode $mode, match $match, query [ad_conn query])"
+} else { ns_log Notice "AKS: mode is $mode" }
+
+set layout_id [portal::get_layout_id $portal_id]
+portal::get_regions $layout_id
+
+if { [portal::region_immutable_p $region] } {
+    ad_return_complaint 1 "You don't have permission to manipulate this region."
+    return
+}
+set skip_region_sql " m.region not like 'i%' and "
+
+
+if { $mode == "add" } {
+    ad_returnredirect "element-add?[export_url_vars portal_id region]"
+}
+
+
+# AFAIK, this can't be done nicely with bind variables.  there's no
+# need to check $element_ids for nasty things, since the
+# ad_page_contract filter should only let in positive numbers...
+#
+# The larger apparent security problem, that of a user providing valid
+# element_ids to add elements to which he doesn't have access to his
+# portal, isn't an issue since permission on the elements must be
+# checked every time they're loaded anyway.
+#
+# - AKS: we are not going the route above.
+set element_id_list [join $element_ids ","]
+
+if { $mode == "remove" && ! [empty_string_p $element_id_list] } {
+    if { [ad_parameter local_remove_p] } {
+	db_dml remove_elements_region "delete from portal_element_map m
+          where m.portal_id = :portal_id and
+          m.region = :region and
+          $skip_region_sql
+          m.element_id in ($element_id_list)"
+    } else {
+	db_dml remove_elements_all "delete from portal_element_map m
+          where m.portal_id = :portal_id and
+          $skip_region_sql
+          m.element_id in ($element_id_list)"
+    }
+}
+
+if { $mode == "move" && ! [empty_string_p $element_id_list] } {
+    set where "m.portal_id = :portal_id and
+      m.region != :region and
+      $skip_region_sql
+      m.element_id in ($element_id_list)"
+
+    db_transaction {
+	# this could be done with a much simpler query (an update, even), but that
+	# wouldn't preserve the ordering.  This is slightly slower, but keeps
+	# the sort-keys in order.
+	#
+	# in case you're wondering, the second subselect causes rownums to
+	# be assigned _after_ the order by is applied.
+
+	# XXX - AKS - I'm baffled here
+	db_exec_plsql move_elements_insert "
+	begin
+	insert into portal_element_map (sort_key, region, portal_id, element_id)
+	    select
+	        nvl((select max(sort_key) 
+	             from portal_element_map 
+	             where region = :region)
+	        , 1) + rownum, 
+	        :region, 
+	        :portal_id, 
+	        element_id
+	     from (select element_id 
+	           from portal_element_map m 
+	           where $where 
+	           order by region,sort_key)
+	end;"	
+	db_dml move_elements_delete "delete from portal_element_map m where $where"
+    }
+}
+
+ns_returnredirect "element-layout.tcl?[export_url_vars portal_id template_id name]"
+return
Index: openacs-4/packages/new-portal/www/portal-config.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/Attic/portal-config.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/www/portal-config.adp	24 Oct 2001 15:26:46 -0000	1.1
@@ -0,0 +1,67 @@
+<master src="@master_template@">
+<property name="title">Edit Portal: @portal.name@</property>
+
+Change Name:
+<P>
+<input type="text" name="name" value="@portal.name@">
+
+<center>
+<form action="update_name">
+<%= [export_form_vars portal_id ] %>
+<input type=submit value="Update Name">
+</form>
+</center>
+
+
+<form method=get action="element-layout-2">
+<%= [export_form_vars portal_id ] %>
+<include src="@portal.template@" element_list="@element_list@" element_src="@element_src@">
+</form>
+
+<center>
+<form method=get action="revert">
+<%= [export_form_vars portal_id ] %>
+<input type=submit value="Revert To The Default">
+</form>
+</center>
+
+<form action="update_layout">
+<if @layout_count@ gt 1>
+<p>
+Change Layout:
+<br>
+
+<table border=0>
+<tr>
+
+<multiple name="layouts">
+<td>
+  <table border=0>
+  <tr>
+  <td>
+   <input type=radio name=layout_id value="@layouts.layout_id@" <if @layout_id@ eq @layouts.layout_id@>checked</if>>
+    <b>@layouts.name@</b><br>
+    <table border=0 align=center>
+      <tr><td>
+        <include src="@layouts.resource_dir@/example" resource_dir="@layouts.resource_dir@">
+      </td></tr>
+    </table>
+    <font size=-1>
+    @layouts.description@
+    </font>
+  </td>
+  </tr>
+  </table>
+</td>
+</multiple>
+
+</tr>
+</table>
+</p>
+</if>
+
+<center>
+<input type=submit value="Update Layout">
+</center>
+</form>
+