Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.40 -r1.41 --- openacs-4/packages/dotlrn/dotlrn.info 22 Jan 2002 23:55:10 -0000 1.40 +++ openacs-4/packages/dotlrn/dotlrn.info 23 Jan 2002 00:15:43 -0000 1.41 @@ -90,9 +90,11 @@ + + + - @@ -232,9 +234,6 @@ - - - Index: openacs-4/packages/dotlrn/tcl/applets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/applets-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/tcl/applets-procs.tcl 3 Oct 2001 01:56:56 -0000 1.1 +++ openacs-4/packages/dotlrn/tcl/applets-procs.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -15,7 +15,7 @@ } namespace eval dotlrn_applet { - + ad_proc -public register { applet_key } { Index: openacs-4/packages/dotlrn/tcl/class-applets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-applets-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/tcl/class-applets-procs.tcl 20 Sep 2001 18:29:35 -0000 1.1 +++ openacs-4/packages/dotlrn/tcl/class-applets-procs.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -8,12 +8,12 @@ # ad_library { - + Procs to manage DOTLRN Classes - + @author ben@openforce.net @creation-date 2001-08-18 - + } namespace eval dotlrn_class_applets { Index: openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 10 Jan 2002 19:30:17 -0000 1.7 +++ openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 23 Jan 2002 00:15:43 -0000 1.8 @@ -79,7 +79,7 @@ start with object_type = (select community_type from dotlrn_communities where community_id = :community_id) - connect by object_type = prior supertype + connect by object_type = prior supertype @@ -89,7 +89,7 @@ from acs_object_types where supertype = 'dotlrn_community' start with object_type = :community_type - connect by object_type = prior supertype + connect by object_type = prior supertype 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.50 -r1.51 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 22 Jan 2002 20:02:30 -0000 1.50 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 23 Jan 2002 00:15:43 -0000 1.51 @@ -447,8 +447,8 @@ applets_dispatch -community_id $community_id \ -op AddUserToCommunity \ -list_args [list $community_id $user_id] - + } ad_proc -public remove_user { @@ -657,7 +657,7 @@ be able to be run multiple times! } { - if {![empty_string_p [get_applet_id_from_key -applet_key $applet_key]]} { + if {![empty_string_p [get_applet_id_from_key -applet_key $applet_key]]} { # there's already a dotlrn applet registered with this key, abort return } @@ -704,7 +704,7 @@ set active_p "t" # Insert in the DB - db_dml insert {} + db_dml insert {} # Go through current users and make sure they are added! foreach user [list_users $community_id] { @@ -783,8 +783,8 @@ Dispatch an operation to every applet, either in one communtiy or on all the active dotlrn applets } { - - ns_log notice "aks 20 debug applets_dispatch called with comm_id = $community_id, op $op, + + ns_log notice "aks 20 debug applets_dispatch called with comm_id = $community_id, op $op, list args $list_args length is [llength $list_args]" set list_of_applets [list_active_applets -community_id $community_id] Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.22 -r1.23 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 19 Jan 2002 22:54:20 -0000 1.22 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 23 Jan 2002 00:15:43 -0000 1.23 @@ -194,10 +194,10 @@ select package_id -from dotlrn_community_applets dca, dotlrn_applets da -where community_id= :community_id -and applet_key= :applet_key -and dca.applet_id = da.applet_id +from dotlrn_community_applets dca, dotlrn_applets da +where community_id= :community_id +and applet_key= :applet_key +and dca.applet_id = da.applet_id @@ -256,16 +256,16 @@ select impl_name from acs_sc_impls, acs_sc_bindings, acs_sc_contracts where acs_sc_impls.impl_id = acs_sc_bindings.impl_id and -acs_sc_contracts.contract_id= acs_sc_bindings.contract_id and +acs_sc_contracts.contract_id= acs_sc_bindings.contract_id and acs_sc_contracts.contract_name='dotlrn_applet' -select applet_key +select applet_key from dotlrn_community_applets dca, dotlrn_applets da -where community_id= :community_id +where community_id= :community_id and dca.applet_id = da.applet_id @@ -278,9 +278,9 @@ -select applet_key -from dotlrn_community_applets dca, dotlrn_applets da -where community_id= :community_id +select applet_key +from dotlrn_community_applets dca, dotlrn_applets da +where community_id= :community_id and active_p = 't' and dca.applet_id = da.applet_id and status = 'active' Index: openacs-4/packages/dotlrn/tcl/dotlrn-filter.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-filter.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/tcl/dotlrn-filter.tcl 20 Sep 2001 18:29:35 -0000 1.1 +++ openacs-4/packages/dotlrn/tcl/dotlrn-filter.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -8,12 +8,12 @@ # ad_library { - + Procs for basic dotLRN filters - + @author ben@openforce.net @creation-date 2001-08-20 - + } ad_proc -private dotlrn_filter {conn arg why} { 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.17 -r1.18 --- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl 22 Jan 2002 03:37:49 -0000 1.17 +++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl 23 Jan 2002 00:15:43 -0000 1.18 @@ -5,10 +5,10 @@ Procedures to supports dotlrn main portlet Copyright Openforce, Inc. - Licensed under GNU GPL v2 + Licensed under GNU GPL v2 @creation-date November 4 2001 - @author ben@openforce.net + @author ben@openforce.net @version $Id$ } @@ -30,10 +30,10 @@ return "" } - ad_proc -public add_self_to_page { + ad_proc -public add_self_to_page { {-page_id ""} - portal_id - instance_id + portal_id + instance_id } { Adds a dotLRN PE to the given page with the instance key being opaque data in the portal configuration. @@ -53,8 +53,8 @@ return $element_id } - ad_proc -public show { - cf + ad_proc -public show { + cf } { Display the PE @@ -68,19 +68,19 @@ -template_src "dotlrn-main-portlet" \ -package_key "dotlrn" \ -config_list $cf - } + } - ad_proc -public edit { - cf + ad_proc -public edit { + cf } { return "" } - ad_proc -public remove_self_from_page { - portal_id - instance_id + ad_proc -public remove_self_from_page { + portal_id + instance_id } { - Removes a bboard PE from the given page + Removes a bboard PE from the given page @param portal_id The page to remove self from @param instance_id 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.32 -r1.33 --- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 20 Jan 2002 17:20:44 -0000 1.32 +++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 23 Jan 2002 00:15:43 -0000 1.33 @@ -63,7 +63,7 @@ returns 1 if dotlrn is instantiaed under the url specified, 0 otherwise - XXX - aks - I think there a bug in here somewhere - use the + XXX - aks - I think there a bug in here somewhere - use the procs in site_nodes:: instead. Thanks. } { set result 0 Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 22 Jan 2002 23:55:10 -0000 1.18 +++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl 23 Jan 2002 00:15:43 -0000 1.19 @@ -9,17 +9,17 @@ # ad_library { - + Procs to manage DOTLRN Security - + @author ben@openforce.net @creation-date 2001-10-30 @version $Id$ } namespace eval dotlrn { - + ad_proc -private do_abort {} { do an abort if security violation } { @@ -75,15 +75,15 @@ for {set i 1} {$i < [expr [llength $page_name_list]]} {incr i} { portal::page_create -portal_id $portal_id \ -pretty_name [lindex $page_name_list $i] \ - -layout_name [lindex $layout_name_list $i] + -layout_name [lindex $layout_name_list $i] } # manually switch back to the first page set page_id [portal::get_page_id -portal_id $portal_id -sort_key 0] portal::set_current_page -portal_id $portal_id \ -page_id $page_id - + # aks test adding applets on new pages # make a test page to the wsp dotlrn_main_portlet::add_self_to_page -page_id $page_id \ @@ -103,7 +103,7 @@ # Add the relation (no need to feed in anything for object_id_one, or two for that matter). set rel_id [relation_add -extra_vars $extra_vars -member_state approved $rel_type "" $user_id] } - + return $rel_id } @@ -154,7 +154,7 @@ } { acs_privacy::set_user_read_private_data -user_id $user_id -object_id [dotlrn::get_package_id] $val } - + ad_proc -public user_can_read_private_data_p { {user_id ""} } { @@ -168,7 +168,7 @@ return [acs_privacy::user_can_read_private_data_p -user_id $user_id -object_id [dotlrn::get_package_id]] } - + ad_proc -public require_user_read_private_data { {user_id ""} } { @@ -189,7 +189,7 @@ # NOT SURE HOW TO FIX THIS WITHOUT object_ids on community types return 1 } - + ad_proc -public require_user_read_community_type { {-user_id ""} community_type @@ -200,12 +200,12 @@ do_abort } } - + ad_proc -public user_can_read_community_p { {-user_id ""} community_id } { - Check if a user can read a community + Check if a user can read a community } { return [ad_permission_p -user_id $user_id $community_id dotlrn_view_community] } @@ -214,7 +214,7 @@ {-user_id ""} community_id } { - require that a user be able to read a community + require that a user be able to read a community } { if {![user_can_read_community_p -user_id $user_id $community_id]} { do_abort @@ -244,7 +244,7 @@ do_abort } } - + ad_proc -public user_can_admin_community_p { {-user_id ""} community_id @@ -253,7 +253,7 @@ } { return [ad_permission_p -user_id $user_id $community_id dotlrn_admin_community] } - + ad_proc -public require_user_admin_community { {-user_id ""} community_id 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.5 -r1.6 --- openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 15 Jan 2002 22:23:41 -0000 1.5 +++ openacs-4/packages/dotlrn/tcl/navigation-procs.tcl 23 Jan 2002 00:15:43 -0000 1.6 @@ -8,12 +8,12 @@ # ad_library { - + Procs for dotLRN navigation - + @author ben@openforce.net @creation-date 2001-11-10 - + } namespace eval dotlrn { Index: openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/site-nodes-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl 13 Dec 2001 22:12:55 -0000 1.3 +++ openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl 23 Jan 2002 00:15:43 -0000 1.4 @@ -49,40 +49,40 @@ } ad_proc -public get_site_nodes_list_key { - {-site_nodes_list:required} - {-index:required} + {-site_nodes_list:required} + {-index:required} } { return [lindex $site_nodes_list $index] } ad_proc -public get_site_nodes_list_value { - {-site_nodes_list:required} - {-index:required} + {-site_nodes_list:required} + {-index:required} } { # ns_log notice "llength [llength $site_nodes_list] [lindex $site_nodes_list [expr $index + 1 ]] " return [lindex $site_nodes_list [expr $index + 1 ]] } ad_proc -public get_site_nodes_list_value_param { - {-site_nodes_list:required} - {-index:required} + {-site_nodes_list:required} + {-index:required} {-param:required} } { - The 'site_nodes' nsv_array is chock full of information - about every package mounted on every node in the system, let's - access that information. + The 'site_nodes' nsv_array is chock full of information + about every package mounted on every node in the system, let's + access that information. Here's a sample: key = /portal/ - value = directory_p t + value = directory_p t object_type apm_package - package_key new-portal - package_id 3482 - pattern_p t - node_id 3481 - url /portal/ + package_key new-portal + package_id 3482 + pattern_p t + node_id 3481 + url /portal/ object_id 3482 @author arjun@openforce.net @@ -93,30 +93,30 @@ array set snlv [get_site_nodes_list_value \ -site_nodes_list $site_nodes_list \ -index $index] - + switch $param { - "directory_p" { + "directory_p" { return $snlv(directory_p) } - "object_type" { + "object_type" { return $snlv(object_type) } - "package_key" { + "package_key" { return $snlv(package_key) } - "package_id" { + "package_id" { return $snlv(package_id) } - "pattern_p" { + "pattern_p" { return $snlv(pattern_p) } - "node_id" { + "node_id" { return $snlv(node_id) } - "url" { + "url" { return $snlv(url) } - "object_id" { + "object_id" { return $snlv(object_id) } default { @@ -126,7 +126,7 @@ ad_return_complaint 1 \ "site_nodes::get_site_nodes_list_value_param failed! \n bad param ($param) was specified" - } + } } } @@ -135,9 +135,9 @@ {-param ""} {-package_key:required} } { - returns either 1. number of times this package_key is mounted + returns either 1. number of times this package_key is mounted 2. the url a singleton is mounted at (or the first match it finds - for a multi-mounted package) or 3. a singleon's param (see list above). + for a multi-mounted package) or 3. a singleon's param (see list above). Same deal appiles to non-singletons ret = count, url, param @@ -169,7 +169,7 @@ # ad_return_complaint 1 "aks 17 $site_nodes_list" - # iterate through the array, counting the number of times the + # iterate through the array, counting the number of times the # passed in package key is in the site_nodes array set count 0 @@ -185,7 +185,7 @@ -site_nodes_list $site_nodes_list \ -index $x \ -param "package_key"] - + if { $poss_key_match == $package_key} { if {$get_param_p} { @@ -194,12 +194,12 @@ -index $x \ -param $param] } - + incr count } } - if {$get_count_p} { + if {$get_count_p} { return $count } else { ns_log error "site_nodes::get_info get_count_p assertion failed!\n @@ -210,7 +210,7 @@ ad_proc -public mount_count { {-package_key:required} } { - returns the number of times this package_key is mounted + returns the number of times this package_key is mounted } { return [get_info -return count -package_key $package_key] } Index: openacs-4/packages/dotlrn/tcl/term-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/term-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/tcl/term-procs.tcl 17 Dec 2001 23:02:56 -0000 1.1 +++ openacs-4/packages/dotlrn/tcl/term-procs.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -69,6 +69,6 @@ db_1row get_end_date {} return [template::util::date::create $year $month $day "" "" "" $date_format] - + } } Index: openacs-4/packages/dotlrn/www/applet-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applet-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/applet-add.tcl 19 Jan 2002 22:57:41 -0000 1.3 +++ openacs-4/packages/dotlrn/www/applet-add.tcl 23 Jan 2002 00:15:43 -0000 1.4 @@ -1,6 +1,6 @@ ad_page_contract { Add an applet to a community - + @author Ben Adida (ben@openforce.net) @author yon (yon@openforce.net) @creation-date 2001-10-08 Index: openacs-4/packages/dotlrn/www/applet-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applet-remove.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/applet-remove.tcl 20 Jan 2002 19:43:46 -0000 1.4 +++ openacs-4/packages/dotlrn/www/applet-remove.tcl 23 Jan 2002 00:15:43 -0000 1.5 @@ -1,6 +1,6 @@ ad_page_contract { Add an applet to a community - + @author Ben Adida (ben@openforce.net) @creation-date 2001-10-08 } -query { Index: openacs-4/packages/dotlrn/www/applets-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets-chunk.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/applets-chunk.tcl 20 Jan 2002 19:43:46 -0000 1.2 +++ openacs-4/packages/dotlrn/www/applets-chunk.tcl 23 Jan 2002 00:15:43 -0000 1.3 @@ -1,6 +1,6 @@ ad_page_contract { Community Applets - + @author Ben Adida (ben@openforce.net) @author yon (yon@openforce.net) @creation-date 2001-10-05 Index: openacs-4/packages/dotlrn/www/applets.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/applets.tcl 21 Jan 2002 06:30:11 -0000 1.3 +++ openacs-4/packages/dotlrn/www/applets.tcl 23 Jan 2002 00:15:43 -0000 1.4 @@ -1,6 +1,6 @@ ad_page_contract { Manage the Applets for this community - + @author yon (yon@openforce.net) @creation-date 2002-01-19 @version $Id$ Index: openacs-4/packages/dotlrn/www/communities-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/communities-chunk.adp 20 Jan 2002 19:17:39 -0000 1.2 +++ openacs-4/packages/dotlrn/www/communities-chunk.adp 23 Jan 2002 00:15:43 -0000 1.3 @@ -8,7 +8,7 @@ @communities.pretty_name@ - + () Index: openacs-4/packages/dotlrn/www/community-member.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/community-member.adp 22 Jan 2002 20:50:35 -0000 1.1 +++ openacs-4/packages/dotlrn/www/community-member.adp 23 Jan 2002 00:15:43 -0000 1.2 @@ -19,13 +19,13 @@
this user is deleted
- +
this user is deleted and banned from the community.
- + Index: openacs-4/packages/dotlrn/www/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/community-member.tcl 22 Jan 2002 20:50:35 -0000 1.1 +++ openacs-4/packages/dotlrn/www/community-member.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -1,6 +1,6 @@ ad_page_contract { shows User A what User B has contributed to the community - + @author yon (yon@openforce.net) @creation-date 2002-01-22 @version $Id$ 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.3 -r1.4 --- openacs-4/packages/dotlrn/www/community-type.tcl 21 Jan 2002 06:30:11 -0000 1.3 +++ openacs-4/packages/dotlrn/www/community-type.tcl 23 Jan 2002 00:15:43 -0000 1.4 @@ -13,7 +13,7 @@ if {[ad_parameter community_type_level_p] != 1} { ad_returnredirect "./" ad_script_abort -} +} set user_id [ad_conn user_id] 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.3 -r1.4 --- openacs-4/packages/dotlrn/www/community.tcl 21 Jan 2002 06:30:11 -0000 1.3 +++ openacs-4/packages/dotlrn/www/community.tcl 23 Jan 2002 00:15:43 -0000 1.4 @@ -1,6 +1,6 @@ ad_page_contract { Displays a community - + @author Ben Adida (ben@openforce.net) @creation-date 2001-10-04 } -query { 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.3 -r1.4 --- openacs-4/packages/dotlrn/www/configure-2.tcl 20 Jan 2002 19:43:46 -0000 1.3 +++ openacs-4/packages/dotlrn/www/configure-2.tcl 23 Jan 2002 00:15:43 -0000 1.4 @@ -1,6 +1,6 @@ ad_page_contract { A simple target for the portal configuration - + @author Arjun Sanyal (arjun@openforce.net) @author Ben Adida (ben@openforce.net) @creation-date 2001-10-24 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.2 -r1.3 --- openacs-4/packages/dotlrn/www/configure-element-2.tcl 20 Jan 2002 19:43:46 -0000 1.2 +++ openacs-4/packages/dotlrn/www/configure-element-2.tcl 23 Jan 2002 00:15:43 -0000 1.3 @@ -1,6 +1,6 @@ ad_page_contract { A simple target for the portal element configuration - + @author Arjun Sanyal (arjun@openforce.net) @author Ben Adida (ben@openforce.net) @creation-date 2001-10-24 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.4 -r1.5 --- openacs-4/packages/dotlrn/www/configure-element.tcl 21 Jan 2002 06:30:11 -0000 1.4 +++ openacs-4/packages/dotlrn/www/configure-element.tcl 23 Jan 2002 00:15:43 -0000 1.5 @@ -1,7 +1,7 @@ ad_page_contract { Displays an element configuration page - + @author Ben Adida (ben@openforce.net) @author Arjun Sanyal (arjun@openforce.net) @creation-date 2001-10-24 @@ -41,10 +41,10 @@ } } else { # this not a community, it is the "workspace" deal - + # Get the page set portal_id [db_string select_portal_id {} -default ""] - + # If there is no portal_id, this user is either a guest or something else if {[empty_string_p $portal_id]} { # do something @@ -53,8 +53,8 @@ set rendered_page [portal::configure_element $element_id $op "index"] } } - -ad_return_template +ad_return_template + Index: openacs-4/packages/dotlrn/www/configure.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/configure.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/configure.tcl 20 Jan 2002 19:43:46 -0000 1.5 +++ openacs-4/packages/dotlrn/www/configure.tcl 23 Jan 2002 00:15:43 -0000 1.6 @@ -1,6 +1,6 @@ ad_page_contract { Displays a configuration page - + @author Ben Adida (ben@openforce.net) @author Arjun Sanyal (arjun@openforce.net) @author yon (yon@openforce.net) @@ -40,7 +40,7 @@ # Get the page set portal_id [db_string select_portal_id {} -default ""] - + # If there is no portal_id, this user is either a guest or something else if {[empty_string_p $portal_id]} { # do something @@ -50,5 +50,5 @@ set name [portal::get_name $portal_id] } } - + ad_return_template Index: openacs-4/packages/dotlrn/www/deregister.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/deregister.tcl 20 Jan 2002 19:17:39 -0000 1.1 +++ openacs-4/packages/dotlrn/www/deregister.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -1,6 +1,6 @@ ad_page_contract { deregister - + @author Ben Adida (ben@openforce.net) @author yon (yon@openforce.net) @creation-date 2001-10-06 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.3 -r1.4 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 22 Jan 2002 00:41:35 -0000 1.3 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 23 Jan 2002 00:15:43 -0000 1.4 @@ -8,11 +8,13 @@ + - + +
@communities.pretty_name@
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 21 Jan 2002 07:47:09 -0000 1.1 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -1,29 +1,28 @@ # dotlrn/www/dotlrn-main-portlet-procs.tcl + ad_page_contract { The display logic for the dotlrn main (Groups) portlet @author Arjun Sanyal (arjun@openforce.net) - @cvs_id $Id$ + @version $Id$ } -array set config $cf +set user_id [ad_conn user_id] -set user_id [ad_get_user_id] -set list_of_communities [dotlrn_community::get_all_communities_by_user $user_id] -set my_community_id [lindex $list_of_communities 0] +set sql { + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.community_key, + dotlrn_communities.pretty_name, + dotlrn_communities.package_id + from dotlrn_communities, + dotlrn_member_rels_full + where dotlrn_communities.community_id = dotlrn_member_rels_full.community_id + and dotlrn_member_rels_full.user_id = :user_id +} -db_multirow -local communities select_communities " -select dotlrn_communities.community_id, -dotlrn_communities.community_type, -dotlrn_communities.community_key, -dotlrn_communities.pretty_name, -dotlrn_communities.package_id -from dotlrn_communities, -dotlrn_member_rels_full -where dotlrn_communities.community_id = dotlrn_member_rels_full.community_id -and dotlrn_member_rels_full.user_id = :user_id" { -# ad_return_complaint 1 "aks [info locals] ${communities(package_id)}" - set communities(url) [dotlrn_community::get_url_from_package_id -package_id ${communities(package_id)} ] +db_multirow -local communities select_communities $sql { + set communities(url) [dotlrn_community::get_url_from_package_id -package_id ${communities(package_id)}] } ad_return_template Index: openacs-4/packages/dotlrn/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/dotlrn/www/index.tcl 17 Jan 2002 21:59:51 -0000 1.21 +++ openacs-4/packages/dotlrn/www/index.tcl 23 Jan 2002 00:15:43 -0000 1.22 @@ -1,6 +1,6 @@ ad_page_contract { Displays the personal home page - + @author Ben Adida (ben@openforce.net) @creation-date 2001-08-20 @version $Id$ @@ -54,5 +54,5 @@ } set rendered_page [dotlrn::render_page -hide_links_p "t" $portal_id] - + ad_return_template Index: openacs-4/packages/dotlrn/www/join-policy-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/join-policy-toggle.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/join-policy-toggle.tcl 20 Jan 2002 06:11:04 -0000 1.1 +++ openacs-4/packages/dotlrn/www/join-policy-toggle.tcl 23 Jan 2002 00:15:43 -0000 1.2 @@ -1,6 +1,6 @@ ad_page_contract { Change the join policy of a dotLRN community. - + @author yon (yon@openforce.net) @creation-date 2002-01-18 @version $Id$ Index: openacs-4/packages/dotlrn/www/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/master.adp 21 Jan 2002 19:07:55 -0000 1.7 +++ openacs-4/packages/dotlrn/www/master.adp 23 Jan 2002 00:15:43 -0000 1.8 @@ -9,12 +9,12 @@ - + dotlrn - @text@ + @text@
Index: openacs-4/packages/dotlrn/www/master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/master.tcl 22 Jan 2002 20:02:30 -0000 1.5 +++ openacs-4/packages/dotlrn/www/master.tcl 23 Jan 2002 00:15:43 -0000 1.6 @@ -6,9 +6,9 @@ if {![empty_string_p $portal_id] && ![exists_and_not_null no_navbar_p]} { # if {[portal::page_count -portal_id $portal_id] > 1} { set navbar "" - + append navbar [portal::list_pages -portal_id $portal_id -link "switch-page" -pre_html ""] - + append navbar "
" -separator "
" -post_html "
" # } else { # set navbar "" @@ -21,7 +21,7 @@ db_0or1row pvt_home_user_info { select first_names, last_name - from cc_users + from cc_users where user_id=:user_id } Index: openacs-4/packages/dotlrn/www/member-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/member-add-2.adp 21 Jan 2002 06:30:11 -0000 1.4 +++ openacs-4/packages/dotlrn/www/member-add-2.adp 23 Jan 2002 00:15:43 -0000 1.5 @@ -7,7 +7,7 @@
- Role: + Role: