Index: openacs-4/packages/rules/www/add-action.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-action.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/rules/www/add-action.adp	17 Dec 2004 16:59:20 -0000	1.7
+++ openacs-4/packages/rules/www/add-action.adp	20 Dec 2004 19:38:43 -0000	1.8
@@ -1,15 +1,6 @@
 <master>
-<if @admin@ eq 0>
-    <if @rule_admin@ eq 0>
-	<property name= "title">Permission Denied</property>
-	<br>
-	<center>You don't have permission to admin Rule. </center>
-	<br>
-    </if>
-<else>
-</if>
 <property name="title">Registration Rules</property>
 <formtemplate id="add_action"></formtemplate>
-</else>
 
 
+
Index: openacs-4/packages/rules/www/add-action.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-action.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/rules/www/add-action.tcl	17 Dec 2004 16:29:42 -0000	1.5
+++ openacs-4/packages/rules/www/add-action.tcl	20 Dec 2004 19:38:43 -0000	1.6
@@ -13,25 +13,19 @@
 
 # Just while I get the assessment package ready
 set context [list [list "one-rule?rule_id=$rule_id" "Rule Properties"] "Add Action"]
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
-
+permission::require_permission -object_id $rule_id -privilege "admin"
 if { [exists_and_not_null selected_a]} {
       set default_action $selected_a
 }
 
 
 set actions { {"Add Automatically" 1} {"Add to waiting list" 2} }
 set results [list]
+if { [apm_package_installed_p dotlrn] == 1 } {
 db_foreach communities { *SQL* } {
     lappend results [list $pretty_name $community_id]
 } 
+}
     lappend  results [list "to website" -1]
 
 
Index: openacs-4/packages/rules/www/add-rule.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-rule.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/add-rule.adp	16 Dec 2004 18:44:41 -0000	1.3
+++ openacs-4/packages/rules/www/add-rule.adp	20 Dec 2004 19:38:43 -0000	1.4
@@ -1,14 +1,5 @@
 <master>
 <property name="context">@context@</property>
-<if @admin@ eq 0>
-    <if @rule_admin@ eq 0>
-	<property name= "title">Permission Denied</property>
-	<br>
-	<center>You don't have permission to admin Rule. </center>
-	<br>
-    </if>
-</if>
-    <else>
-	<property name= "title">Edit Rule</property>
-	<formtemplate id="add_rule"></formtemplate>
-    </else>
+<property name= "title">Edit Rule</property>
+<formtemplate id="add_rule"></formtemplate>
+
Index: openacs-4/packages/rules/www/add-rule.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-rule.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/rules/www/add-rule.tcl	17 Dec 2004 16:59:20 -0000	1.7
+++ openacs-4/packages/rules/www/add-rule.tcl	20 Dec 2004 19:38:43 -0000	1.8
@@ -14,13 +14,7 @@
 # Just while I get the assessment package ready
 ad_maybe_redirect_for_registration
 set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
 set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
 
 
 set assessments [rules::rule::get_assessments]
Index: openacs-4/packages/rules/www/add-trigger.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-trigger.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/rules/www/add-trigger.adp	16 Dec 2004 18:44:41 -0000	1.4
+++ openacs-4/packages/rules/www/add-trigger.adp	20 Dec 2004 19:38:43 -0000	1.5
@@ -8,16 +8,7 @@
       
 }
 </script>
-<if @admin@ eq 0>
-    <if @rule_admin@ eq 0>
-	<property name= "title">Permission Denied</property>
-	<br>
-	<center>You don't have permission to admin Rule. </center>
-	<br>
-    </if>
-</if>
-<else>
 <property name="title">Registration Rules</property>
 <formtemplate id="add_trigger"></formtemplate>
-</else>
 
+
Index: openacs-4/packages/rules/www/add-trigger.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/add-trigger.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/rules/www/add-trigger.tcl	16 Dec 2004 18:44:41 -0000	1.6
+++ openacs-4/packages/rules/www/add-trigger.tcl	20 Dec 2004 19:38:43 -0000	1.7
@@ -11,16 +11,7 @@
 ad_maybe_redirect_for_registration
 set qs_sel 0
 set context [list [list "one-rule?rule_id=$rule_id" "Rule Properties"] "Add Trigger"]
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
-
-
+permission::require_permission -object_id $rule_id -privilege "admin"
 # Just while  get the assessment package ready
 
 set questions [list]
Index: openacs-4/packages/rules/www/admin-request.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/admin-request.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/admin-request.adp	16 Dec 2004 18:47:07 -0000	1.1
+++ openacs-4/packages/rules/www/admin-request.adp	20 Dec 2004 19:38:43 -0000	1.2
@@ -5,23 +5,23 @@
 
 function get_interval() {
         interval=document.interval.date.value; 
-        destination = "admin-request?community=@default_community@&state=@default_state@&rule=@default_rule@&interval="+interval;
+        destination = "admin-request?return_url=@return_url@&community=@default_community@&state=@default_state@&rule=@default_rule@&interval="+interval;
         if (destination) location.href = destination;
       
 }
 </script>
 <script language="JavaScript">
 function get_specific_date() {
         date=document.specific_date.specific_date.value; 
-        destination ="admin-request?community=@default_community@&state=@default_state@&rule=@default_rule@&interval=@default_interval@&specific_date="+date;
+        destination ="admin-request?return_url=@return_url@&community=@default_community@&state=@default_state@&rule=@default_rule@&interval=@default_interval@&specific_date="+date;
              if (destination) location.href = destination;
       
 }
 </script>
 <script language="JavaScript">
 function get_community() {
         community=document.communities.community_id.value;
-        destination = "admin-request?state=@default_state@&interval=@default_interval@&rule=@default_rule@&specific_date=@default_specific_date@&community="+community;
+        destination = "admin-request?return_url=@return_url@&state=@default_state@&interval=@default_interval@&rule=@default_rule@&specific_date=@default_specific_date@&community="+community;
         if (destination) location.href = destination;
       
 }
@@ -30,7 +30,7 @@
 <script language="JavaScript">
 function get_state() {
         state=document.communities.approved_p.value; 
-        destination = "admin-request?community=@default_community@&interval=@default_interval@&specific_date=@default_specific_date@&rule=@default_rule@&state="+state;
+        destination = "admin-request?return_url=@return_url@&community=@default_community@&interval=@default_interval@&specific_date=@default_specific_date@&rule=@default_rule@&state="+state;
          if (destination) location.href = destination;
       
 }
Index: openacs-4/packages/rules/www/admin-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/admin-request.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/admin-request.tcl	16 Dec 2004 18:47:07 -0000	1.1
+++ openacs-4/packages/rules/www/admin-request.tcl	20 Dec 2004 19:38:43 -0000	1.2
@@ -9,28 +9,15 @@
     state:optional
     community:optional
     rule:notnull
+    return_url
+} -properties {
+    context
 }
 
-set rule_name [ db_string name {select rule_name from rules where rule_id=:rule } -default "" ]
-set context [list [list "one-rule?rule_id=$rule" "Rule Properties"] "$rule_name"]
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule] } {
-set rule_admin [permission::permission_p -object_id $rule -party_id $user_id -privilege "admin"]
-}
+permission::require_permission -object_id $rule -privilege "admin"
 
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin this Rule. "
-    ad_script_abort
-
-
-}
-
-
+set rule_name [ db_string name {select rule_name from rules where rule_id=:rule } -default "" ]
+set context [list [list "$return_url?rule_id=$rule" "Rule Properties"] "$rule_name"]
 set communities_list [list]
 lappend communities_list [list "All" "all"]
 lappend communities_list [list "System" "-1"]
