Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl 21 May 2002 15:05:09 -0000 1.38
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl 21 May 2002 17:30:02 -0000 1.39
@@ -77,7 +77,7 @@
dotlrn_community::init \
-community_type [community_type] \
-community_type_url_part [get_url_part] \
- -pretty_name [dotlrn::parameter -package_id [dotlrn::get_package_id] classes_pretty_plural]
+ -pretty_name [parameter::get -package_id [dotlrn::get_package_id] -parameter classes_pretty_plural]
}
ad_proc -public check_class_key_valid_p {
Index: openacs-4/packages/dotlrn/tcl/club-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/club-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/tcl/club-procs.tcl 21 May 2002 15:05:09 -0000 1.15
+++ openacs-4/packages/dotlrn/tcl/club-procs.tcl 21 May 2002 17:30:02 -0000 1.16
@@ -61,7 +61,7 @@
dotlrn_community::init \
-community_type [community_type] \
-community_type_url_part [get_url_part] \
- -pretty_name [dotlrn::parameter -package_id [dotlrn::get_package_id] clubs_pretty_plural]
+ -pretty_name [parameter::get -package_id [dotlrn::get_package_id] -parameter clubs_pretty_plural]
}
ad_proc -public new {
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.129 -r1.130
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 May 2002 15:35:18 -0000 1.129
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 May 2002 17:30:02 -0000 1.130
@@ -57,9 +57,9 @@
dotlrn_community::set_type_package_id $community_type $package_id
- dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
- dotlrn::parameter -package_id $package_id -set 1 community_type_level_p
- dotlrn::parameter -package_id $package_id -set 0 community_level_p
+ parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0
+ parameter::set_value -package_id $package_id -parameter community_type_level_p -value 1
+ parameter::set_value -package_id $package_id -parameter community_level_p -value 0
# create a "dummy" community for this community
# type to get a portal template with all of the
@@ -114,9 +114,9 @@
]
# Set some parameters
- dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
- dotlrn::parameter -package_id $package_id -set 1 community_type_level_p
- dotlrn::parameter -package_id $package_id -set 0 community_level_p
+ parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0
+ parameter::set_value -package_id $package_id -parameter community_type_level_p -value 1
+ parameter::set_value -package_id $package_id -parameter community_level_p -value 0
# Set the site node
dotlrn_community::set_type_package_id $community_type_key $package_id
@@ -248,21 +248,21 @@
# 1. get the page_names and layouts
# 2. the the list of default applets for this type
if {[string equal $community_type "dotlrn_community"]} {
- set csv_list [dotlrn::parameter -package_id $package_id subcomm_pages_csv]
- set default_applets [dotlrn::parameter -package_id $package_id default_subcomm_applets]
+ set csv_list [parameter::get -package_id $package_id -parameter subcomm_pages_csv]
+ set default_applets [parameter::get -package_id $package_id -parameter default_subcomm_applets]
} elseif {[string equal $community_type "dotlrn_club"]} {
- set csv_list [dotlrn::parameter -package_id $package_id club_pages_csv]
- set default_applets [dotlrn::parameter -package_id $package_id default_club_applets]
+ set csv_list [parameter::get -package_id $package_id -parameter club_pages_csv]
+ set default_applets [parameter::get -package_id $package_id -parameter default_club_applets]
} elseif {[string equal $community_type "user_workspace"]} {
- set csv_list [dotlrn::parameter -package_id $package_id user_wsp_page_names]
+ set csv_list [parameter::get -package_id $package_id -parameter user_wsp_page_names]
set default_applets [list]
} else {
- set csv_list [dotlrn::parameter -package_id $package_id class_instance_pages_csv]
- set default_applets [dotlrn::parameter -package_id $package_id default_class_instance_applets]
+ set csv_list [parameter::get -package_id $package_id -parameter class_instance_pages_csv]
+ set default_applets [parameter::get -package_id $package_id -parameter default_class_instance_applets]
}
- set non_member_page_name [dotlrn::parameter -package_id $package_id non_member_page_name]
- set admin_page_name [dotlrn::parameter -package_id $package_id admin_page_name]
+ set non_member_page_name [parameter::get -package_id $package_id -parameter non_member_page_name]
+ set admin_page_name [parameter::get -package_id $package_id -parameter admin_page_name]
if {[empty_string_p $dummy_comm_p]} {
set user_id [ad_conn user_id]
@@ -314,9 +314,9 @@
]
# Set the right parameters
- dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
- dotlrn::parameter -package_id $package_id -set 0 community_type_level_p
- dotlrn::parameter -package_id $package_id -set 1 community_level_p
+ parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0
+ parameter::set_value -package_id $package_id -parameter community_type_level_p -value 0
+ parameter::set_value -package_id $package_id -parameter community_level_p -value 1
# Set up the node
dotlrn_community::set_package_id $community_id $package_id
@@ -1570,9 +1570,9 @@
]
# Set the right parameters
- dotlrn::parameter -package_id $package_id -set 0 dotlrn_level_p
- dotlrn::parameter -package_id $package_id -set 0 community_type_level_p
- dotlrn::parameter -package_id $package_id -set 1 community_level_p
+ parameter::set_value -package_id $package_id -parameter dotlrn_level_p -value 0
+ parameter::set_value -package_id $package_id -parameter community_type_level_p -value 0
+ parameter::set_value -package_id $package_id -parameter community_level_p -value 1
# Set up the node
dotlrn_community::set_package_id $clone_id $package_id
@@ -1777,7 +1777,7 @@
if {![empty_string_p $reorder_hack_p]} {
ns_log notice "aks1: applets_dispatch: reorder hack!"
- set reorder_applets_string [dotlrn::parameter -default "dotlrn_news,dotlrn_bboard,dotlrn_survey,dotlrn_faq" user_wsp_applet_ordering]
+ set reorder_applets_string [parameter::get -parameter user_wsp_applet_ordering -default "dotlrn_news,dotlrn_bboard,dotlrn_faq"]
set reorder_applets_list [string trim [split $reorder_applets_string {,}]]
@@ -1788,21 +1788,16 @@
foreach applet $reorder_applets_list {
set index [lsearch -exact $list_of_applets $applet]
- if {$index != -1 } {
- ns_log notice "aks2: reorder HIT with '$applet' against '$list_of_applets' // $index"
+ if {$index != -1} {
set list_of_applets [lreplace $list_of_applets $index $index]
lappend result_list $applet
- } else {
- ns_log notice "aks3: reorder MISS with '$applet' against '$list_of_applets'"
}
}
set list_of_applets [concat $result_list $list_of_applets]
}
-
foreach applet $list_of_applets {
- # Callback on applet
applet_call $applet $op $list_args
}
}
Index: openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl 18 May 2002 22:42:11 -0000 1.23
+++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl 21 May 2002 17:30:02 -0000 1.24
@@ -35,7 +35,7 @@
ad_proc -public get_pretty_name {
} {
- return [dotlrn::parameter dotlrn_main_portlet_pretty_name]
+ return [parameter::get -parameter dotlrn_main_portlet_pretty_name]
}
ad_proc -public link {
@@ -51,7 +51,7 @@
# we use "portal::add_element" here since there is no
# configuration necessary for this portlet (no params)
return [portal::add_element \
- -force_region [dotlrn::parameter dotlrn_main_portlet_region] \
+ -force_region [parameter::get -parameter dotlrn_main_portlet_region] \
-pretty_name [get_pretty_name] \
-portal_id $portal_id \
-portlet_name [get_my_name] \
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 18 May 2002 22:42:11 -0000 1.54
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 21 May 2002 17:30:02 -0000 1.55
@@ -368,18 +368,12 @@
}
ad_proc -public parameter {
- -set
- {-package_id ""}
+ {-name:required}
{-default ""}
- name
} {
- wrap ad_parameter
+ wrap
} {
- if {[info exists set]} {
- return [parameter::set_value -package_id $package_id -parameter $name -value $set]
- } else {
- return [parameter::get -package_id $package_id -parameter $name -default $default]
- }
+ return [parameter::get -package_id [get_package_id] -parameter $name -default $default]
}
}
Index: openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl 18 May 2002 22:42:11 -0000 1.4
+++ openacs-4/packages/dotlrn/tcl/dotlrn-user-extension-procs.tcl 21 May 2002 17:30:02 -0000 1.5
@@ -37,7 +37,7 @@
ad_proc -public automatic_email_patterns {} {
Returns a list of email patterns for which a user is automatically made into a dotLRN user
} {
- set param [dotlrn::parameter -package_id [dotlrn::get_package_id] auto_dotlrn_user_email_patterns]
+ set param [parameter::get -package_id [dotlrn::get_package_id] -parameter auto_dotlrn_user_email_patterns]
return [split $param ","]
}
Index: openacs-4/packages/dotlrn/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/navigation-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 18 May 2002 22:42:11 -0000 1.8
+++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 21 May 2002 17:30:02 -0000 1.9
@@ -78,9 +78,9 @@
lappend first_args [list [root_url] dotLRN]
if {[string equal ${community_type} "dotlrn_class_instance"] != 0} {
- lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn::parameter classes_pretty_plural]]
+ lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [parameter::get -parameter classes_pretty_plural]]
} elseif {[string equal ${community_type} "dotlrn_club"] != 0} {
- lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn::parameter clubs_pretty_plural]]
+ lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [parameter::get -parameter clubs_pretty_plural]]
} elseif {[string equal ${community_type} "dotlrn_community"] != 0} {
} else {
lappend first_args [list [dotlrn_community::get_community_type_url $community_type] [dotlrn_community::get_community_type_name $community_type]]
Index: openacs-4/packages/dotlrn/www/community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/community-type.tcl 18 May 2002 22:42:11 -0000 1.7
+++ openacs-4/packages/dotlrn/www/community-type.tcl 21 May 2002 17:30:02 -0000 1.8
@@ -24,7 +24,7 @@
}
# Check that this is a community type
-if {[dotlrn::parameter community_type_level_p] != 1} {
+if {[parameter::get -parameter community_type_level_p] != 1} {
ad_returnredirect "./"
ad_script_abort
}
Index: openacs-4/packages/dotlrn/www/community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/community.tcl 18 May 2002 22:42:11 -0000 1.8
+++ openacs-4/packages/dotlrn/www/community.tcl 21 May 2002 17:30:02 -0000 1.9
@@ -23,7 +23,7 @@
}
# Check that this is a community type
-if {[dotlrn::parameter community_level_p] != 1} {
+if {[parameter::get -parameter community_level_p] != 1} {
ns_returnredirect "./"
return
}
Index: openacs-4/packages/dotlrn/www/configure-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/configure-2.tcl 18 May 2002 22:42:11 -0000 1.8
+++ openacs-4/packages/dotlrn/www/configure-2.tcl 21 May 2002 17:30:02 -0000 1.9
@@ -29,7 +29,7 @@
set anchor [ns_set get $form anchor]
# Check if this is a community type level thing
-if {[dotlrn::parameter community_type_level_p] == 1} {
+if {[parameter::get -parameter community_type_level_p] == 1} {
ad_returnredirect "one-community-type"
return
}
Index: openacs-4/packages/dotlrn/www/configure-element-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/configure-element-2.tcl 18 May 2002 22:42:11 -0000 1.6
+++ openacs-4/packages/dotlrn/www/configure-element-2.tcl 21 May 2002 17:30:02 -0000 1.7
@@ -27,7 +27,7 @@
}
# Check if this is a community type level thing
-if {[dotlrn::parameter community_type_level_p] == 1} {
+if {[parameter::get -parameter community_type_level_p] == 1} {
ad_returnredirect "one-community-type"
return
}
Index: openacs-4/packages/dotlrn/www/configure-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure-element.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/configure-element.tcl 18 May 2002 22:42:11 -0000 1.9
+++ openacs-4/packages/dotlrn/www/configure-element.tcl 21 May 2002 17:30:02 -0000 1.10
@@ -26,15 +26,15 @@
}
# Check if this is a community type level thing
-if {[dotlrn::parameter community_type_level_p] == 1} {
+if {[parameter::get -parameter community_type_level_p] == 1} {
ad_returnredirect "one-community-type"
return
}
# Make sure user is logged in
set user_id [ad_maybe_redirect_for_registration]
-if {[dotlrn::parameter community_level_p] == 1} {
+if {[parameter::get -parameter community_level_p] == 1} {
# This is a community
# What community type are we at?
set community_id [dotlrn_community::get_community_id]
Index: openacs-4/packages/dotlrn/www/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/configure.tcl 18 May 2002 22:42:11 -0000 1.10
+++ openacs-4/packages/dotlrn/www/configure.tcl 21 May 2002 17:30:02 -0000 1.11
@@ -26,15 +26,15 @@
}
# Check if this is a community type level thing
-if {[dotlrn::parameter community_type_level_p] == 1} {
+if {[parameter::get -parameter community_type_level_p] == 1} {
ad_returnredirect "one-community-type"
return
}
# Make sure user is logged in
set user_id [ad_maybe_redirect_for_registration]
-if {[dotlrn::parameter community_level_p] == 1} {
+if {[parameter::get -parameter community_level_p] == 1} {
# This is a community
# What community type are we at?
set community_id [dotlrn_community::get_community_id]
Index: openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/dotlrn-default-master.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl 18 May 2002 22:42:11 -0000 1.7
+++ openacs-4/packages/dotlrn/www/dotlrn-default-master.tcl 21 May 2002 17:30:02 -0000 1.8
@@ -135,7 +135,7 @@
set navbar "
"
set portal_id ""
}
-} elseif {[dotlrn::parameter -package_id [ad_conn package_id] community_type_level_p] == 1} {
+} elseif {[parameter::get -parameter community_type_level_p] == 1} {
set extra_td_html ""
set link_all 1
set link [dotlrn::get_url]
@@ -214,7 +214,7 @@
}
# in a community or just under one in a mounted package like /calendar
-if {[dotlrn::parameter community_level_p] == 1 || $parent_comm_p } {
+if {[parameter::get -parameter community_level_p] == 1 || $parent_comm_p } {
set community_id [dotlrn_community::get_community_id]
# color hack
@@ -236,7 +236,7 @@
# The header text is the name of the community
set text [dotlrn_community::get_community_header_name $community_id]
-} elseif {[dotlrn::parameter community_type_level_p] == 1} {
+} elseif {[parameter::get -parameter community_type_level_p] == 1} {
# in a community type
set text \
[dotlrn_community::get_community_type_name [dotlrn_community::get_community_type]]
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 18 May 2002 22:42:11 -0000 1.25
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 21 May 2002 17:30:02 -0000 1.26
@@ -51,10 +51,10 @@
<% set old_level [expr $new_level - 1] %>
- Current <%= [dotlrn::parameter clubs_pretty_plural] %> + Current <%= [parameter::get -parameter clubs_pretty_plural] %> | - Join a <%= [dotlrn::parameter class_instances_pretty_name] %> + Join a <%= [parameter::get -parameter class_instances_pretty_name] %> | - Join a <%= [dotlrn::parameter clubs_pretty_name] %> + Join a <%= [parameter::get -parameter clubs_pretty_name] %>
@@ -41,12 +41,12 @@
- <%= [dotlrn::parameter departments_pretty_name] %>: |
Term:
No <%= [dotlrn::parameter clubs_pretty_plural] %> +No <%= [parameter::get -parameter clubs_pretty_plural] %> <%= [dotlrn::parameter class_instances_pretty_plural] %>+<%= [parameter::get -parameter class_instances_pretty_plural] %>
|
---|