@@ -142,8 +129,11 @@
     -value $default_specific_date\
     -html {id sel2}\
     -after_html {<input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');">[<b>YYYY-MM-DD</b>]}
-
-element create specific_date date submit\
+element create specific_date return_url\
+     -value $return_url\
+     -widget hidden\
+     -datatype text
+element create specific_date  submit\
       -widget submit\
       -label "Specific Date"\
       -html { onClick "get_specific_date()"}
Index: openacs-4/packages/rules/www/approve-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/approve-users.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/rules/www/approve-users.tcl	16 Dec 2004 18:47:07 -0000	1.1
+++ openacs-4/packages/rules/www/approve-users.tcl	20 Dec 2004 19:38:43 -0000	1.2
@@ -10,24 +10,9 @@
 
     
 }
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
+permission::require_permission -object_id $rule -privilege "admin"
 set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
- if { [exists_and_not_null rule] } {
-set rule_admin [permission::permission_p -object_id $rule -party_id $user_id -privilege "admin"]
-}
 
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin this Rule. "
-    ad_script_abort
-
-
-}
-
-
     set rules_count [llength $rha_id]
     for { set i 0} { $i < $rules_count } { incr i } {
         set r_id [lindex $rha_id $i]
Index: openacs-4/packages/rules/www/change-actions-result.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/change-actions-result.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/change-actions-result.tcl	16 Dec 2004 18:44:41 -0000	1.3
+++ openacs-4/packages/rules/www/change-actions-result.tcl	20 Dec 2004 19:38:43 -0000	1.4
@@ -11,23 +11,8 @@
   
 } 
 
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
+permission::require_permission -object_id $rule_id -privilege "admin"
 
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin Rule. "
-    ad_script_abort
-
-
-}
-
 db_transaction {
 
     db_dml update_action_result { *SQL* }
Index: openacs-4/packages/rules/www/change-active.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/change-active.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/rules/www/change-active.tcl	10 Dec 2004 17:34:27 -0000	1.2
+++ openacs-4/packages/rules/www/change-active.tcl	20 Dec 2004 19:38:43 -0000	1.3
@@ -8,23 +8,7 @@
     res:notnull
     rule_id:integer,notnull
 }
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
-
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin Rule. "
-    ad_script_abort
-
-
-}
-
+permission::require_permission -object_id $rule_id -privilege "admin"
    set active_p "y"
 
    if { $res == "y"} {
Index: openacs-4/packages/rules/www/delete-action.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/delete-action.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/rules/www/delete-action.tcl	10 Dec 2004 17:34:27 -0000	1.2
+++ openacs-4/packages/rules/www/delete-action.tcl	20 Dec 2004 19:38:43 -0000	1.3
@@ -8,22 +8,7 @@
     rule_action_id:integer,notnull,multiple
     rule_id:integer,notnull
 }
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
-
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin this Rule. "
-    ad_script_abort
-
-
-}
+permission::require_permission -object_id $rule_id -privilege "admin"
  
     set rules_count [llength $rule_action_id]
     for { set i 0} { $i < $rules_count } { incr i } {
Index: openacs-4/packages/rules/www/delete-rule.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/delete-rule.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/rules/www/delete-rule.tcl	10 Dec 2004 17:34:27 -0000	1.2
+++ openacs-4/packages/rules/www/delete-rule.tcl	20 Dec 2004 19:38:43 -0000	1.3
@@ -11,26 +11,13 @@
 
 set rules $rule_id
 set rules_count [llength $rule_id]
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
 
 
 set rules_table "<table class=list><tr class=list-header><th class=list>Rule Name</th><th class=list>Assessment Related</th></tr>"
 
 for { set i 0} { $i < $rules_count } { incr i } {
+    permission::require_permission -object_id $rule_id -privilege "admin"
 
-set rule_admin [permission::permission_p -object_id [lindex $rule_id $i] -party_id $user_id -privilege "admin"]
-
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin this Rule. "
-    ad_script_abort
-
-
-}
-
     set rule_name [rules::rule::get_rule_name -rule_id [lindex $rule_id $i]]
     set asm_name [rules::rule::get_asm_name -rule_id  [lindex $rule_id $i]]
     append rules_table "<tr class=list-odd><td class=list-narrow>$rule_name</td><td class=list-narrow>$asm_name</td></tr>"
Index: openacs-4/packages/rules/www/delete-trigger.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/delete-trigger.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/rules/www/delete-trigger.tcl	10 Dec 2004 17:34:27 -0000	1.2
+++ openacs-4/packages/rules/www/delete-trigger.tcl	20 Dec 2004 19:38:43 -0000	1.3
@@ -3,30 +3,16 @@
 } {
     rule_def_id:integer,notnull,multiple
     rule_id:integer,notnull
+    return_url
 }
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
-
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin this Rule. "
-    ad_script_abort
-
-
-}
+permission::require_permission -object_id $rule_id -privilege "admin"
  
     set rules_count [llength $rule_def_id]
     for { set i 0} { $i < $rules_count } { incr i } {
 	rules::rule::delete_trigger -rule_def_id [lindex $rule_def_id $i]
      }
 
-    ad_returnredirect "one-rule?rule_id=$rule_id"
+    ad_returnredirect "$return_url?rule_id=$rule_id"
 
 
 
Index: openacs-4/packages/rules/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/rules/www/index.tcl	10 Dec 2004 17:34:27 -0000	1.5
+++ openacs-4/packages/rules/www/index.tcl	20 Dec 2004 19:38:43 -0000	1.6
@@ -7,13 +7,6 @@
 
 }
 
-
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-
 template::list::create -name rules\
 -multirow all_rules\
 -key rule_id\
@@ -54,7 +47,7 @@
         rule_id {
 	label "Notifications"
 	display_template {
-	    <a href=request-notification?object_id=@all_rules.rule_id@&type_id=[notification::type::get_type_id -short_name rule_notif]>Notify user</a>
+	    <a href=request-notification?return_url=index&object_id=@all_rules.rule_id@&type_id=[notification::type::get_type_id -short_name rule_notif]>Notify user</a>
 	  
 	}
     }
Index: openacs-4/packages/rules/www/one-rule.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/one-rule.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/rules/www/one-rule.adp	10 Dec 2004 17:34:27 -0000	1.5
+++ openacs-4/packages/rules/www/one-rule.adp	20 Dec 2004 19:38:43 -0000	1.6
@@ -50,8 +50,8 @@
  </td>
  <td>
   <a
-  href="request-notification?object_id=@rule_id@&type_id=@type_id@&return_url=one-rule?rule_id=@rule_id@" title="Notify" class="button">Add Notification for this Rule</a>
-  <a href="admin-request?rule=@rule_id@" title="Waiting List"
+  href="request-notification?object_id=@rule_id@&type_id=@type_id@&return_url=one-rule" title="Notify" class="button">Add Notification for this Rule</a>
+  <a href="admin-request?return_url=one-rule&rule=@rule_id@" title="Waiting List"
   class="button">Waiting List</a>
 
  </td>
Index: openacs-4/packages/rules/www/one-rule.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/one-rule.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/rules/www/one-rule.tcl	17 Dec 2004 16:29:42 -0000	1.8
+++ openacs-4/packages/rules/www/one-rule.tcl	20 Dec 2004 19:38:43 -0000	1.9
@@ -10,23 +10,9 @@
    qs:optional
    trigger:optional
 }
-set package_id [ad_conn package_id]
-set user_id [ad_conn user_id]
-set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null rule_id] } {
-set rule_admin [permission::permission_p -object_id $rule_id -party_id $user_id -privilege "admin"]
-}
 
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin this Rule. "
-    ad_script_abort
-
-
-}
-
+permission::require_permission -object_id $rule_id -privilege "admin"
+set dotlrn_installed_p [apm_package_installed_p dotlrn]
 set context [list "Rule Properties"]
 set qs_id_2 0
 if { ![exists_and_not_null qs]} {
@@ -55,7 +41,7 @@
 -elements {
     rule_def_id {
 	display_template {
-        <a href=delete-trigger?rule_def_id=@rule_triggers.rule_def_id@&rule_id=$rule_id><img border=0 src=images/Delete16.gif></a>
+        <a href=delete-trigger?rule_def_id=@rule_triggers.rule_def_id@&rule_id=$rule_id&return_url=one-rule><img border=0 src=images/Delete16.gif></a>
 	}
     }
     qs_id {
@@ -139,7 +125,9 @@
 	display_template {
             <select name=res@rule_actions.rule_action_id@ onChange=group@rule_actions.rule_action_id@()> 
             <%
+            if {$dotlrn_installed_p == 1} {
 	    db_multirow communities communities {select community_id,pretty_name from dotlrn_communities_all}
+	    }
             %>     <if @rule_actions.group_id@ eq -1>
                    <option value=@rule_actions.group_id@>to website
 	           <multiple name="communities">
Index: openacs-4/packages/rules/www/request-notification.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/request-notification.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/rules/www/request-notification.tcl	17 Dec 2004 16:59:20 -0000	1.3
+++ openacs-4/packages/rules/www/request-notification.tcl	20 Dec 2004 19:38:43 -0000	1.4
@@ -12,26 +12,16 @@
     object_id:integer,notnull
     {pretty_name ""}
     users_list:optional
+    {return_url}
     
    
 }
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 set context [list "Add rule"]
-set rule_admin ""
-set admin [permission::permission_p -object_id $package_id -party_id $user_id -privilege "admin"]
-if { [exists_and_not_null object_id] } {
-set rule_admin [permission::permission_p -object_id $object_id -party_id $user_id -privilege "admin"]
-}
 
-if  { $rule_admin == 0 && $admin == 0 } {
-    doc_return 200 text/html  "<h3>Permission Denied</h3>
-                               You don't have permission to admin Rule. "
-    ad_script_abort
+permission::require_permission -object_id $object_id -privilege "admin"
 
-
-}
-
 # Check that the object can be subcribed to
 notification::security::require_notify_object -object_id $object_id
 
@@ -41,7 +31,7 @@
     set page_title "[_ notifications.lt_Request_Notification_]"
 }
 
-set context [list [list "one-rule?rule_id=$object_id" "Rule Properties"] "[_ notifications.Request_Notification]"]
+set context [list [list "$return_url?rule_id=$object_id" "Rule Properties"] "[_ notifications.Request_Notification]"]
 
 set intervals [notification::get_intervals -type_id $type_id]
 set delivery_methods [notification::get_delivery_methods -type_id $type_id]
@@ -93,7 +83,7 @@
             -delivery_method_id $delivery_method_id
 
 
-    ad_returnredirect "request-notification?type_id=$type_id&object_id=$object_id"
+    ad_returnredirect "request-notification?type_id=$type_id&object_id=$object_id&return_url=$return_url"
 }
 
 template::list::create -name notify_users\
@@ -106,6 +96,7 @@
     -bulk_action_method post -bulk_action_export_vars {
    object_id
    type_id
+   return_url
     }\
 -no_data "There are no users to notify"\
 -row_pretty_plural "notify_users"\
Index: openacs-4/packages/rules/www/unsubscribe.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rules/www/Attic/unsubscribe.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/rules/www/unsubscribe.tcl	16 Dec 2004 18:44:41 -0000	1.2
+++ openacs-4/packages/rules/www/unsubscribe.tcl	20 Dec 2004 19:38:43 -0000	1.3
@@ -7,6 +7,7 @@
 object_id:notnull
 request_id:multiple
 type_id     
+return_url
 } 
 
     set request_count [llength $request_id]
@@ -17,4 +18,4 @@
 	}
      }
 
-    ad_returnredirect "request-notification?object_id=$object_id&type_id=$type_id&return_url=one-rule?rule_id=$object_id"
+    ad_returnredirect "request-notification?object_id=$object_id&type_id=$type_id&return_url=$return_url"