$errmsg" } -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set email_from [db_string admin_email "select email from parties where party_id = :admin_user_id"] set subject "$action" set message $email_message Index: openacs-4/packages/acs-admin/www/users/user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/acs-admin/www/users/user-add-2.tcl 26 Sep 2003 13:04:18 -0000 1.7 +++ openacs-4/packages/acs-admin/www/users/user-add-2.tcl 1 Mar 2005 00:01:21 -0000 1.8 @@ -17,7 +17,7 @@ administration_name:onevalue } -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] # Get user info acs_user::get -user_id $user_id -array user Index: openacs-4/packages/acs-admin/www/users/user-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-admin/www/users/user-add-3.tcl 6 Sep 2002 21:49:53 -0000 1.4 +++ openacs-4/packages/acs-admin/www/users/user-add-3.tcl 1 Mar 2005 00:01:21 -0000 1.5 @@ -16,7 +16,7 @@ export_vars:onevalue } -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set context [list [list "./" "Users"] "New user notified"] set export_vars [export_url_vars user_id] Index: openacs-4/packages/acs-admin/www/users/user-batch-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-batch-add.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/user-batch-add.tcl 17 May 2003 09:36:54 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/user-batch-add.tcl 1 Mar 2005 00:01:21 -0000 1.3 @@ -9,7 +9,7 @@ admin_email:onevalue } -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set administration_name [db_string admin_name "select Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v diff -u -N -r1.71 -r1.72 --- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 27 Feb 2005 22:45:39 -0000 1.71 +++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 1 Mar 2005 00:01:21 -0000 1.72 @@ -80,7 +80,7 @@ -package_key acs-authentication \ -parameter AllowSelfRegister]] } { util_user_message -message "Self registration is not allowed" - ad_maybe_redirect_for_registration + auth::require_login } } Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v diff -u -N -r1.37 -r1.38 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 16 Feb 2005 17:32:13 -0000 1.37 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 1 Mar 2005 00:01:22 -0000 1.38 @@ -30,7 +30,20 @@ set remove_ad_proc_p 0 } else { set remove_ad_proc_p 1 - proc ad_proc {name arglist args} { + proc ad_proc {args} { + # we have to eat flags and then define the proc. + set count 0 + foreach arg $args { + if {![string match {-*} $arg]} { + break + } + incr count + } + set name [lindex $args $count] + incr count + set arglist [lindex $args $count] + incr count + set args [lrange $args $count end] # args can be {docs body} {body} {docs -} # make sure it is non empty and does not end in - if {[llength $args] && ![string equal [lindex $args end] "-"]} { @@ -44,29 +57,29 @@ # The RDBMS Data Abstraction ################################## -ad_proc db_rdbms_create {type version} { +ad_proc -public db_rdbms_create {type version} { @return rdbms descriptor } { return [list $type $version] } -ad_proc db_rdbms_get_type {rdbms} { +ad_proc -public db_rdbms_get_type {rdbms} { @param rdbms descriptor constructed by db_rdbms_create @return rdbms name } { return [lindex $rdbms 0] } -ad_proc db_rdbms_get_version {rdbms} { +ad_proc -public db_rdbms_get_version {rdbms} { @param rdbms descriptor constructed by db_rdbms_create @return version identifier } { return [lindex $rdbms 1] } -ad_proc db_rdbms_compatible_p {rdbms_test rdbms_pattern} { +ad_proc -public db_rdbms_compatible_p {rdbms_test rdbms_pattern} { @return 0 if test incompatible with pattern, 1 if miscible } { # db_qd_log QDDebug "The RDBMS_TEST is [db_rdbms_get_type $rdbms_test] - [db_rdbms_get_version $rdbms_test]" @@ -107,55 +120,55 @@ -ad_proc db_fullquery_create {queryname querytext bind_vars_lst query_type rdbms load_location} { +ad_proc -public db_fullquery_create {queryname querytext bind_vars_lst query_type rdbms load_location} { FullQuery Data Abstraction Constructor } { return [list $queryname $querytext $bind_vars_lst $query_type $rdbms $load_location] } # The Accessor procs -ad_proc db_fullquery_get_name {fullquery} { +ad_proc -public db_fullquery_get_name {fullquery} { Accessor for fullquery data abstraction @param fullquery datastructure constructed by db_fullquery_create @return name } { return [lindex $fullquery 0] } -ad_proc db_fullquery_get_querytext {fullquery} { +ad_proc -public db_fullquery_get_querytext {fullquery} { Accessor for fullquery data abstraction @param fullquery datastructure constructed by db_fullquery_create @return query text } { return [lindex $fullquery 1] } -ad_proc db_fullquery_get_bind_vars {fullquery} { +ad_proc -public db_fullquery_get_bind_vars {fullquery} { Accessor for fullquery data abstraction @param fullquery datastructure constructed by db_fullquery_create @return bind vars } { return [lindex $fullquery 2] } -ad_proc db_fullquery_get_query_type {fullquery} { +ad_proc -public db_fullquery_get_query_type {fullquery} { Accessor for fullquery data abstraction @param fullquery datastructure constructed by db_fullquery_create @return query type } { return [lindex $fullquery 3] } -ad_proc db_fullquery_get_rdbms {fullquery} { +ad_proc -public db_fullquery_get_rdbms {fullquery} { Accessor for fullquery data abstraction @param fullquery datastructure constructed by db_fullquery_create @return rdbms descriptor } { return [lindex $fullquery 4] } -ad_proc db_fullquery_get_load_location {fullquery} { +ad_proc -public db_fullquery_get_load_location {fullquery} { Accessor for fullquery data abstraction @param fullquery datastructure constructed by db_fullquery_create @return load location @@ -170,7 +183,7 @@ # ################################################ -ad_proc db_qd_pick_most_specific_query {rdbms query_1 query_2} { +ad_proc -public db_qd_pick_most_specific_query {rdbms query_1 query_2} { For now, we're going to say that versions are numbers and that there is always backwards compatibility. } { @@ -203,7 +216,7 @@ # ################################################ -ad_proc db_qd_load_query_file {file_path} { +ad_proc -public db_qd_load_query_file {file_path} { A procedure that is called from the outside world (APM) to load a particular file } { @@ -214,7 +227,7 @@ } -ad_proc db_qd_get_fullname {local_name {added_stack_num 1}} { +ad_proc -public db_qd_get_fullname {local_name {added_stack_num 1}} { Find the fully qualified name of the query } { # We do a check to see if we already have a fullname. @@ -392,7 +405,7 @@ return $full_name } -ad_proc db_qd_fetch {fullquery_name {rdbms {}}} { +ad_proc -public db_qd_fetch {fullquery_name {rdbms {}}} { Fetch a query with a given name This procedure returns the latest FullQuery data structure @@ -404,7 +417,7 @@ return [db_qd_internal_get_cache $fullquery_name] } -ad_proc db_qd_replace_sql {statement_name sql} { +ad_proc -public db_qd_replace_sql {statement_name sql} { @return sql for statement_name (defaulting to sql if not found) } { set fullquery [db_qd_fetch $statement_name] @@ -422,7 +435,7 @@ return $sql } -ad_proc db_map {snippet_name} { +ad_proc -public db_map {snippet_name} { fetch a query snippet. used to provide db-specific query snippets when porting highly dynamic queries. (OpenACS - DanW) } { @@ -434,7 +447,7 @@ return [uplevel 1 [list subst -nobackslashes $sql]] } -ad_proc db_fullquery_compatible_p {fullquery {rdbms {}}} { +ad_proc -public db_fullquery_compatible_p {fullquery {rdbms {}}} { Check compatibility of a FullQuery against an RDBMS This procedure returns true or false. The RDBMS argument @@ -460,7 +473,7 @@ ###################################################### -ad_proc db_qd_internal_load_queries {file_pointer file_tag} { +ad_proc -private db_qd_internal_load_queries {file_pointer file_tag} { Load up a bunch of queries from a file pointer The file_tag parameter is for later flushing of a series @@ -535,7 +548,7 @@ -ad_proc db_qd_internal_get_cache {fullquery_name} { +ad_proc -private db_qd_internal_get_cache {fullquery_name} { Load from Cache } { # If we have no record @@ -561,7 +574,7 @@ return $fullquery_array } -ad_proc db_qd_internal_store_cache {fullquery} { +ad_proc -private db_qd_internal_store_cache {fullquery} { Store in Cache. The load_location is the file where this query was found. } { @@ -589,7 +602,7 @@ } -ad_proc db_qd_internal_load_cache {file_path} { +ad_proc -private db_qd_internal_load_cache {file_path} { Flush queries for a particular file path, and reload them } { # First we actually need to flush queries that are associated with that file tag @@ -608,7 +621,7 @@ ## NAMING ## -ad_proc db_qd_internal_get_queryname_root {relative_path} { +ad_proc -private db_qd_internal_get_queryname_root {relative_path} { @return relative path with trailing . } { # remove the prepended "/packages/" string @@ -638,7 +651,7 @@ ## The architecture of this parsing scheme allows for streaming XML parsing ## in the future. But right now we keep things simple -ad_proc db_qd_internal_parse_init {stuff_to_parse file_path} { +ad_proc -private db_qd_internal_parse_init {stuff_to_parse file_path} { Initialize the parsing state } { @@ -672,7 +685,7 @@ return [list $index $parsed_stuff $parsed_doc $default_rdbms $file_path] } -ad_proc db_qd_internal_parse_one_query {parsing_state} { +ad_proc -private db_qd_internal_parse_one_query {parsing_state} { Parse one query using the query state } { @@ -719,7 +732,7 @@ } -ad_proc db_qd_internal_parse_one_query_from_xml_node {one_query_node {default_rdbms {}} {file_path {}}} { +ad_proc -private db_qd_internal_parse_one_query_from_xml_node {one_query_node {default_rdbms {}} {file_path {}}} { Parse one query from an XML node } { # db_qd_log QDDebug "parsing one query node in XML with name -[xml_node_get_name $one_query_node]-" @@ -749,7 +762,7 @@ return [db_fullquery_create $queryname $querytext [list] "" $rdbms $file_path] } -ad_proc db_rdbms_parse_from_xml_node {rdbms_node} { +ad_proc -private db_rdbms_parse_from_xml_node {rdbms_node} { Parse and RDBMS struct from an XML fragment node } { # Check that it's RDBMS @@ -772,19 +785,19 @@ ## RELATIVE AND ABSOLUTE QUERY PATHS ## -ad_proc db_qd_root_path {} { +ad_proc -private db_qd_root_path {} { The token that indicates the root of all queries } { return "dbqd." } -ad_proc db_qd_null_path {} { +ad_proc -private db_qd_null_path {} { The null path } { return "[db_qd_root_path].NULL" } -ad_proc db_qd_relative_path_p {path} { +ad_proc -private db_qd_relative_path_p {path} { Check if the path is relative } { set root_path [db_qd_root_path] @@ -799,7 +812,7 @@ } -ad_proc db_qd_make_absolute_path {relative_root suffix} { +ad_proc -private db_qd_make_absolute_path {relative_root suffix} { Make a path absolute } { return "[db_qd_root_path]${relative_root}$suffix" @@ -809,7 +822,7 @@ ## ## Extra Utilities to Massage the system and Rub it in all the right ways ## -ad_proc db_qd_internal_prepare_queryfile_content {file_content} { +ad_proc -private db_qd_internal_prepare_queryfile_content {file_content} { set new_file_content "" @@ -861,7 +874,7 @@ ## Logging ## -ad_proc db_qd_log {level msg} { +ad_proc -private db_qd_log {level msg} { Centralized DB QD logging If you want to debug the QD, change QDDebug below to Debug } { Index: openacs-4/packages/acs-content-repository/tcl/keyword-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/keyword-procs.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/acs-content-repository/tcl/keyword-procs.tcl 7 Dec 2004 06:41:57 -0000 1.8 +++ openacs-4/packages/acs-content-repository/tcl/keyword-procs.tcl 1 Mar 2005 00:01:22 -0000 1.9 @@ -33,7 +33,7 @@ return $keyword_id } -ad_proc -public -deprecated cr::keyword::delete { +ad_proc -public -deprecated content::keyword::delete { {-keyword_id:required} } { Delete a keyword. Index: openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl,v diff -u -N -r1.19 -r1.20 --- openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 13 Jan 2005 13:55:14 -0000 1.19 +++ openacs-4/packages/acs-content-repository/tcl/revision-procs.tcl 1 Mar 2005 00:01:22 -0000 1.20 @@ -164,7 +164,7 @@ } { if { ![info exists creation_user] } { - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] } if { ![info exists creation_ip] } { Index: openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl 15 Feb 2004 10:56:09 -0000 1.2 +++ openacs-4/packages/acs-content-repository/tcl/test/acs-content-repository-procs.tcl 1 Mar 2005 00:01:22 -0000 1.3 @@ -29,13 +29,13 @@ set children [cr::keyword::get_children -parent_id $new_keyword_id ] aa_true "child is returned" [string match "*$new_keyword_id_2*" $children] - set delete_result [cr::keyword::delete -keyword_id $new_keyword_id_2] + set delete_result [content::keyword::delete -keyword_id $new_keyword_id_2] set children_after_delete [cr::keyword::get_children -parent_id $new_keyword_id ] aa_true "child is not returned after deletion" ![string match "*$new_keyword_id_2*" $children_after_delete] # teardown doesn't seem to eliminate this: - set delete_result [cr::keyword::delete -keyword_id $new_keyword_id] + set delete_result [content::keyword::delete -keyword_id $new_keyword_id] # would test that delete works but there's no relevant function in the API } Index: openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl 22 Sep 2003 19:44:28 -0000 1.11 +++ openacs-4/packages/acs-datetime/tcl/acs-datetime-procs.tcl 1 Mar 2005 00:01:22 -0000 1.12 @@ -9,7 +9,7 @@ @cvs-id $Id$ } -ad_proc dt_systime { +ad_proc -public dt_systime { {-format "%Y-%m-%d %H:%M:%S" -gmt f} } { Returns current server time in the standard format "yyyy-mm-dd @@ -19,15 +19,15 @@ return [clock format [clock seconds] -format $format -gmt $gmt] } -ad_proc dt_sysdate { +ad_proc -public dt_sysdate { {-format "%Y-%m-%d"} } { Returns current server date in the standard format "yyyy-mm-dd" } { return [clock format [clock seconds] -format $format] } -ad_proc dt_valid_time_p { +ad_proc -public dt_valid_time_p { time } { Returns 1 if "time" is a valid time specification, 0 otherwise. @@ -50,19 +50,23 @@ return [clock format [clock scan $time] -format $format -gmt $gmt] } -ad_proc dt_month_names {} { +ad_proc -public dt_month_names {} { Returns the calendar month names as a Tcl list (January, February, ...) + + @see lc_get } { return [lc_get mon] } -ad_proc dt_month_abbrev {} { +ad_proc -public dt_month_abbrev {} { Returns the calendar month names as a Tcl list (Jan, Feb, ...) + + @see lc_get } { return [lc_get abmon] } -ad_proc dt_ansi_to_julian_single_arg { +ad_proc -public dt_ansi_to_julian_single_arg { ansi {era ""} } { @@ -75,7 +79,7 @@ return [dt_ansi_to_julian $year $month $day $era] } -ad_proc dt_ansi_to_julian { +ad_proc -public dt_ansi_to_julian { year month day @@ -121,7 +125,7 @@ return [expr int($julian_date)] } -ad_proc dt_julian_to_ansi { +ad_proc -public dt_julian_to_ansi { julian_date } { Returns julian_date formatted as "yyyy-mm-dd" @@ -168,7 +172,7 @@ return $year-$month-$day } -ad_proc dt_ansi_to_pretty { +ad_proc -public dt_ansi_to_pretty { {ansi_date ""} } { Converts 1998-09-05 to September 5, 1998. With no argument it @@ -182,7 +186,7 @@ return [lc_time_fmt $ansi_date "%x"] } -ad_proc dt_ansi_to_list { +ad_proc -public dt_ansi_to_list { {ansi_date ""} } { Parses the given ansi_date string into a list of year, month, day, @@ -200,7 +204,7 @@ return $date_info } -ad_proc dt_num_days_in_month { +ad_proc -public dt_num_days_in_month { year month } { @@ -221,7 +225,7 @@ return [clock format [clock scan "last day" -base [clock scan $year-$month-01]] -format %d] } -ad_proc dt_first_day_of_month { +ad_proc -public dt_first_day_of_month { year month } { @@ -231,7 +235,7 @@ return [expr [clock format [clock scan $year-$month-01] -format %w] + 1] } -ad_proc dt_next_month { +ad_proc -public dt_next_month { year month } { @@ -252,7 +256,7 @@ return $next_month } -ad_proc dt_prev_month { +ad_proc -public dt_prev_month { year month } { @@ -274,7 +278,7 @@ return $prev_month } -ad_proc dt_next_month_name { +ad_proc -public dt_next_month_name { year month } { @@ -297,7 +301,7 @@ } -ad_proc dt_prev_month_name { +ad_proc -public dt_prev_month_name { year month } { @@ -443,7 +447,7 @@ return $input } -ad_proc dt_widget_month_names { +ad_proc -public dt_widget_month_names { name {default ""} } { @@ -460,7 +464,7 @@ return "\n" } -ad_proc dt_widget_numeric_range { +ad_proc -public dt_widget_numeric_range { name begin end @@ -489,7 +493,7 @@ return "" } -ad_proc dt_widget_maybe_range { +ad_proc -public dt_widget_maybe_range { {-hide t -hidden_value "00" -default "" -format "%02d"} ask_for_value name @@ -515,7 +519,7 @@ "$name" $start $end $default_value $interval $with_leading_zeros] } -ad_proc dt_interval_check { start end } { +ad_proc -public dt_interval_check { start end } { Checks the values of start and end to see if they form a valid time interval. Returns: Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -N -r1.42 -r1.43 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 24 Feb 2005 11:05:18 -0000 1.42 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 1 Mar 2005 00:01:22 -0000 1.43 @@ -38,7 +38,7 @@ set user_id [ds_ad_conn user_id] if {![permission::permission_p -party_id $user_id -object_id $object_id -privilege $privilege]} { if {$user_id == 0} { - ad_maybe_redirect_for_registration + auth::require_login } else { ns_log Warning "$user_id doesn't have $privilege on object $object_id" ad_return_forbidden "Permission Denied" "
Index: openacs-4/packages/acs-reference/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-reference/www/index.tcl 5 Feb 2004 23:34:31 -0000 1.2 +++ openacs-4/packages/acs-reference/www/index.tcl 1 Mar 2005 00:01:22 -0000 1.3 @@ -16,7 +16,7 @@ set title "Reference Data" set package_id [ad_conn package_id] set context_bar [list $title] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [ad_permission_p $package_id admin] Index: openacs-4/packages/acs-reference/www/reference-data-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/reference-data-list.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-reference/www/reference-data-list.tcl 28 Aug 2001 04:00:52 -0000 1.1 +++ openacs-4/packages/acs-reference/www/reference-data-list.tcl 1 Mar 2005 00:01:22 -0000 1.2 @@ -17,7 +17,7 @@ set title "List Reference Data" set context_bar [list "$title"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_multirow data data_select { } Index: openacs-4/packages/acs-reference/www/table-detail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/table-detail.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-reference/www/table-detail.tcl 5 Feb 2004 23:37:08 -0000 1.2 +++ openacs-4/packages/acs-reference/www/table-detail.tcl 1 Mar 2005 00:01:22 -0000 1.3 @@ -17,7 +17,7 @@ set package_id [ad_conn package_id] set title "View one Table Structure" set context_bar [list "$title"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_return_template \ No newline at end of file Index: openacs-4/packages/acs-reference/www/view-one-reference.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/view-one-reference.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-reference/www/view-one-reference.tcl 5 Feb 2004 23:36:08 -0000 1.2 +++ openacs-4/packages/acs-reference/www/view-one-reference.tcl 1 Mar 2005 00:01:22 -0000 1.3 @@ -17,7 +17,7 @@ set package_id [ad_conn package_id] set title "View one Table" set context_bar [list [list "reference-list" "Reference List" ] "$title"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row get_table { *SQL* } -column_array table_info Index: openacs-4/packages/acs-subsite/www/group-join.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-join.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/group-join.tcl 21 Sep 2003 19:20:30 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/group-join.tcl 1 Mar 2005 00:01:23 -0000 1.2 @@ -8,7 +8,7 @@ {return_url "."} } -ad_maybe_redirect_for_registration +auth::require_login set user_id [ad_conn user_id] set group_id [application_group::group_id_from_package_id] Index: openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl 13 Jan 2005 13:55:49 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/allow-for-view.tcl 1 Mar 2005 00:01:23 -0000 1.3 @@ -8,7 +8,7 @@ return_url } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] if { ![info exist checkbox] } { set checkbox "" Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 10 Sep 2002 22:22:11 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 1 Mar 2005 00:01:23 -0000 1.5 @@ -42,7 +42,7 @@ node_type_ck {The node type you specified is invalid} } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set ip_address [ad_conn peeraddr] db_transaction { Index: openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl 20 Apr 2004 21:13:00 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/members/user-batch-add.tcl 1 Mar 2005 00:01:23 -0000 1.3 @@ -11,7 +11,7 @@ subsite::assert_user_may_add_member -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string unused "select email from parties where party_id = :admin_user_id"] set administration_name [db_string admin_name "select Index: openacs-4/packages/acs-subsite/www/permissions/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/permissions/index.tcl 16 Jan 2003 13:40:37 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/permissions/index.tcl 1 Mar 2005 00:01:24 -0000 1.3 @@ -12,7 +12,7 @@ root:trim,integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set context "Permissions" Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-subsite/www/permissions/one.tcl 24 Feb 2005 11:10:31 -0000 1.11 +++ openacs-4/packages/acs-subsite/www/permissions/one.tcl 1 Mar 2005 00:01:24 -0000 1.12 @@ -13,7 +13,7 @@ {application_url ""} } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] ad_require_permission $object_id admin # RBM: Check if this is the Main Site and prevent the user from being Index: openacs-4/packages/acs-subsite/www/pvt/alerts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 6 Sep 2002 21:50:08 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/pvt/alerts.tcl 1 Mar 2005 00:01:24 -0000 1.4 @@ -12,7 +12,7 @@ gc_system_name:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row name_get "select first_names, last_name, email, url from persons, parties where persons.person_id = parties.party_id and party_id =:user_id" -bind [ad_tcl_vars_to_ns_set user_id] Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/comment-edit-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit-2.tcl 15 Aug 2003 21:18:13 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit-2.tcl 1 Mar 2005 00:01:24 -0000 1.3 @@ -10,7 +10,7 @@ { return_url "" } } -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] if [empty_string_p $user_id] { set user_id $current_user_id Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl 6 Sep 2002 21:50:14 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl 1 Mar 2005 00:01:24 -0000 1.3 @@ -15,7 +15,7 @@ last_name:onevalue } -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] if [empty_string_p $user_id] { set user_id $current_user_id Index: openacs-4/packages/acs-subsite/www/user/portrait/erase-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/erase-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/user/portrait/erase-2.tcl 18 Sep 2002 14:54:54 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/user/portrait/erase-2.tcl 1 Mar 2005 00:01:24 -0000 1.3 @@ -10,10 +10,10 @@ {user_id ""} } -ad_maybe_redirect_for_registration +auth::require_login -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] if [empty_string_p $user_id] { set user_id $current_user_id Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl 6 Sep 2002 22:19:33 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl 1 Mar 2005 00:01:24 -0000 1.4 @@ -11,7 +11,7 @@ admin_p:onevalue } -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] if [empty_string_p $user_id] { set user_id $current_user_id Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 1 Sep 2003 11:41:01 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl 1 Mar 2005 00:01:24 -0000 1.8 @@ -24,7 +24,7 @@ return_code:onevalue } -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] set subsite_url [subsite::get_element -element url] set return_url "[subsite::get_element -element url]user/portrait/" Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 24 Jul 2004 08:34:07 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl 1 Mar 2005 00:01:24 -0000 1.5 @@ -13,7 +13,7 @@ } -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] if [empty_string_p $user_id] { subsite::upload_allowed Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl,v diff -u -N -r1.55 -r1.56 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 26 Feb 2005 17:52:20 -0000 1.55 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 1 Mar 2005 00:01:24 -0000 1.56 @@ -210,7 +210,7 @@ } -ad_proc db_type { } { +ad_proc -public db_type { } { @return the RDBMS type (i.e. oracle, postgresql) this OpenACS installation is using. The nsv ad_database_type is set up during the bootstrap process. } { # Currently this should always be either "oracle" or "postgresql": @@ -219,7 +219,7 @@ return [nsv_get ad_database_type .] } -ad_proc db_compatible_rdbms_p { db_type } { +ad_proc -public db_compatible_rdbms_p { db_type } { @return 1 if the given db_type is compatible with the current RDBMS. } { return [expr { [empty_string_p $db_type] || [string equal [db_type] $db_type] }] @@ -244,7 +244,7 @@ return 0 } -ad_proc db_legacy_package_p { db_type_list } { +ad_proc -private db_legacy_package_p { db_type_list } { @return 1 if the package is a legacy package. We can only tell for certain if it explicitly supports Oracle 8.1.6 rather than the OpenACS more general oracle. } { if { [lsearch $db_type_list "oracle-8.1.6"] != -1 } { @@ -253,20 +253,20 @@ return 0 } -ad_proc db_version { } { +ad_proc -public db_version { } { @return the RDBMS version (i.e. 8.1.6 is a recent Oracle version; 7.1 a recent PostgreSQL version. } { return [nsv_get ad_database_version .] } -ad_proc db_current_rdbms { } { +ad_proc -public db_current_rdbms { } { @return the current rdbms type and version. } { return [db_rdbms_create [db_type] [db_version]] } -ad_proc db_known_database_types { } { +ad_proc -public db_known_database_types { } { @return a list of three-element lists describing the database engines known to OpenACS. Each sublist contains the internal database name (used in file paths, etc), the driver name, and a "pretty name" to be used in selection @@ -293,7 +293,7 @@ return "" } -ad_proc db_quote { string } { Quotes a string value to be placed in a SQL statement. } { +ad_proc -public db_quote { string } { Quotes a string value to be placed in a SQL statement. } { regsub -all {'} "$string" {''} result return $result } @@ -376,7 +376,7 @@ } -ad_proc db_nth_pool_name {{ -dbn "" } n } { +ad_proc -public db_nth_pool_name {{ -dbn "" } n } { @return the name of the pool used for the nth-nested selection (0-relative). @param dbn The database name to use. If empty_string, uses the default database. @@ -2138,7 +2138,7 @@ } -ad_proc db_get_username {{ -dbn "" }} { +ad_proc -public db_get_username {{ -dbn "" }} { @return the username parameter from the driver section of the first database pool for the dbn. @@ -2148,7 +2148,7 @@ return [ns_config "ns/db/pool/$pool" User] } -ad_proc db_get_password {{ -dbn "" }} { +ad_proc -public db_get_password {{ -dbn "" }} { @return the password parameter from the driver section of the first database pool for the dbn. @@ -2158,7 +2158,7 @@ return [ns_config "ns/db/pool/$pool" Password] } -ad_proc db_get_sql_user {{ -dbn "" }} { +ad_proc -public db_get_sql_user {{ -dbn "" }} { Oracle only.@@ -2180,7 +2180,7 @@ } } -ad_proc db_get_pgbin {{ -dbn "" }} { +ad_proc -public db_get_pgbin {{ -dbn "" }} { PostgreSQL only.
@@ -2194,7 +2194,7 @@ } -ad_proc db_get_port {{ -dbn "" }} { +ad_proc -public db_get_port {{ -dbn "" }} { PostgreSQL only.
@@ -2223,7 +2223,7 @@ } -ad_proc db_get_database {{ -dbn "" }} { +ad_proc -public db_get_database {{ -dbn "" }} { PostgreSQL only.
@@ -2244,7 +2244,7 @@ } -ad_proc db_get_dbhost {{ -dbn "" }} { +ad_proc -public db_get_dbhost {{ -dbn "" }} { PostgreSQL only.
@@ -2264,7 +2264,7 @@ return [string range $datasource 0 [expr $first_colon_pos - 1]] } -ad_proc db_source_sql_file {{ +ad_proc -public db_source_sql_file {{ -dbn "" -callback apm_ns_write_callback } file } { @@ -2379,7 +2379,7 @@ } } -ad_proc db_load_sql_data {{ +ad_proc -public db_load_sql_data {{ -dbn "" -callback apm_ns_write_callback } file } { @@ -2517,7 +2517,7 @@ } } -ad_proc db_source_sqlj_file {{ +ad_proc -public db_source_sqlj_file {{ -dbn "" -callback apm_ns_write_callback } file } { @@ -2835,7 +2835,7 @@ } -ad_proc db_blob_get {{ -dbn "" } statement_name sql args } { +ad_proc -public db_blob_get {{ -dbn "" } statement_name sql args } { PostgreSQL only. @param dbn The database name to use. If empty_string, uses the default database. Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 13 Jan 2005 13:55:55 -0000 1.26 +++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 1 Mar 2005 00:01:25 -0000 1.27 @@ -153,7 +153,7 @@ if {![permission_p -party_id $party_id -object_id $object_id -privilege $privilege]} { if {!${party_id}} { - ad_maybe_redirect_for_registration + auth::require_login } else { ns_log notice "permission::require_permission: $party_id doesn't have $privilege on object $object_id" ad_return_forbidden \ Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -N -r1.32 -r1.33 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 26 Feb 2005 17:52:20 -0000 1.32 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 1 Mar 2005 00:01:25 -0000 1.33 @@ -195,7 +195,7 @@ # the database. set creation_ip [ad_conn peeraddr] - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] set name "tarball-for-package-version-${version_id}" set title "${package_key}-tarball" Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -N -r1.37 -r1.38 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 8 Feb 2005 11:07:48 -0000 1.37 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 1 Mar 2005 00:01:25 -0000 1.38 @@ -470,7 +470,7 @@ ad_set_signed_cookie -secure t "ad_secure_token" "[ad_conn session_id],[ad_conn user_id],[ns_time]" } -ad_proc -public -deprecated ad_secure_conn_p {} { +ad_proc -public -deprecated -warn ad_secure_conn_p {} { Use security::secure_conn_p instead. @see security::secure_conn_p @@ -1265,7 +1265,7 @@ return [ad_conn user_id] } -ad_proc -public -deprecated ad_verify_and_get_user_id { +ad_proc -public -deprecated -warn ad_verify_and_get_user_id { {-secure f} } { Returns the current user's ID. 0 indicates user is not logged in @@ -1277,20 +1277,6 @@ return [ad_conn user_id] } -ad_proc -public -deprecated ad_verify_and_get_session_id { - {-secure f} -} { - Returns the current session's ID. - - Deprecated since session_id now provided via ad_conn session_id - - @param secure is ignored - - @see ad_conn -} { - return [ad_conn session_id] -} - # handling privacy ad_proc -public -deprecated ad_privacy_threshold {} { Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v diff -u -N -r1.42 -r1.43 --- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 19 Jan 2005 12:33:41 -0000 1.42 +++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl 1 Mar 2005 00:01:25 -0000 1.43 @@ -1627,7 +1627,7 @@ } } -ad_proc -deprecated util_quotehtml { arg } { +ad_proc -deprecated -warn util_quotehtml { arg } { This proc does exactly the same as
ad_quotehtml. Use that instead. This one will be deleted eventually. Index: openacs-4/packages/address-book/www/address-ae-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-ae-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/address-ae-2.tcl 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/www/address-ae-2.tcl 1 Mar 2005 00:01:25 -0000 1.2 @@ -8,7 +8,7 @@ contact_id:integer " -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set instance_id [ad_conn package_id] set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/address-book/www/attr-ae-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/address-book/www/attr-ae-2.tcl 30 Sep 2003 12:10:03 -0000 1.2 +++ openacs-4/packages/address-book/www/attr-ae-2.tcl 1 Mar 2005 00:01:25 -0000 1.3 @@ -9,7 +9,7 @@ contact_id:integer } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set instance_id [ad_conn package_id] set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/address-book/www/contact-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-add-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/contact-add-2.tcl 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/www/contact-add-2.tcl 1 Mar 2005 00:01:25 -0000 1.2 @@ -14,7 +14,7 @@ address:array,address([ad_parameter FreePostalCodes]) " -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set instance_id [ad_conn package_id] set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/address-book/www/contact-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-edit-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/address-book/www/contact-edit-2.tcl 20 Apr 2001 20:51:12 -0000 1.1 +++ openacs-4/packages/address-book/www/contact-edit-2.tcl 1 Mar 2005 00:01:25 -0000 1.2 @@ -10,7 +10,7 @@ organization } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set instance_id [ad_conn package_id] set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/address-book/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/address-book/www/index.tcl 6 Sep 2002 21:50:19 -0000 1.3 +++ openacs-4/packages/address-book/www/index.tcl 1 Mar 2005 00:01:25 -0000 1.4 @@ -19,7 +19,7 @@ escaped_substr:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set instance_id [ad_conn package_id] Index: openacs-4/packages/authorize-gateway/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/authorize-gateway/www/index.tcl 16 Dec 2003 19:21:50 -0000 1.2 +++ openacs-4/packages/authorize-gateway/www/index.tcl 1 Mar 2005 00:01:25 -0000 1.3 @@ -13,7 +13,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/authorize-gateway/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/admin/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/authorize-gateway/www/admin/index.tcl 16 Dec 2003 19:21:50 -0000 1.2 +++ openacs-4/packages/authorize-gateway/www/admin/index.tcl 1 Mar 2005 00:01:25 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/authorize-gateway/www/doc/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/doc/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/authorize-gateway/www/doc/index.tcl 16 Dec 2003 19:21:50 -0000 1.2 +++ openacs-4/packages/authorize-gateway/www/doc/index.tcl 1 Mar 2005 00:01:25 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Authorize.net Gateway" set title "$package_name Documentation" Index: openacs-4/packages/authorize-gateway/www/doc/license.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/doc/license.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/authorize-gateway/www/doc/license.tcl 16 Dec 2003 19:21:50 -0000 1.2 +++ openacs-4/packages/authorize-gateway/www/doc/license.tcl 1 Mar 2005 00:01:25 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Authorize.net Gateway" set title "$package_name License" Index: openacs-4/packages/bookmarks/www/tree-dynamic.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-dynamic.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/bookmarks/www/tree-dynamic.tcl 13 Jan 2005 13:56:13 -0000 1.5 +++ openacs-4/packages/bookmarks/www/tree-dynamic.tcl 1 Mar 2005 00:01:26 -0000 1.6 @@ -19,7 +19,7 @@ viewed_user_id:integer } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # time # we get this time variable only so that certain browsers (internet explorer, for instance) Index: openacs-4/packages/bug-tracker/www/bug-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-add.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/bug-tracker/www/bug-add.tcl 24 Feb 2005 13:33:04 -0000 1.13 +++ openacs-4/packages/bug-tracker/www/bug-add.tcl 1 Mar 2005 00:01:26 -0000 1.14 @@ -15,7 +15,7 @@ ad_require_permission [ad_conn package_id] create # User needs to be logged in here -ad_maybe_redirect_for_registration +auth::require_login # Set some common bug-tracker variables set project_name [bug_tracker::conn project_name] Index: openacs-4/packages/bug-tracker/www/bug.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.tcl,v diff -u -N -r1.37 -r1.38 --- openacs-4/packages/bug-tracker/www/bug.tcl 25 Feb 2005 17:08:12 -0000 1.37 +++ openacs-4/packages/bug-tracker/www/bug.tcl 1 Mar 2005 00:01:26 -0000 1.38 @@ -72,7 +72,7 @@ set action_id "" if { ![empty_string_p $enabled_action_id] } { ns_log Notice "enabled_action if statement" - ad_maybe_redirect_for_registration + auth::require_login workflow::case::enabled_action_get -enabled_action_id $enabled_action_id -array enabled_action set action_id $enabled_action(action_id) } Index: openacs-4/packages/bug-tracker/www/patch-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-add.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/bug-tracker/www/patch-add.tcl 27 Apr 2004 12:33:21 -0000 1.12 +++ openacs-4/packages/bug-tracker/www/patch-add.tcl 1 Mar 2005 00:01:26 -0000 1.13 @@ -24,7 +24,7 @@ } # User needs to be logged in here -ad_maybe_redirect_for_registration +auth::require_login # Set some common bug-tracker variables set project_name [bug_tracker::conn project_name] Index: openacs-4/packages/bug-tracker/www/patch.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/bug-tracker/www/patch.tcl 13 Jan 2005 13:56:17 -0000 1.12 +++ openacs-4/packages/bug-tracker/www/patch.tcl 1 Mar 2005 00:01:26 -0000 1.13 @@ -128,7 +128,7 @@ } if { ![string equal $mode "view"] } { - ad_maybe_redirect_for_registration + auth::require_login } # XXX FIXME TODO editing a patch invokes filename::validate, which is too paranoid... Index: openacs-4/packages/bug-tracker/www/prefs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/prefs.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/bug-tracker/www/prefs.tcl 29 Mar 2004 15:07:34 -0000 1.10 +++ openacs-4/packages/bug-tracker/www/prefs.tcl 1 Mar 2005 00:01:26 -0000 1.11 @@ -10,7 +10,7 @@ } # User needs to be logged in here -ad_maybe_redirect_for_registration +auth::require_login ad_require_permission [ad_conn package_id] read Index: openacs-4/packages/bug-tracker/www/admin/category-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/bug-tracker/www/admin/category-delete.tcl 28 Aug 2003 09:45:30 -0000 1.2 +++ openacs-4/packages/bug-tracker/www/admin/category-delete.tcl 1 Mar 2005 00:01:26 -0000 1.3 @@ -4,7 +4,7 @@ keyword_id:integer } -cr::keyword::delete \ +content::keyword::delete \ -keyword_id $keyword_id bug_tracker::get_keywords_flush Index: openacs-4/packages/calendar/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/calendar/www/admin/index.tcl 11 Dec 2003 21:39:59 -0000 1.5 +++ openacs-4/packages/calendar/www/admin/index.tcl 1 Mar 2005 00:01:26 -0000 1.6 @@ -9,7 +9,7 @@ } # find out the user_id -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set package_id [ad_conn package_id] set page_title [_ calendar.lt_Calendar_Administrati] Index: openacs-4/packages/categories/www/categories-browse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/categories/www/categories-browse.tcl 11 Feb 2004 09:04:34 -0000 1.7 +++ openacs-4/packages/categories/www/categories-browse.tcl 1 Mar 2005 00:01:26 -0000 1.8 @@ -31,7 +31,7 @@ pages:onerow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set page_title "Browse categories" Index: openacs-4/packages/categories/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/index.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/categories/www/index.tcl 11 Feb 2004 00:40:14 -0000 1.6 +++ openacs-4/packages/categories/www/index.tcl 1 Mar 2005 00:01:26 -0000 1.7 @@ -15,7 +15,7 @@ set page_title "Categories" set context_bar "" -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_id [ad_conn package_id] set locale [ad_conn locale] Index: openacs-4/packages/categories/www/search-result.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/search-result.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/search-result.tcl 11 Feb 2004 13:25:28 -0000 1.1 +++ openacs-4/packages/categories/www/search-result.tcl 1 Mar 2005 00:01:26 -0000 1.2 @@ -11,7 +11,7 @@ context_bar:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_id [ad_conn package_id] set locale [ad_conn locale] Index: openacs-4/packages/categories/www/cadmin/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/categories/www/cadmin/category-delete-2.tcl 10 Feb 2004 12:06:41 -0000 1.7 +++ openacs-4/packages/categories/www/cadmin/category-delete-2.tcl 1 Mar 2005 00:01:26 -0000 1.8 @@ -11,7 +11,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write db_transaction { Index: openacs-4/packages/categories/www/cadmin/category-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/categories/www/cadmin/category-delete.tcl 11 Feb 2004 09:02:43 -0000 1.8 +++ openacs-4/packages/categories/www/cadmin/category-delete.tcl 1 Mar 2005 00:01:26 -0000 1.9 @@ -18,7 +18,7 @@ mapped_objects_p:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write multirow create categories category_id category_name objects_p view_url Index: openacs-4/packages/categories/www/cadmin/category-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/categories/www/cadmin/category-form.tcl 11 Feb 2004 09:02:43 -0000 1.6 +++ openacs-4/packages/categories/www/cadmin/category-form.tcl 1 Mar 2005 00:01:26 -0000 1.7 @@ -14,7 +14,7 @@ page_title:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_id [ad_conn package_id] permission::require_permission -object_id $tree_id -privilege category_tree_write Index: openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl 11 Feb 2004 09:02:43 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl 1 Mar 2005 00:01:26 -0000 1.5 @@ -17,7 +17,7 @@ trees:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write permission::require_permission -object_id $link_tree_id -privilege category_tree_write Index: openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl 9 Feb 2004 19:51:44 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl 1 Mar 2005 00:01:26 -0000 1.3 @@ -12,7 +12,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write db_transaction { Index: openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl 9 Feb 2004 19:51:44 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl 1 Mar 2005 00:01:26 -0000 1.3 @@ -12,7 +12,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write db_transaction { Index: openacs-4/packages/categories/www/cadmin/category-link-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/category-link-add.tcl 11 Feb 2004 09:02:43 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/category-link-add.tcl 1 Mar 2005 00:01:26 -0000 1.3 @@ -16,7 +16,7 @@ trees:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl 10 Feb 2004 12:07:04 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl 1 Mar 2005 00:01:26 -0000 1.4 @@ -12,7 +12,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write db_transaction { Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 11 Feb 2004 09:02:43 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 1 Mar 2005 00:01:26 -0000 1.4 @@ -18,7 +18,7 @@ cancel_url:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/category-links-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/category-links-view.tcl 11 Feb 2004 09:02:43 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/category-links-view.tcl 1 Mar 2005 00:01:26 -0000 1.4 @@ -16,7 +16,7 @@ category_links:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/category-parent-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-parent-change.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/category-parent-change.tcl 24 Feb 2005 13:33:05 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/category-parent-change.tcl 1 Mar 2005 00:01:26 -0000 1.3 @@ -16,7 +16,7 @@ tree:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set category_name [category::get_name $category_id $locale] Index: openacs-4/packages/categories/www/cadmin/category-usage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/categories/www/cadmin/category-usage.tcl 11 Feb 2004 09:02:43 -0000 1.5 +++ openacs-4/packages/categories/www/cadmin/category-usage.tcl 1 Mar 2005 00:01:26 -0000 1.6 @@ -25,7 +25,7 @@ pages:onerow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] array set tree [category_tree::get_data $tree_id $locale] if {$tree(site_wide_p) == "f"} { permission::require_permission -object_id $tree_id -privilege category_tree_read Index: openacs-4/packages/categories/www/cadmin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/categories/www/cadmin/index.tcl 9 Feb 2004 19:51:44 -0000 1.7 +++ openacs-4/packages/categories/www/cadmin/index.tcl 1 Mar 2005 00:01:26 -0000 1.8 @@ -18,7 +18,7 @@ set page_title "Category Management" set context_bar [list $page_title] -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_id [ad_conn package_id] permission::require_permission -object_id $package_id -privilege category_admin Index: openacs-4/packages/categories/www/cadmin/object-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/object-map.tcl 11 Feb 2004 11:44:00 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/object-map.tcl 1 Mar 2005 00:01:26 -0000 1.2 @@ -18,7 +18,7 @@ object_name:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $object_id -privilege admin set context_bar [category::get_object_context $object_id] Index: openacs-4/packages/categories/www/cadmin/permission-manage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/permission-manage.tcl 11 Feb 2004 09:02:43 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/permission-manage.tcl 1 Mar 2005 00:01:27 -0000 1.5 @@ -15,7 +15,7 @@ url_vars:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_grant_permissions array set tree [category_tree::get_data $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl 9 Feb 2004 19:48:44 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl 1 Mar 2005 00:01:27 -0000 1.5 @@ -10,7 +10,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_id [ad_conn package_id] permission::require_permission -object_id $package_id -privilege category_admin Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl 11 Feb 2004 13:25:28 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl 1 Mar 2005 00:01:27 -0000 1.2 @@ -12,7 +12,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write db_transaction { Index: openacs-4/packages/categories/www/cadmin/synonym-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/synonym-delete.tcl 11 Feb 2004 13:25:28 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/synonym-delete.tcl 1 Mar 2005 00:01:27 -0000 1.2 @@ -18,7 +18,7 @@ cancel_url:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/synonym-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-form.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/synonym-form.tcl 11 Feb 2004 13:25:28 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/synonym-form.tcl 1 Mar 2005 00:01:27 -0000 1.2 @@ -15,7 +15,7 @@ page_title:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/synonyms-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonyms-view.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/synonyms-view.tcl 11 Feb 2004 13:25:28 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/synonyms-view.tcl 1 Mar 2005 00:01:27 -0000 1.2 @@ -16,7 +16,7 @@ synonyms:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl 9 Feb 2004 19:48:44 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl 1 Mar 2005 00:01:27 -0000 1.5 @@ -11,7 +11,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set tree_id $target_tree_id permission::require_permission -object_id $tree_id -privilege category_tree_write Index: openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl 11 Feb 2004 10:15:59 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl 1 Mar 2005 00:01:27 -0000 1.2 @@ -16,7 +16,7 @@ tree:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set tree_id $source_tree_id array set target_tree [category_tree::get_data $target_tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/categories/www/cadmin/tree-copy.tcl 11 Feb 2004 10:15:59 -0000 1.8 +++ openacs-4/packages/categories/www/cadmin/tree-copy.tcl 1 Mar 2005 00:01:27 -0000 1.9 @@ -16,7 +16,7 @@ tree_id:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set tree_name [category_tree::get_name $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl 11 Feb 2004 11:44:00 -0000 1.5 +++ openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl 1 Mar 2005 00:01:27 -0000 1.6 @@ -10,7 +10,7 @@ object_id:integer,optional } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write set instance_list [category_tree::usage $tree_id] Index: openacs-4/packages/categories/www/cadmin/tree-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/categories/www/cadmin/tree-delete.tcl 27 Apr 2004 11:23:45 -0000 1.8 +++ openacs-4/packages/categories/www/cadmin/tree-delete.tcl 1 Mar 2005 00:01:27 -0000 1.9 @@ -20,7 +20,7 @@ used_categories:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $tree_id -privilege category_tree_write array set tree [category_tree::get_data $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-map-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/categories/www/cadmin/tree-map-2.tcl 11 Feb 2004 11:44:00 -0000 1.2 +++ openacs-4/packages/categories/www/cadmin/tree-map-2.tcl 1 Mar 2005 00:01:27 -0000 1.3 @@ -16,7 +16,7 @@ {edit_p 0} } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $object_id -privilege admin array set tree [category_tree::get_data $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/categories/www/cadmin/tree-map.tcl 11 Feb 2004 11:44:00 -0000 1.6 +++ openacs-4/packages/categories/www/cadmin/tree-map.tcl 1 Mar 2005 00:01:27 -0000 1.7 @@ -15,7 +15,7 @@ tree:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $object_id -privilege admin array set tree_data [category_tree::get_data $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl 11 Feb 2004 11:44:00 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl 1 Mar 2005 00:01:27 -0000 1.5 @@ -10,7 +10,7 @@ object_id:integer,notnull } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $object_id -privilege admin array set tree [category_tree::get_data $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-unmap.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/categories/www/cadmin/tree-unmap.tcl 11 Feb 2004 11:44:00 -0000 1.5 +++ openacs-4/packages/categories/www/cadmin/tree-unmap.tcl 1 Mar 2005 00:01:27 -0000 1.6 @@ -18,7 +18,7 @@ cancel_form_vars:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $object_id -privilege admin array set tree [category_tree::get_data $tree_id $locale] Index: openacs-4/packages/categories/www/cadmin/tree-usage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/categories/www/cadmin/tree-usage.tcl 27 Apr 2004 11:23:45 -0000 1.6 +++ openacs-4/packages/categories/www/cadmin/tree-usage.tcl 1 Mar 2005 00:01:27 -0000 1.7 @@ -18,7 +18,7 @@ instances_without_permission:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] array set tree [category_tree::get_data $tree_id $locale] if {$tree(site_wide_p) == "f"} { Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/categories/www/cadmin/tree-view.tcl 11 Feb 2004 13:25:28 -0000 1.10 +++ openacs-4/packages/categories/www/cadmin/tree-view.tcl 1 Mar 2005 00:01:27 -0000 1.11 @@ -19,7 +19,7 @@ can_write_p:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] array set tree [category_tree::get_data $tree_id $locale] if {$tree(site_wide_p) == "f"} { Index: openacs-4/packages/contacts/www/cadmin/object-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/cadmin/Attic/object-map.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/contacts/www/cadmin/object-map.tcl 13 Jan 2005 13:57:16 -0000 1.2 +++ openacs-4/packages/contacts/www/cadmin/object-map.tcl 1 Mar 2005 00:01:27 -0000 1.3 @@ -17,7 +17,7 @@ {locale "en_US"} } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission -object_id $object_id -privilege admin set object_name [db_string get_object_name {}] Index: openacs-4/packages/cronjob/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/cronjob/www/index.tcl 30 Nov 2002 17:29:53 -0000 1.2 +++ openacs-4/packages/cronjob/www/index.tcl 1 Mar 2005 00:01:27 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/cronjob/www/admin/cronjob-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cronjob/www/admin/cronjob-add.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/cronjob/www/admin/cronjob-add.tcl 30 Nov 2002 17:30:07 -0000 1.3 +++ openacs-4/packages/cronjob/www/admin/cronjob-add.tcl 1 Mar 2005 00:01:27 -0000 1.4 @@ -20,7 +20,7 @@ } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set approved_p "t" set disabled_p "f" Index: openacs-4/packages/dotlrn/www/approve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/approve.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/approve.tcl 13 Jan 2005 13:57:21 -0000 1.6 +++ openacs-4/packages/dotlrn/www/approve.tcl 1 Mar 2005 00:01:27 -0000 1.7 @@ -26,7 +26,7 @@ {referer "./"} } -ad_maybe_redirect_for_registration +auth::require_login if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] 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 -N -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/community-member.tcl 11 Nov 2003 09:34:05 -0000 1.16 +++ openacs-4/packages/dotlrn/www/community-member.tcl 1 Mar 2005 00:01:27 -0000 1.17 @@ -47,7 +47,7 @@ auth::require_login -set verified_user_id [ad_verify_and_get_user_id] +set verified_user_id [ad_conn user_id] set user_info_sql { select first_names, 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 -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/configure-element-2.tcl 23 Oct 2002 12:38:39 -0000 1.9 +++ openacs-4/packages/dotlrn/www/configure-element-2.tcl 1 Mar 2005 00:01:27 -0000 1.10 @@ -33,7 +33,7 @@ } # Make sure user is logged in -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] portal::set_element_param $element_id $key $value 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 -N -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/configure-element.tcl 23 Oct 2002 12:38:39 -0000 1.15 +++ openacs-4/packages/dotlrn/www/configure-element.tcl 1 Mar 2005 00:01:27 -0000 1.16 @@ -30,7 +30,7 @@ ad_script_abort } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] if {[parameter::get -parameter community_level_p] == 1} { Index: openacs-4/packages/dotlrn/www/control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/control-panel.tcl 13 Jan 2005 13:57:21 -0000 1.8 +++ openacs-4/packages/dotlrn/www/control-panel.tcl 1 Mar 2005 00:01:27 -0000 1.9 @@ -34,7 +34,7 @@ set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] # Make sure user is logged in -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set title [parameter::get -localize -parameter admin_page_name] set admin_p [dotlrn::admin_p] Index: openacs-4/packages/dotlrn/www/deregister-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-confirm.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/deregister-confirm.tcl 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/deregister-confirm.tcl 1 Mar 2005 00:01:27 -0000 1.3 @@ -26,7 +26,7 @@ {referer ""} } -ad_maybe_redirect_for_registration +auth::require_login set time_per_user 15 set num_users_display_limit 99 Index: openacs-4/packages/dotlrn/www/deregister.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/deregister.tcl 4 Dec 2002 09:51:04 -0000 1.7 +++ openacs-4/packages/dotlrn/www/deregister.tcl 1 Mar 2005 00:01:27 -0000 1.8 @@ -36,7 +36,7 @@ # wouldn't break. This does have the unfortunate consequence that the name # user_id is not intuative when it is a list of many user_ids. (teadams@alum.mit.edu) -ad_maybe_redirect_for_registration +auth::require_login if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v diff -u -N -r1.41 -r1.42 --- openacs-4/packages/dotlrn/www/index.tcl 13 Jan 2005 13:57:21 -0000 1.41 +++ openacs-4/packages/dotlrn/www/index.tcl 1 Mar 2005 00:01:27 -0000 1.42 @@ -33,7 +33,7 @@ ad_script_abort } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] if {![dotlrn::user_p -user_id $user_id]} { ad_returnredirect "index-not-a-user" Index: openacs-4/packages/dotlrn/www/my-communities.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/dotlrn/www/my-communities.tcl 23 Oct 2002 12:38:39 -0000 1.8 +++ openacs-4/packages/dotlrn/www/my-communities.tcl 1 Mar 2005 00:01:27 -0000 1.9 @@ -25,7 +25,7 @@ communities:multirow } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set user_can_browse_p [dotlrn::user_can_browse_p -user_id $user_id] if {![info exists referer]} { Index: openacs-4/packages/dotlrn/www/register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/dotlrn/www/register.tcl 12 Nov 2003 10:12:51 -0000 1.12 +++ openacs-4/packages/dotlrn/www/register.tcl 1 Mar 2005 00:01:27 -0000 1.13 @@ -27,7 +27,7 @@ {referer "./"} } -ad_maybe_redirect_for_registration +auth::require_login if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/reject.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/reject.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/dotlrn/www/reject.tcl 13 Jan 2005 13:57:21 -0000 1.6 +++ openacs-4/packages/dotlrn/www/reject.tcl 1 Mar 2005 00:01:27 -0000 1.7 @@ -26,7 +26,7 @@ {referer "./"} } -ad_maybe_redirect_for_registration +auth::require_login if {[empty_string_p $community_id]} { set community_id [dotlrn_community::get_community_id] Index: openacs-4/packages/dotlrn/www/user-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/user-add-2.tcl 24 Jul 2004 08:34:10 -0000 1.11 +++ openacs-4/packages/dotlrn/www/user-add-2.tcl 1 Mar 2005 00:01:27 -0000 1.12 @@ -85,7 +85,7 @@ set context_bar [list [list "one-community-admin" [_ dotlrn.Admin]] [_ dotlrn.Add_User]] -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set administration_name [db_string select_admin_name { select first_names || ' ' || last_name from persons Index: openacs-4/packages/dotlrn/www/user-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/user-add-3.tcl 24 Jul 2004 08:34:10 -0000 1.7 +++ openacs-4/packages/dotlrn/www/user-add-3.tcl 1 Mar 2005 00:01:27 -0000 1.8 @@ -31,7 +31,7 @@ dotlrn_portlet::is_allowed -parameter guestuser dotlrn_portlet::is_allowed -parameter limiteduser -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string select_admin_email { select email from parties Index: openacs-4/packages/dotlrn/www/user-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v diff -u -N -r1.31 -r1.32 --- openacs-4/packages/dotlrn/www/user-add.tcl 24 Jul 2004 08:34:10 -0000 1.31 +++ openacs-4/packages/dotlrn/www/user-add.tcl 1 Mar 2005 00:01:27 -0000 1.32 @@ -40,7 +40,7 @@ # Set read_private_data_p and can_browse_p to me the most restrictive defaults. -set current_user_id [ad_maybe_redirect_for_registration] +set current_user_id [auth::require_login] set community_id [dotlrn_community::get_community_id] # If can_browse_p is 0, this means the new user would be able to join Index: openacs-4/packages/dotlrn/www/weblog-control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-control-panel.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/weblog-control-panel.tcl 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/weblog-control-panel.tcl 1 Mar 2005 00:01:27 -0000 1.3 @@ -22,7 +22,7 @@ @version $Id$ } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set dotlrn_package_id [dotlrn::get_package_id] Index: openacs-4/packages/dotlrn/www/weblog-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/weblog-new.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/weblog-new.tcl 12 Nov 2003 10:12:51 -0000 1.3 +++ openacs-4/packages/dotlrn/www/weblog-new.tcl 1 Mar 2005 00:01:27 -0000 1.4 @@ -26,7 +26,7 @@ } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set weblog_package_id [site_node_apm_integration::get_child_package_id -package_key "forums"] set existing_forum_ids [db_list weblog_forum_id {select forum_id from forums_forums_enabled f, acs_objects o where o.object_id = forum_id and o.creation_user = :user_id and f.package_id = :weblog_package_id}] Index: openacs-4/packages/dotlrn/www/admin/admin-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/admin-remove.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/admin-remove.tcl 13 Jan 2005 13:57:21 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/admin-remove.tcl 1 Mar 2005 00:01:28 -0000 1.4 @@ -13,7 +13,7 @@ # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # details. # -ad_maybe_redirect_for_registration +auth::require_login ad_page_contract { Remove dotLRN Administrators Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 13 Jan 2005 13:57:21 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/dotlrn-admins.tcl 1 Mar 2005 00:01:28 -0000 1.4 @@ -31,7 +31,7 @@ set dotlrn_admins_group [db_string group_id_from_name " select group_id from groups where group_name='dotlrn-admin'" -default ""] -set admin_id [ad_verify_and_get_user_id] +set admin_id [ad_conn user_id] set elements [list user \ [list label "User" \ Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 24 Feb 2005 13:33:07 -0000 1.18 +++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl 1 Mar 2005 00:01:28 -0000 1.19 @@ -31,7 +31,7 @@ # Prepare stuff set headers {first_names last_name email username} -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string select_admin_email { select email from parties Index: openacs-4/packages/dotlrn-admin/www/admin/admin-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/admin-remove.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-admin/www/admin/admin-remove.tcl 20 Aug 2004 14:44:22 -0000 1.1 +++ openacs-4/packages/dotlrn-admin/www/admin/admin-remove.tcl 1 Mar 2005 00:01:28 -0000 1.2 @@ -13,7 +13,7 @@ # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # details. # -ad_maybe_redirect_for_registration +auth::require_login ad_page_contract { Remove dotLRN Administrators Index: openacs-4/packages/dotlrn-admin/www/admin/dotlrn-admins.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/dotlrn-admins.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-admin/www/admin/dotlrn-admins.tcl 20 Aug 2004 14:44:22 -0000 1.1 +++ openacs-4/packages/dotlrn-admin/www/admin/dotlrn-admins.tcl 1 Mar 2005 00:01:28 -0000 1.2 @@ -28,7 +28,7 @@ set dotlrn_admins_group [db_string group_id_from_name " select group_id from groups where group_name='dotlrn-admin'" -default ""] -set admin_id [ad_verify_and_get_user_id] +set admin_id [ad_conn user_id] set elements [list user \ [list label "User" \ Index: openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl 20 Aug 2004 14:44:22 -0000 1.1 +++ openacs-4/packages/dotlrn-admin/www/admin/users-bulk-upload-2.tcl 1 Mar 2005 00:01:28 -0000 1.2 @@ -28,7 +28,7 @@ # Prepare stuff set headers {first_names last_name email} -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] set admin_email [db_string select_admin_email { select email from parties Index: openacs-4/packages/dotlrn-bboard/www/alerts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bboard/www/alerts.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/dotlrn-bboard/www/alerts.tcl 18 Mar 2002 04:26:46 -0000 1.1 +++ openacs-4/packages/dotlrn-bboard/www/alerts.tcl 1 Mar 2005 00:01:28 -0000 1.2 @@ -11,9 +11,9 @@ thread_subs:multirow } -ad_maybe_redirect_for_registration +auth::require_login -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # three sorts of subscriptions: # forums Index: openacs-4/packages/dotlrn-fs/www/all-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/all-objects.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/dotlrn-fs/www/all-objects.tcl 4 Dec 2002 09:52:16 -0000 1.13 +++ openacs-4/packages/dotlrn-fs/www/all-objects.tcl 1 Mar 2005 00:01:29 -0000 1.14 @@ -35,7 +35,7 @@ table:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set days_singular_or_plural [ad_decode $n_past_days "1" [_ dotlrn-fs.day] [_ dotlrn-fs.days]] Index: openacs-4/packages/download/tcl/download-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/tcl/download-procs.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/download/tcl/download-procs.tcl 1 Nov 2003 08:45:38 -0000 1.11 +++ openacs-4/packages/download/tcl/download-procs.tcl 1 Mar 2005 00:01:29 -0000 1.12 @@ -124,7 +124,7 @@ ns_log Debug "download_file_downloader: downloading $revision_id" - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] set download_ip [ad_conn peeraddr] if [catch { set download_hostname [ns_hostbyaddr $download_ip] Index: openacs-4/packages/download/www/archive-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/download/www/archive-add.tcl 10 Sep 2002 22:22:34 -0000 1.3 +++ openacs-4/packages/download/www/archive-add.tcl 1 Mar 2005 00:01:29 -0000 1.4 @@ -9,9 +9,9 @@ {return_url "[ad_conn package_url]"} } -ad_maybe_redirect_for_registration +auth::require_login set context {"Add an Archive"} -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set repository [download_repository_info] set repository_id $repository(repository_id) Index: openacs-4/packages/download/www/archive-version-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-version-add.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/www/archive-version-add.tcl 24 Feb 2005 13:33:11 -0000 1.4 +++ openacs-4/packages/download/www/archive-version-add.tcl 1 Mar 2005 00:01:29 -0000 1.5 @@ -13,7 +13,7 @@ set return_url "[ad_conn package_url]/one-archive?archive_id=$archive_id" } -ad_maybe_redirect_for_registration +auth::require_login set repository_id [download_repository_id] ad_require_permission $archive_id write Index: openacs-4/packages/download/www/download-verify.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/download-verify.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/download/www/download-verify.tcl 24 Feb 2005 13:33:11 -0000 1.7 +++ openacs-4/packages/download/www/download-verify.tcl 1 Mar 2005 00:01:29 -0000 1.8 @@ -8,10 +8,10 @@ revision_id:integer,notnull } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set repository_id [download_repository_id] -ad_maybe_redirect_for_registration +auth::require_login ad_require_permission $revision_id "read" set admin_p [ad_permission_p $repository_id admin] Index: openacs-4/packages/download/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/download/www/index.tcl 24 Feb 2005 13:33:11 -0000 1.7 +++ openacs-4/packages/download/www/index.tcl 1 Mar 2005 00:01:29 -0000 1.8 @@ -19,7 +19,7 @@ } set return_url "[ad_conn url]?[ad_conn query]" -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set repository [download_repository_info] set repository_id $repository(repository_id) Index: openacs-4/packages/download/www/admin/approve-or-reject-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 18 Sep 2002 13:06:33 -0000 1.4 +++ openacs-4/packages/download/www/admin/approve-or-reject-2.tcl 1 Mar 2005 00:01:29 -0000 1.5 @@ -20,7 +20,7 @@ array set repository_info [download_repository_info] set repository_id $repository_info(repository_id) -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $repository_id "admin" Index: openacs-4/packages/download/www/admin/export-csv.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/export-csv.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/download/www/admin/export-csv.tcl 22 May 2001 04:17:45 -0000 1.2 +++ openacs-4/packages/download/www/admin/export-csv.tcl 1 Mar 2005 00:01:29 -0000 1.3 @@ -12,7 +12,7 @@ sql_query:verify } -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] # Header for CSV file set csv_rows "\"User Name\",\"Version\",\"Download Date\",\"From IP\",\"From Hostname\",\"Download Reason\"\n" Index: openacs-4/packages/download/www/admin/repository-ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-ae.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/repository-ae.tcl 18 Sep 2002 13:06:33 -0000 1.4 +++ openacs-4/packages/download/www/admin/repository-ae.tcl 1 Mar 2005 00:01:29 -0000 1.5 @@ -10,7 +10,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $package_id "admin" form create ae_repository Index: openacs-4/packages/download/www/admin/repository-reasons-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons-edit.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/repository-reasons-edit.tcl 18 Sep 2002 13:06:33 -0000 1.4 +++ openacs-4/packages/download/www/admin/repository-reasons-edit.tcl 1 Mar 2005 00:01:29 -0000 1.5 @@ -9,7 +9,7 @@ } set repository_id [download_repository_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $repository_id "admin" Index: openacs-4/packages/download/www/admin/repository-types-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types-edit.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/repository-types-edit.tcl 18 Sep 2002 13:06:33 -0000 1.4 +++ openacs-4/packages/download/www/admin/repository-types-edit.tcl 1 Mar 2005 00:01:29 -0000 1.5 @@ -9,7 +9,7 @@ } set repository_id [download_repository_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $repository_id "admin" Index: openacs-4/packages/download/www/admin/spam-users-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/spam-users-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/download/www/admin/spam-users-2.tcl 16 Jan 2003 13:46:20 -0000 1.5 +++ openacs-4/packages/download/www/admin/spam-users-2.tcl 1 Mar 2005 00:01:29 -0000 1.6 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] "admin" -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set page_content "[ad_header "Spam Downloaders"] Index: openacs-4/packages/download/www/admin/spam-users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/spam-users.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/download/www/admin/spam-users.tcl 16 Jan 2003 13:46:20 -0000 1.4 +++ openacs-4/packages/download/www/admin/spam-users.tcl 1 Mar 2005 00:01:29 -0000 1.5 @@ -15,7 +15,7 @@ } ad_require_permission [ad_conn package_id] "admin" -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # get name, email and # remove any users who don't want spam Index: openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl 26 Feb 2005 17:52:21 -0000 1.9 +++ openacs-4/packages/ecommerce/tcl/ecommerce-ssl-procs.tcl 1 Mar 2005 00:01:29 -0000 1.10 @@ -156,8 +156,8 @@ } { uplevel { # wtem@olywa.net, 2001-03-22 - # made this simpler by relying on ad_secure_conn_p - if {![ad_secure_conn_p]} { + # made this simpler by relying on security::secure_conn_p + if {![security::secure_conn_p]} { # see if ssl is installed # replaced security::https_available_p with ec_ssl_available_p # which detects nsopenssl @@ -180,7 +180,7 @@ # grab the user_id # 0 if user is not logged in - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] # grab the current user_session_id # otherwise we lose the session Index: openacs-4/packages/ecommerce/www/account.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/account.tcl 13 Jan 2005 13:57:57 -0000 1.7 +++ openacs-4/packages/ecommerce/www/account.tcl 1 Mar 2005 00:01:30 -0000 1.8 @@ -11,7 +11,7 @@ usca_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/address-international-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/address-international-2.tcl 13 Jan 2005 13:57:57 -0000 1.6 +++ openacs-4/packages/ecommerce/www/address-international-2.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -53,7 +53,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/billing.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/billing.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -15,7 +15,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl 13 Jan 2005 13:57:58 -0000 1.7 +++ openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl 1 Mar 2005 00:01:30 -0000 1.8 @@ -40,7 +40,7 @@ set user_session_id [ec_get_user_session_id] # see if they're logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { $user_id != 0 } { set user_name [db_string get_user_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl 8 Mar 2004 19:46:11 -0000 1.6 +++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -41,7 +41,7 @@ # See if they're logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { $user_id != 0 } { set user_name [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/category-browse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/category-browse.tcl 11 Mar 2004 04:11:52 -0000 1.9 +++ openacs-4/packages/ecommerce/www/category-browse.tcl 1 Mar 2005 00:01:30 -0000 1.10 @@ -71,7 +71,7 @@ set user_session_id [ec_get_user_session_id] # see if they're logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { $user_id != 0 } { set user_name [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/checkout-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/ecommerce/www/checkout-2.tcl 10 Dec 2002 20:06:18 -0000 1.11 +++ openacs-4/packages/ecommerce/www/checkout-2.tcl 1 Mar 2005 00:01:30 -0000 1.12 @@ -17,7 +17,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/checkout-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-3.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/checkout-3.tcl 13 Jan 2005 13:57:58 -0000 1.8 +++ openacs-4/packages/ecommerce/www/checkout-3.tcl 1 Mar 2005 00:01:30 -0000 1.9 @@ -31,7 +31,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -71,7 +71,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_url_vars creditcard_number creditcard_type creditcard_expire_1 creditcard_expire_2]." ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/credit-card-correction.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/credit-card-correction.tcl 13 Jan 2005 13:57:59 -0000 1.7 +++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl 1 Mar 2005 00:01:30 -0000 1.8 @@ -32,7 +32,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" # this page gets referred from numerous locations where user should already be logged in. Index: openacs-4/packages/ecommerce/www/finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/finalize-order.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/finalize-order.tcl 13 Jan 2005 13:57:59 -0000 1.8 +++ openacs-4/packages/ecommerce/www/finalize-order.tcl 1 Mar 2005 00:01:30 -0000 1.9 @@ -36,7 +36,7 @@ # or cookie surgery to get here # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 1 Mar 2005 00:01:30 -0000 1.6 @@ -21,7 +21,7 @@ # User must be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -13,7 +13,7 @@ } # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" Index: openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -11,7 +11,7 @@ } # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 10 Dec 2002 20:06:18 -0000 1.8 +++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 1 Mar 2005 00:01:30 -0000 1.9 @@ -58,7 +58,7 @@ # User must be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl 1 Mar 2005 00:01:30 -0000 1.6 @@ -15,7 +15,7 @@ # User must be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set email "" set mightbe "" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -28,7 +28,7 @@ # User must be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -30,7 +30,7 @@ # User must be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # Error checking Index: openacs-4/packages/ecommerce/www/gift-certificate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/gift-certificate.tcl 11 Dec 2003 21:40:02 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate.tcl 1 Mar 2005 00:01:30 -0000 1.7 @@ -15,7 +15,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/index.tcl 13 Jan 2005 13:57:59 -0000 1.7 +++ openacs-4/packages/ecommerce/www/index.tcl 1 Mar 2005 00:01:30 -0000 1.8 @@ -20,7 +20,7 @@ # see if they're logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { $user_id != 0 } { set user_name [db_string get_user_name "select first_names || ' ' || last_name from cc_users where user_id=:user_id"] } else { Index: openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl 13 Jan 2005 13:57:59 -0000 1.6 +++ openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl 1 Mar 2005 00:01:31 -0000 1.7 @@ -21,7 +21,7 @@ usca_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_form_vars category_id subcategory_id subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/mailing-list-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/mailing-list-add.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/mailing-list-add.tcl 1 Mar 2005 00:01:31 -0000 1.6 @@ -21,7 +21,7 @@ usca_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set return_url "[ec_url]mailing-list-add-2?[export_url_vars category_id subcategory_id subsubcategory_id]" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/mailing-list-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-remove.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/mailing-list-remove.tcl 13 Jan 2005 13:57:59 -0000 1.6 +++ openacs-4/packages/ecommerce/www/mailing-list-remove.tcl 1 Mar 2005 00:01:31 -0000 1.7 @@ -17,7 +17,7 @@ usca_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_form_vars category_id subcategory_id subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/order.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/order.tcl 1 Mar 2005 00:01:31 -0000 1.6 @@ -18,7 +18,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/ecommerce/www/payment.tcl 9 Mar 2004 00:51:25 -0000 1.11 +++ openacs-4/packages/ecommerce/www/payment.tcl 1 Mar 2005 00:01:31 -0000 1.12 @@ -18,7 +18,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 10 Dec 2002 20:06:18 -0000 1.9 +++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 1 Mar 2005 00:01:31 -0000 1.10 @@ -47,7 +47,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set form [ns_conn form] if { ![empty_string_p $form] } { Index: openacs-4/packages/ecommerce/www/process-payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-payment.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/process-payment.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/process-payment.tcl 1 Mar 2005 00:01:31 -0000 1.7 @@ -43,7 +43,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/product-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/product-search.tcl 24 Feb 2005 13:33:14 -0000 1.8 +++ openacs-4/packages/ecommerce/www/product-search.tcl 1 Mar 2005 00:01:31 -0000 1.9 @@ -20,7 +20,7 @@ usca_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # Is search request originating from a page from this site? # if not, cookies are created for each image, so consider skiping presenting images Index: openacs-4/packages/ecommerce/www/product.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/product.tcl 13 Jan 2005 13:58:00 -0000 1.9 +++ openacs-4/packages/ecommerce/www/product.tcl 1 Mar 2005 00:01:31 -0000 1.10 @@ -39,7 +39,7 @@ # Users don't need to be logged in but if they are the could get a # lower price -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # user sessions: # 1. get user_session_id from cookie Index: openacs-4/packages/ecommerce/www/review-submit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/review-submit-2.tcl 13 Jan 2005 13:58:00 -0000 1.6 +++ openacs-4/packages/ecommerce/www/review-submit-2.tcl 1 Mar 2005 00:01:31 -0000 1.7 @@ -21,7 +21,7 @@ } # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/review-submit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/review-submit-3.tcl 13 Jan 2005 13:58:00 -0000 1.7 +++ openacs-4/packages/ecommerce/www/review-submit-3.tcl 1 Mar 2005 00:01:31 -0000 1.8 @@ -23,7 +23,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { if [info exists usca_p] { set return_url "[ad_conn url]?[export_url_vars product_id rating one_line_summary user_comment comment_id usca_p]" Index: openacs-4/packages/ecommerce/www/review-submit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/review-submit.tcl 8 Mar 2004 19:46:11 -0000 1.7 +++ openacs-4/packages/ecommerce/www/review-submit.tcl 1 Mar 2005 00:01:31 -0000 1.8 @@ -16,7 +16,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]?[export_url_vars product_id usca_p]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/select-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/ecommerce/www/select-shipping.tcl 8 Mar 2004 19:46:11 -0000 1.10 +++ openacs-4/packages/ecommerce/www/select-shipping.tcl 1 Mar 2005 00:01:31 -0000 1.11 @@ -20,7 +20,7 @@ # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl 8 Mar 2004 19:46:11 -0000 1.7 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl 1 Mar 2005 00:01:31 -0000 1.8 @@ -15,7 +15,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 10 Dec 2002 20:06:18 -0000 1.8 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 1 Mar 2005 00:01:31 -0000 1.9 @@ -25,7 +25,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl 1 Mar 2005 00:01:31 -0000 1.6 @@ -14,7 +14,7 @@ } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set return_url "[ec_url]shopping-cart-retrieve-2" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl 1 Mar 2005 00:01:31 -0000 1.6 @@ -9,7 +9,7 @@ } { } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart-save.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/shopping-cart-save.tcl 10 Dec 2002 20:06:18 -0000 1.5 +++ openacs-4/packages/ecommerce/www/shopping-cart-save.tcl 1 Mar 2005 00:01:31 -0000 1.6 @@ -12,7 +12,7 @@ } { } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set return_url "[ec_url]shopping-cart-save-2" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/shopping-cart.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.tcl,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/ecommerce/www/shopping-cart.tcl 24 Feb 2005 13:33:14 -0000 1.14 +++ openacs-4/packages/ecommerce/www/shopping-cart.tcl 1 Mar 2005 00:01:31 -0000 1.15 @@ -33,7 +33,7 @@ set last_name "" set email "" -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { $user_id != 0 } { ad_get_user_info } Index: openacs-4/packages/ecommerce/www/thank-you.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/thank-you.tcl 10 Dec 2002 20:06:18 -0000 1.6 +++ openacs-4/packages/ecommerce/www/thank-you.tcl 1 Mar 2005 00:01:31 -0000 1.7 @@ -16,7 +16,7 @@ # We need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "[ad_conn package_url]register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/track.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/track.tcl 10 Dec 2002 20:06:18 -0000 1.8 +++ openacs-4/packages/ecommerce/www/track.tcl 1 Mar 2005 00:01:31 -0000 1.9 @@ -13,7 +13,7 @@ ucsa_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/update-user-classes-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 8 Mar 2004 19:46:11 -0000 1.7 +++ openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 1 Mar 2005 00:01:31 -0000 1.8 @@ -14,7 +14,7 @@ } set user_class_id_list $user_class_id -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set ip_address [ns_conn peeraddr] if {$user_id == 0} { set return_url "[ad_conn url]" Index: openacs-4/packages/ecommerce/www/update-user-classes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/update-user-classes.tcl 8 Mar 2004 19:46:11 -0000 1.8 +++ openacs-4/packages/ecommerce/www/update-user-classes.tcl 1 Mar 2005 00:01:31 -0000 1.9 @@ -11,7 +11,7 @@ usca_p:optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -26,7 +26,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl 8 Mar 2004 19:46:13 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.8 @@ -20,7 +20,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -16,7 +16,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -14,7 +14,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl 8 Mar 2004 19:46:13 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.8 @@ -25,7 +25,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -13,7 +13,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -20,7 +20,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl 8 Mar 2004 19:46:13 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.8 @@ -28,7 +28,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -23,7 +23,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl 18 Sep 2002 21:33:47 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -24,7 +24,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl 18 Sep 2002 21:33:49 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.5 @@ -22,7 +22,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 18 Sep 2002 21:33:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -19,7 +19,7 @@ # # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 18 Sep 2002 21:33:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -25,7 +25,7 @@ ad_require_permission [ad_conn package_id] admin -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl 18 Sep 2002 21:33:51 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl 1 Mar 2005 00:01:32 -0000 1.4 @@ -20,7 +20,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] if {$admin_user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl 9 Mar 2004 00:59:50 -0000 1.8 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl 1 Mar 2005 00:01:33 -0000 1.9 @@ -26,7 +26,7 @@ # The customer service rep must be logged on. -ad_maybe_redirect_for_registration +auth::require_login set customer_service_rep [ad_get_user_id] if { ![empty_string_p $carrier_other] } { Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 24 Feb 2005 13:33:14 -0000 1.11 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 1 Mar 2005 00:01:34 -0000 1.12 @@ -43,8 +43,8 @@ # The customer service rep must be logged on -ad_maybe_redirect_for_registration -set customer_service_rep [ad_verify_and_get_user_id] +auth::require_login +set customer_service_rep [ad_conn user_id] # Doubleclick protection Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl 9 Mar 2004 00:59:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] admin -ad_maybe_redirect_for_registration +auth::require_login set user_id [db_string user_id_select " select user_id Index: openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl 10 Sep 2002 22:22:43 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/orders/void-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] admin -ad_maybe_redirect_for_registration +auth::require_login set customer_service_rep [ad_get_user_id] db_transaction { Index: openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl 18 Sep 2002 21:33:52 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -13,7 +13,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/products/add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-4.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/products/add-4.tcl 18 Sep 2002 21:33:53 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/products/add-4.tcl 1 Mar 2005 00:01:34 -0000 1.6 @@ -48,7 +48,7 @@ # being added) # we need them to be logged in -ad_maybe_redirect_for_registration +auth::require_login set user_id [ad_get_user_id] set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl 10 Sep 2002 22:22:45 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/offer-delete-2.tcl 1 Mar 2005 00:01:34 -0000 1.3 @@ -15,7 +15,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl 10 Dec 2002 20:05:31 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl 1 Mar 2005 00:01:34 -0000 1.5 @@ -33,7 +33,7 @@ # We need them to be logged in -ad_maybe_redirect_for_registration +auth::require_login set user_id [ad_get_user_id] set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 18 Sep 2002 21:33:54 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -36,7 +36,7 @@ # # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 18 Sep 2002 21:33:54 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -60,7 +60,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl 18 Sep 2002 21:33:55 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -14,7 +14,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 18 Sep 2002 21:33:56 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -19,7 +19,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 18 Sep 2002 21:33:56 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 1 Mar 2005 00:01:34 -0000 1.4 @@ -30,7 +30,7 @@ ad_script_abort } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/form-custom.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl 18 Sep 2002 21:33:56 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -11,8 +11,8 @@ ad_page_variables {item item_group return_url {item_original {}} {delete_the_set 0}} set db [ns_db gethandle] -set user_id [ad_verify_and_get_user_id] -ad_maybe_redirect_for_registration +set user_id [ad_conn user_id] +auth::require_login set item_type {slider_custom} set value_type {keyval} Index: openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/sort-custom.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl 18 Sep 2002 21:33:56 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -10,8 +10,8 @@ ad_page_variables {item item_group return_url {delete_the_sort 0} {col -multiple-list} {dir -multiple-list} {item_original {}}} set db [ns_db gethandle] -set user_id [ad_verify_and_get_user_id] -ad_maybe_redirect_for_registration +set user_id [ad_conn user_id] +auth::require_login set item_type {table_sort} set value_type {list} Index: openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/table-custom.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl 18 Sep 2002 21:33:56 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -9,8 +9,8 @@ ad_page_variables {item item_group return_url {delete_the_view 0} {col -multiple-list} {item_original {}}} set db [ns_db gethandle] -set user_id [ad_verify_and_get_user_id] -ad_maybe_redirect_for_registration +set user_id [ad_conn user_id] +auth::require_login set item_type {table_view} set value_type {list} Index: openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 18 Sep 2002 21:33:57 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -15,7 +15,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 18 Sep 2002 21:33:57 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -17,7 +17,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] if {$admin_user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl 18 Sep 2002 21:33:57 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -12,7 +12,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$user_id == 0} { Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 18 Sep 2002 21:33:57 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -16,7 +16,7 @@ ad_require_permission [ad_conn package_id] admin # we need them to be logged in -set admin_user_id [ad_verify_and_get_user_id] +set admin_user_id [ad_conn user_id] if {$admin_user_id == 0} { Index: openacs-4/packages/ecommerce/www/doc/audit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/audit.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/audit.tcl 10 Dec 2002 20:05:21 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/audit.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl 10 Dec 2002 20:05:21 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -15,7 +15,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl 10 Dec 2002 20:05:21 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl 10 Dec 2002 20:05:21 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl 10 Dec 2002 20:05:21 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-operation.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl 10 Dec 2002 20:05:21 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-setup.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl 10 Dec 2002 20:05:21 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/ecommerce-technical.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/froogle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/froogle.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/froogle.tcl 24 Jul 2004 08:34:18 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/froogle.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/doc/index.tcl 10 Dec 2002 20:05:21 -0000 1.3 +++ openacs-4/packages/ecommerce/www/doc/index.tcl 1 Mar 2005 00:01:35 -0000 1.4 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Ecommerce" set title "$package_name Documentation" Index: openacs-4/packages/ecommerce/www/doc/license.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/license.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/license.tcl 10 Dec 2002 20:05:21 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/license.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Ecommerce" set title "$package_name License" Index: openacs-4/packages/ecommerce/www/doc/porting-diary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/porting-diary.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/porting-diary.tcl 10 Dec 2002 20:05:21 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/porting-diary.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/ecommerce/www/doc/release.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/release.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/doc/release.tcl 10 Dec 2002 20:05:21 -0000 1.2 +++ openacs-4/packages/ecommerce/www/doc/release.tcl 1 Mar 2005 00:01:35 -0000 1.3 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for read privileges Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 13 Sep 2004 21:30:22 -0000 1.14 +++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl 1 Mar 2005 00:01:35 -0000 1.15 @@ -5,7 +5,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] set base_url [ad_conn package_url] Index: openacs-4/packages/evaluation/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/tasks-chunk.tcl,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/evaluation/lib/tasks-chunk.tcl 10 Sep 2004 19:16:28 -0000 1.14 +++ openacs-4/packages/evaluation/lib/tasks-chunk.tcl 1 Mar 2005 00:01:35 -0000 1.15 @@ -5,7 +5,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] db_1row grade_names { *SQL* } Index: openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl 24 Jan 2005 15:12:38 -0000 1.17 +++ openacs-4/packages/evaluation/tcl/apm-callback-procs.tcl 1 Mar 2005 00:01:35 -0000 1.18 @@ -169,7 +169,7 @@ } { - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] set exams_name "[_ evaluation.Exams_]" set exams_singular_name "[_ evaluation.Exam]" Index: openacs-4/packages/evaluation/tcl/evaluation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-procs.tcl,v diff -u -N -r1.25 -r1.26 --- openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 26 Feb 2005 19:09:22 -0000 1.25 +++ openacs-4/packages/evaluation/tcl/evaluation-procs.tcl 1 Mar 2005 00:01:35 -0000 1.26 @@ -222,7 +222,7 @@ if { [empty_string_p $package_id] } { set package_id [ad_conn package_id] } - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] set creation_date [db_string get_date { *SQL* }] set item_name "${content_type}_${item_id}" @@ -433,7 +433,7 @@ } { set package_id [ad_conn package_id] - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] set item_name "${item_id}_${title}" @@ -495,7 +495,7 @@ } { set package_id [ad_conn package_id] - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] set creation_date [db_string get_date { *SQL* }] set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] @@ -574,7 +574,7 @@ } { set package_id [ad_conn package_id] - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_date [db_string get_date { *SQL* }] set creation_ip [ad_conn peeraddr] set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] @@ -629,7 +629,7 @@ if { [empty_string_p $context] } { set context [ad_conn package_id] } - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] if { [empty_string_p $creation_date] } { @@ -683,7 +683,7 @@ } { set package_id [ad_conn package_id] - set creation_user [ad_verify_and_get_user_id] + set creation_user [ad_conn user_id] set creation_ip [ad_conn peeraddr] set folder_id [content::item::get_id -item_path "${content_type}_${package_id}" -resolve_index {f}] set item_name "${item_id}_${title}" Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 22 Dec 2004 22:06:40 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl 1 Mar 2005 00:01:36 -0000 1.8 @@ -13,7 +13,7 @@ {return_url "index"} } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set page_title "[_ evaluation.lt_Delete_Assignment_Typ]" Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 13 Sep 2004 21:29:46 -0000 1.11 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 1 Mar 2005 00:01:36 -0000 1.12 @@ -5,7 +5,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] set base_url "[ad_conn package_url][evaluation::package_key]/" Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 11 Sep 2004 00:41:09 -0000 1.10 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 1 Mar 2005 00:01:36 -0000 1.11 @@ -5,7 +5,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] db_1row grade_names { *SQL* } Index: openacs-4/packages/ezic-gateway/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ezic-gateway/www/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ezic-gateway/www/index.tcl 5 Jan 2005 19:54:12 -0000 1.1 +++ openacs-4/packages/ezic-gateway/www/index.tcl 1 Mar 2005 00:01:36 -0000 1.2 @@ -15,7 +15,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/ezic-gateway/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ezic-gateway/www/admin/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ezic-gateway/www/admin/index.tcl 5 Jan 2005 19:54:12 -0000 1.1 +++ openacs-4/packages/ezic-gateway/www/admin/index.tcl 1 Mar 2005 00:01:36 -0000 1.2 @@ -16,7 +16,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/ezic-gateway/www/doc/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ezic-gateway/www/doc/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ezic-gateway/www/doc/index.tcl 5 Jan 2005 19:54:13 -0000 1.1 +++ openacs-4/packages/ezic-gateway/www/doc/index.tcl 1 Mar 2005 00:01:36 -0000 1.2 @@ -16,7 +16,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "EZIC Gateway" set title "$package_name Package Documentation" Index: openacs-4/packages/ezic-gateway/www/doc/license.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ezic-gateway/www/doc/license.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ezic-gateway/www/doc/license.tcl 5 Jan 2005 19:54:13 -0000 1.1 +++ openacs-4/packages/ezic-gateway/www/doc/license.tcl 1 Mar 2005 00:01:36 -0000 1.2 @@ -16,7 +16,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Authorize.net Gateway" set title "$package_name License" Index: openacs-4/packages/faq/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/faq/www/index.tcl 19 May 2004 20:07:02 -0000 1.6 +++ openacs-4/packages/faq/www/index.tcl 1 Mar 2005 00:01:36 -0000 1.7 @@ -21,7 +21,7 @@ set context {} -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $package_id faq_view_faq Index: openacs-4/packages/faq/www/one-faq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/faq/www/one-faq.tcl 12 Aug 2004 13:57:45 -0000 1.4 +++ openacs-4/packages/faq/www/one-faq.tcl 1 Mar 2005 00:01:36 -0000 1.5 @@ -15,7 +15,7 @@ set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $package_id faq_view_faq Index: openacs-4/packages/faq/www/one-question.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/faq/www/one-question.tcl 7 Nov 2002 08:13:53 -0000 1.3 +++ openacs-4/packages/faq/www/one-question.tcl 1 Mar 2005 00:01:36 -0000 1.4 @@ -16,7 +16,7 @@ ad_require_permission $package_id faq_view_faq -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row q_and_a_info "select question, answer,faq_name, f.faq_id from faq_q_and_as qa, faqs f Index: openacs-4/packages/faq/www/admin/faq-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/faq/www/admin/faq-new-2.tcl 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/faq/www/admin/faq-new-2.tcl 1 Mar 2005 00:01:36 -0000 1.2 @@ -17,7 +17,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn host] ad_require_permission $package_id faq_create_faq Index: openacs-4/packages/faq/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/faq/www/admin/index.tcl 12 Aug 2004 13:57:43 -0000 1.8 +++ openacs-4/packages/faq/www/admin/index.tcl 1 Mar 2005 00:01:36 -0000 1.9 @@ -23,7 +23,7 @@ set context {} -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] template::list::create \ -name faqs \ Index: openacs-4/packages/faq/www/admin/one-faq.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/faq/www/admin/one-faq.tcl 28 Nov 2003 16:55:15 -0000 1.4 +++ openacs-4/packages/faq/www/admin/one-faq.tcl 1 Mar 2005 00:01:36 -0000 1.5 @@ -16,7 +16,7 @@ set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -object_id $package_id -privilege faq_admin_faq Index: openacs-4/packages/faq/www/admin/one-question.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/faq/www/admin/one-question.tcl 12 Aug 2004 13:57:43 -0000 1.5 +++ openacs-4/packages/faq/www/admin/one-question.tcl 1 Mar 2005 00:01:36 -0000 1.6 @@ -17,7 +17,7 @@ set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -object_id $package_id -privilege faq_admin_faq Index: openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl 12 Aug 2004 13:57:43 -0000 1.5 +++ openacs-4/packages/faq/www/admin/q-and-a-add-edit.tcl 1 Mar 2005 00:01:36 -0000 1.6 @@ -39,7 +39,7 @@ set insert_p "f" set question_q [ad_quotehtml $question] set answer_q [ad_quotehtml $answer] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn host] # Are categories used? Index: openacs-4/packages/faq/www/admin/q_and_a-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/faq/www/admin/q_and_a-edit.tcl 7 Nov 2002 08:13:54 -0000 1.4 +++ openacs-4/packages/faq/www/admin/q_and_a-edit.tcl 1 Mar 2005 00:01:36 -0000 1.5 @@ -21,7 +21,7 @@ set action "q_and_a-edit-2" set submit_label [_ faq.Update_This_QA] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row q_and_a_info "select question, answer,faq_name,qa.faq_id from faq_q_and_as qa, faqs f Index: openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl 12 Mar 2004 13:45:34 -0000 1.3 +++ openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl 1 Mar 2005 00:01:36 -0000 1.4 @@ -20,7 +20,7 @@ ad_require_permission $package_id faq_create_faq -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn host] if {$insert_p == "t" } { Index: openacs-4/packages/file-manager/www/file-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-edit-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/file-manager/www/file-edit-2.tcl 1 Sep 2003 23:21:27 -0000 1.5 +++ openacs-4/packages/file-manager/www/file-edit-2.tcl 1 Mar 2005 00:01:37 -0000 1.6 @@ -46,7 +46,7 @@ if [ad_parameter VersionControlP file-manager 0] { # get the editor's name and email address for the log - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] db_1row user_info { select pe.first_names || ' ' || pe.last_name as name, Index: openacs-4/packages/forums/lib/forums/forums-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/forums/lib/forums/forums-chunk.tcl 24 Feb 2005 13:33:19 -0000 1.4 +++ openacs-4/packages/forums/lib/forums/forums-chunk.tcl 1 Mar 2005 00:01:37 -0000 1.5 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [permission::permission_p -object_id $package_id -privilege admin] Index: openacs-4/packages/forums/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/forums/www/index.tcl 1 Apr 2004 16:14:30 -0000 1.11 +++ openacs-4/packages/forums/www/index.tcl 1 Mar 2005 00:01:37 -0000 1.12 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin] set searchbox_p [parameter::get -parameter ForumsSearchBoxP -package_id $package_id -default 1] Index: openacs-4/packages/gatekeeper/tcl/gatekeeper-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/gatekeeper/tcl/gatekeeper-procs.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/gatekeeper/tcl/gatekeeper-procs.tcl 1 Nov 2003 08:45:38 -0000 1.4 +++ openacs-4/packages/gatekeeper/tcl/gatekeeper-procs.tcl 1 Mar 2005 00:01:37 -0000 1.5 @@ -308,7 +308,7 @@ The main entry point for the gatekeeper codes. Serve a foreign request with security access control and url remapping. } { - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] set url "/[ad_conn extra_url]" if { ![empty_string_p [ad_conn query]] } { append url "?[ad_conn query]" Index: openacs-4/packages/general-comments/www/comment-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-3.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/general-comments/www/comment-add-3.tcl 14 Sep 2002 15:23:12 -0000 1.6 +++ openacs-4/packages/general-comments/www/comment-add-3.tcl 1 Mar 2005 00:01:37 -0000 1.7 @@ -20,7 +20,7 @@ } # authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # check to see if the user can create comments on this object ad_require_permission $object_id general_comments_create Index: openacs-4/packages/general-comments/www/comment-edit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit-3.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/general-comments/www/comment-edit-3.tcl 31 Oct 2001 20:42:07 -0000 1.3 +++ openacs-4/packages/general-comments/www/comment-edit-3.tcl 1 Mar 2005 00:01:37 -0000 1.4 @@ -19,7 +19,7 @@ ad_require_permission $comment_id write # authenticate the user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # insert the revision into the database set is_live [ad_parameter AutoApproveCommentsP {general-comments} {t}] Index: openacs-4/packages/general-comments/www/file-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-add-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/general-comments/www/file-add-2.tcl 17 May 2003 10:45:05 -0000 1.5 +++ openacs-4/packages/general-comments/www/file-add-2.tcl 1 Mar 2005 00:01:37 -0000 1.6 @@ -40,7 +40,7 @@ # authenticate the user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # check to see if the user can create comments ad_require_permission $parent_id write Index: openacs-4/packages/general-comments/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/general-comments/www/index.tcl 24 Jan 2005 00:40:36 -0000 1.6 +++ openacs-4/packages/general-comments/www/index.tcl 1 Mar 2005 00:01:37 -0000 1.7 @@ -17,7 +17,7 @@ } # authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # check for admin privileges set package_id [ad_conn package_id] Index: openacs-4/packages/general-comments/www/url-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-add-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/general-comments/www/url-add-2.tcl 7 Nov 2002 08:32:49 -0000 1.3 +++ openacs-4/packages/general-comments/www/url-add-2.tcl 1 Mar 2005 00:01:37 -0000 1.4 @@ -23,7 +23,7 @@ } # authenticate the user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # check to see if the user can add an attachment ad_require_permission $parent_id write Index: openacs-4/packages/general-comments/www/url-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-edit-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/general-comments/www/url-edit-2.tcl 14 Jun 2001 19:52:22 -0000 1.2 +++ openacs-4/packages/general-comments/www/url-edit-2.tcl 1 Mar 2005 00:01:37 -0000 1.3 @@ -16,7 +16,7 @@ } # authenticate the user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # check to see if the user can edit this attachment ad_require_permission $attach_id write Index: openacs-4/packages/jabber/www/add-external-contact-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/add-external-contact-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/add-external-contact-2.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/add-external-contact-2.tcl 1 Mar 2005 00:01:37 -0000 1.2 @@ -18,7 +18,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login db_foreach get_services "" { Index: openacs-4/packages/jabber/www/buddy-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/buddy-add.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/buddy-add.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/buddy-add.tcl 1 Mar 2005 00:01:37 -0000 1.2 @@ -13,7 +13,7 @@ } set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login set user_id_friend $friend_id #if {[db_0or1row is_blocked "select blocked from jb_friends where user_id = :user_id and user_id_friend= :user_id_friend"]} { Index: openacs-4/packages/jabber/www/chat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/chat.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/chat.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/chat.tcl 1 Mar 2005 00:01:37 -0000 1.2 @@ -10,7 +10,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login db_foreach get_screens "" { if {$cur == $user_id} { Index: openacs-4/packages/jabber/www/current-users-online.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/current-users-online.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/current-users-online.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/current-users-online.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -22,7 +22,7 @@ set context [list "Online users"] set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login set any_is_online_p 0 Index: openacs-4/packages/jabber/www/display-name.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/display-name.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/display-name.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/display-name.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -20,7 +20,7 @@ } set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login set im_service $trans_symbol Index: openacs-4/packages/jabber/www/edit-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/edit-user.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/edit-user.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/edit-user.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -16,7 +16,7 @@ set context [list "Edit contact information"] set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login db_1row get_name "" Index: openacs-4/packages/jabber/www/go-to-jabber.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/go-to-jabber.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/go-to-jabber.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/go-to-jabber.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -9,7 +9,7 @@ } set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login db_foreach get_screens {} { Index: openacs-4/packages/jabber/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/index.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/index.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -40,7 +40,7 @@ set return_url [ad_conn url] set context "" set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login set reg_need "0" set connstate [jb_getconnstate] Index: openacs-4/packages/jabber/www/jabber-auto-login-greenthumb-neu.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/jabber-auto-login-greenthumb-neu.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/jabber-auto-login-greenthumb-neu.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/jabber-auto-login-greenthumb-neu.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -29,7 +29,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login Index: openacs-4/packages/jabber/www/jabber-auto-login-greenthumb.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/jabber-auto-login-greenthumb.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/jabber-auto-login-greenthumb.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/jabber-auto-login-greenthumb.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -29,7 +29,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login Index: openacs-4/packages/jabber/www/jabber-auto-login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/jabber-auto-login.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/jabber-auto-login.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/jabber-auto-login.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -29,7 +29,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login Index: openacs-4/packages/jabber/www/jabber-auto-webstart-applet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/jabber-auto-webstart-applet.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/jabber-auto-webstart-applet.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/jabber-auto-webstart-applet.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -22,7 +22,7 @@ } set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login Index: openacs-4/packages/jabber/www/jabber-webstart-auto-login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/jabber-webstart-auto-login.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/jabber-webstart-auto-login.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/jabber-webstart-auto-login.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -28,7 +28,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login Index: openacs-4/packages/jabber/www/message-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/message-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/message-2.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/message-2.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -23,7 +23,7 @@ } set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login if {[db_0or1row get_name "select first_names , last_name from persons where person_id =:user_id"]} { Index: openacs-4/packages/jabber/www/message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/message.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/message.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/message.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -22,7 +22,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login ad_form -name message -action message-2 -form { {screen:text(hidden) {value $screen}} Index: openacs-4/packages/jabber/www/remove-external-contact.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/remove-external-contact.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/remove-external-contact.tcl 20 Oct 2004 19:36:49 -0000 1.1 +++ openacs-4/packages/jabber/www/remove-external-contact.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -13,7 +13,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login db_dml remove_friend {} db_dml decrease_reference {} Index: openacs-4/packages/jabber/www/user-register.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/user-register.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/user-register.tcl 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/user-register.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -24,7 +24,7 @@ set user_id [ad_conn user_id] set creation_user [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/jabber/www/user-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/user-search.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/user-search.tcl 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/user-search.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -28,7 +28,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login multirow create partys person_id first_names last_name Index: openacs-4/packages/jabber/www/view-external-contacts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/view-external-contacts.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/view-external-contacts.tcl 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/view-external-contacts.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -15,7 +15,7 @@ set context [list "Edit External Contact"] set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login db_multirow get_external_friends get_external_friends {} { set row_check_p 1 Index: openacs-4/packages/jabber/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/admin/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/admin/index.tcl 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/admin/index.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -24,7 +24,7 @@ } set user_id [ad_conn user_id] - ad_maybe_redirect_for_registration + auth::require_login # define the different forms Index: openacs-4/packages/jabber/www/admin/message2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/admin/message2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/admin/message2.tcl 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/admin/message2.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -14,7 +14,7 @@ } set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login if {[db_0or1row get_name ""]} { Index: openacs-4/packages/jabber/www/admin/online-users.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber/www/admin/online-users.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber/www/admin/online-users.tcl 20 Oct 2004 19:36:50 -0000 1.1 +++ openacs-4/packages/jabber/www/admin/online-users.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -16,7 +16,7 @@ set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login Index: openacs-4/packages/jabber-portlet/www/jabber-portal.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber-portlet/www/jabber-portal.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber-portlet/www/jabber-portal.tcl 20 Oct 2004 19:43:21 -0000 1.1 +++ openacs-4/packages/jabber-portlet/www/jabber-portal.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -16,7 +16,7 @@ set return_url [ad_conn url] set context "" set user_id [ad_conn user_id] -ad_maybe_redirect_for_registration +auth::require_login set reg_need "0" set connstate [jb_getconnstate] set user_invisible [util::whos_online::check_invisible $user_id ] Index: openacs-4/packages/jabber-portlet/www/jabber-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/jabber-portlet/www/jabber-portlet.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/jabber-portlet/www/jabber-portlet.tcl 20 Oct 2004 19:43:21 -0000 1.1 +++ openacs-4/packages/jabber-portlet/www/jabber-portlet.tcl 1 Mar 2005 00:01:38 -0000 1.2 @@ -29,7 +29,7 @@ set reg_need "0" set not_registred false -ad_maybe_redirect_for_registration +auth::require_login if {$canonical_p == 1} { set connstate [jb_getconnstate] Index: openacs-4/packages/logger/www/log.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v diff -u -N -r1.28 -r1.29 --- openacs-4/packages/logger/www/log.tcl 13 Jan 2005 13:58:23 -0000 1.28 +++ openacs-4/packages/logger/www/log.tcl 1 Mar 2005 00:01:38 -0000 1.29 @@ -28,7 +28,7 @@ # TODO: Make the recent entries list start on the date of the last entry set package_id [ad_conn package_id] -set current_user_id [ad_maybe_redirect_for_registration] +set current_user_id [auth::require_login] set peeraddr [ad_conn peeraddr] if { [exists_and_not_null entry_id] && [logger::util::project_manager_linked_p]} { Index: openacs-4/packages/logger/www/project-select.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/project-select.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/logger/www/project-select.tcl 27 Feb 2004 17:43:52 -0000 1.3 +++ openacs-4/packages/logger/www/project-select.tcl 1 Mar 2005 00:01:38 -0000 1.4 @@ -9,7 +9,7 @@ @cvs-id $Id$ } -ad_maybe_redirect_for_registration +auth::require_login set page_title "Select Project to log entries in" set context [list $page_title] Index: openacs-4/packages/news/www/preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/news/www/preview.tcl 26 Feb 2005 17:52:22 -0000 1.13 +++ openacs-4/packages/news/www/preview.tcl 1 Mar 2005 00:01:39 -0000 1.14 @@ -91,7 +91,7 @@ edit_action:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_id [ad_conn package_id] # only people with at least write-permission beyond this point Index: openacs-4/packages/news-aggregator/www/aggregator.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/news-aggregator/www/aggregator.tcl 17 May 2004 15:31:08 -0000 1.3 +++ openacs-4/packages/news-aggregator/www/aggregator.tcl 1 Mar 2005 00:01:39 -0000 1.4 @@ -19,7 +19,7 @@ set page_title "Create aggregator" set context [list $page_title] -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] ad_form -name aggregator -select_query_name select_aggregator -form { {aggregator_id:integer(hidden),key} Index: openacs-4/packages/news-aggregator/www/item-save.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/item-save.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news-aggregator/www/item-save.tcl 20 Mar 2004 11:04:39 -0000 1.1 +++ openacs-4/packages/news-aggregator/www/item-save.tcl 1 Mar 2005 00:01:39 -0000 1.2 @@ -8,7 +8,7 @@ aggregator_id:naturalnum,notnull } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] db_1row aggregator_info "" Index: openacs-4/packages/news-aggregator/www/item-unsave.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/item-unsave.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news-aggregator/www/item-unsave.tcl 20 Mar 2004 11:04:39 -0000 1.1 +++ openacs-4/packages/news-aggregator/www/item-unsave.tcl 1 Mar 2005 00:01:39 -0000 1.2 @@ -8,7 +8,7 @@ aggregator_id:naturalnum,notnull } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] db_1row aggregator_info "" Index: openacs-4/packages/news-aggregator/www/opml-import-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news-aggregator/www/opml-import-2.tcl 20 Mar 2004 11:04:39 -0000 1.1 +++ openacs-4/packages/news-aggregator/www/opml-import-2.tcl 1 Mar 2005 00:01:39 -0000 1.2 @@ -17,7 +17,7 @@ set opml_url $url -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission \ -object_id $aggregator_id \ -party_id $user_id \ Index: openacs-4/packages/news-aggregator/www/opml-import-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import-3.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news-aggregator/www/opml-import-3.tcl 20 Mar 2004 11:04:39 -0000 1.1 +++ openacs-4/packages/news-aggregator/www/opml-import-3.tcl 1 Mar 2005 00:01:39 -0000 1.2 @@ -10,7 +10,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] permission::require_permission \ -object_id $aggregator_id \ -party_id $user_id \ Index: openacs-4/packages/news-aggregator/www/opml-import.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news-aggregator/www/opml-import.tcl 20 Mar 2004 11:04:39 -0000 1.1 +++ openacs-4/packages/news-aggregator/www/opml-import.tcl 1 Mar 2005 00:01:39 -0000 1.2 @@ -10,7 +10,7 @@ {format "opml"} } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set page_title "OPML Import" permission::require_permission \ Index: openacs-4/packages/news-aggregator/www/purge.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/purge.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/news-aggregator/www/purge.tcl 20 Mar 2004 11:04:39 -0000 1.1 +++ openacs-4/packages/news-aggregator/www/purge.tcl 1 Mar 2005 00:01:39 -0000 1.2 @@ -9,7 +9,7 @@ purge_bottom:naturalnum,notnull } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] db_1row aggregator_info "" Index: openacs-4/packages/notifications/www/manage.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/notifications/www/manage.tcl 24 Jan 2004 16:33:24 -0000 1.4 +++ openacs-4/packages/notifications/www/manage.tcl 1 Mar 2005 00:01:39 -0000 1.5 @@ -7,7 +7,7 @@ @cvs-id $Id$ } {} -ad_maybe_redirect_for_registration +auth::require_login set user_id [ad_conn user_id] set return_url [ad_conn url] Index: openacs-4/packages/notifications/www/request-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/notifications/www/request-new.tcl 17 May 2003 10:54:55 -0000 1.9 +++ openacs-4/packages/notifications/www/request-new.tcl 1 Mar 2005 00:01:39 -0000 1.10 @@ -12,7 +12,7 @@ return_url } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check that the object can be subcribed to notification::security::require_notify_object -object_id $object_id Index: openacs-4/packages/organizations/www/add-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/add-edit.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/organizations/www/add-edit.tcl 26 Feb 2004 15:29:21 -0000 1.3 +++ openacs-4/packages/organizations/www/add-edit.tcl 1 Mar 2005 00:01:40 -0000 1.4 @@ -12,7 +12,7 @@ set package_id [ad_conn package_id] # The id of the person logged in and browsing this page -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # address of person logged in set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/organizations/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/index.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/organizations/www/index.tcl 13 Jan 2005 13:58:35 -0000 1.4 +++ openacs-4/packages/organizations/www/index.tcl 1 Mar 2005 00:01:40 -0000 1.5 @@ -30,7 +30,7 @@ set package_id [ad_conn package_id] # The id of the person logged in and browsing this page -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # An HTML block for the breadcrumb trail set context_bar [ad_context_bar] Index: openacs-4/packages/organizations/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/one.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/organizations/www/one.tcl 26 Jan 2004 15:39:47 -0000 1.2 +++ openacs-4/packages/organizations/www/one.tcl 1 Mar 2005 00:01:40 -0000 1.3 @@ -34,7 +34,7 @@ set package_id [ad_conn package_id] # The id of the person logged in and browsing this page -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # An HTML block for the breadcrumb trail set context_bar [ad_context_bar "One"] Index: openacs-4/packages/photo-album/www/clipboard-attach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-attach.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/clipboard-attach.tcl 12 Jun 2003 06:55:45 -0000 1.2 +++ openacs-4/packages/photo-album/www/clipboard-attach.tcl 1 Mar 2005 00:01:40 -0000 1.3 @@ -12,7 +12,7 @@ collection_id:integer,notnull } -ad_maybe_redirect_for_registration +auth::require_login set user_id [ad_conn user_id] set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/photo-album/www/clipboard-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-remove.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/clipboard-remove.tcl 12 Jun 2003 06:55:45 -0000 1.2 +++ openacs-4/packages/photo-album/www/clipboard-remove.tcl 1 Mar 2005 00:01:40 -0000 1.3 @@ -11,7 +11,7 @@ collection_id:integer,notnull } -ad_maybe_redirect_for_registration +auth::require_login set user_id [ad_conn user_id] set peeraddr [ad_conn peeraddr] Index: openacs-4/packages/poll/www/vote-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/poll/www/vote-form.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/poll/www/vote-form.tcl 3 Sep 2004 10:56:50 -0000 1.1 +++ openacs-4/packages/poll/www/vote-form.tcl 1 Mar 2005 00:01:40 -0000 1.2 @@ -52,7 +52,7 @@ # Check if the user is required to register. if { [string match "t" $require_registration_p] } { - ad_maybe_redirect_for_registration + auth::require_login } # If the user is logged in, check to see if they've Index: openacs-4/packages/recruiting/www/edit-ratings.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/edit-ratings.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/recruiting/www/edit-ratings.tcl 14 Aug 2002 20:33:55 -0000 1.4 +++ openacs-4/packages/recruiting/www/edit-ratings.tcl 1 Mar 2005 00:01:40 -0000 1.5 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set interview_info [recruiting::interview::get -interview_id $interview_id] array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id] Index: openacs-4/packages/recruiting/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/index.tcl 9 Aug 2002 20:30:51 -0000 1.3 +++ openacs-4/packages/recruiting/www/index.tcl 1 Mar 2005 00:01:40 -0000 1.4 @@ -7,7 +7,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set new_interviews [db_string num_new_interviews {}] set old_interviews [db_string num_old_interviews {}] Index: openacs-4/packages/recruiting/www/my-completed-interviews.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-completed-interviews.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/recruiting/www/my-completed-interviews.tcl 14 Aug 2002 20:33:55 -0000 1.5 +++ openacs-4/packages/recruiting/www/my-completed-interviews.tcl 1 Mar 2005 00:01:40 -0000 1.6 @@ -8,7 +8,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_title interviews "Candidates you have interviewed" ui::table::set_column_headings interviews [list "Name" "Location" "Average Rating" "Hiring Recommendation"] Index: openacs-4/packages/recruiting/www/my-new-interviews.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/my-new-interviews.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/recruiting/www/my-new-interviews.tcl 14 Aug 2002 20:33:55 -0000 1.4 +++ openacs-4/packages/recruiting/www/my-new-interviews.tcl 1 Mar 2005 00:01:40 -0000 1.5 @@ -8,7 +8,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_title interviews "Candidates for you to interview" ui::table::set_column_headings interviews [list "Name" "Location"] Index: openacs-4/packages/recruiting/www/rate-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/rate-candidate.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/recruiting/www/rate-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.5 +++ openacs-4/packages/recruiting/www/rate-candidate.tcl 1 Mar 2005 00:01:40 -0000 1.6 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id] Index: openacs-4/packages/recruiting/www/rating-sheet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/rating-sheet.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/recruiting/www/rating-sheet.tcl 14 Aug 2002 20:33:55 -0000 1.5 +++ openacs-4/packages/recruiting/www/rating-sheet.tcl 1 Mar 2005 00:01:40 -0000 1.6 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set interview_info [recruiting::interview::get -interview_id $interview_id] Index: openacs-4/packages/recruiting/www/admin/archive-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/archive-candidate.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/admin/archive-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.3 +++ openacs-4/packages/recruiting/www/admin/archive-candidate.tcl 1 Mar 2005 00:01:40 -0000 1.4 @@ -13,7 +13,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$archive_p == "notyet"} { Index: openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl 20 Aug 2002 19:33:54 -0000 1.5 +++ openacs-4/packages/recruiting/www/admin/assign-candidate-interview-2.tcl 1 Mar 2005 00:01:40 -0000 1.6 @@ -16,7 +16,7 @@ set node_id [ad_conn node_id] set package_url [site_node::get_url -node_id $node_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id] Index: openacs-4/packages/recruiting/www/admin/assign-candidate-interview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/assign-candidate-interview.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/recruiting/www/admin/assign-candidate-interview.tcl 14 Aug 2002 20:28:28 -0000 1.4 +++ openacs-4/packages/recruiting/www/admin/assign-candidate-interview.tcl 1 Mar 2005 00:01:40 -0000 1.5 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set searching_p 1 Index: openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl 14 Aug 2002 20:33:55 -0000 1.3 +++ openacs-4/packages/recruiting/www/admin/change-candidate-status.tcl 1 Mar 2005 00:01:40 -0000 1.4 @@ -10,7 +10,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set info [recruiting::candidate::get -candidate_id $candidate_id] Index: openacs-4/packages/recruiting/www/admin/delete-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-candidate.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/recruiting/www/admin/delete-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.5 +++ openacs-4/packages/recruiting/www/admin/delete-candidate.tcl 1 Mar 2005 00:01:40 -0000 1.6 @@ -13,7 +13,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$delete_p == "notyet"} { Index: openacs-4/packages/recruiting/www/admin/delete-interview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/delete-interview.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/recruiting/www/admin/delete-interview.tcl 14 Aug 2002 20:33:55 -0000 1.4 +++ openacs-4/packages/recruiting/www/admin/delete-interview.tcl 1 Mar 2005 00:01:41 -0000 1.5 @@ -14,7 +14,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if {$delete_p == "notyet"} { Index: openacs-4/packages/recruiting/www/admin/disable-criteria.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/disable-criteria.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/recruiting/www/admin/disable-criteria.tcl 30 Jul 2002 21:33:38 -0000 1.1 +++ openacs-4/packages/recruiting/www/admin/disable-criteria.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_dml disable_criteria {} Index: openacs-4/packages/recruiting/www/admin/disable-status-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/disable-status-type.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/recruiting/www/admin/disable-status-type.tcl 30 Jul 2002 21:33:38 -0000 1.1 +++ openacs-4/packages/recruiting/www/admin/disable-status-type.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_dml disable_status_type {} Index: openacs-4/packages/recruiting/www/admin/edit-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/edit-candidate.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/recruiting/www/admin/edit-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.4 +++ openacs-4/packages/recruiting/www/admin/edit-candidate.tcl 1 Mar 2005 00:01:41 -0000 1.5 @@ -10,7 +10,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # check if there are status types defined. if not, # don't let any candidates be created (what would their Index: openacs-4/packages/recruiting/www/admin/edit-criteria.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/edit-criteria.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/recruiting/www/admin/edit-criteria.tcl 14 Aug 2002 20:28:28 -0000 1.2 +++ openacs-4/packages/recruiting/www/admin/edit-criteria.tcl 1 Mar 2005 00:01:41 -0000 1.3 @@ -10,7 +10,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set info [recruiting::criteria::get -criteria_id $criteria_id] Index: openacs-4/packages/recruiting/www/admin/edit-status-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/edit-status-type.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/recruiting/www/admin/edit-status-type.tcl 14 Aug 2002 20:28:28 -0000 1.2 +++ openacs-4/packages/recruiting/www/admin/edit-status-type.tcl 1 Mar 2005 00:01:41 -0000 1.3 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set info [recruiting::status_type::get -status_type_id $status_type_id] Index: openacs-4/packages/recruiting/www/admin/email-options.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/email-options.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/recruiting/www/admin/email-options.tcl 20 Aug 2002 19:34:56 -0000 1.1 +++ openacs-4/packages/recruiting/www/admin/email-options.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] form create email Index: openacs-4/packages/recruiting/www/admin/enable-criteria.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/enable-criteria.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/recruiting/www/admin/enable-criteria.tcl 30 Jul 2002 21:33:38 -0000 1.1 +++ openacs-4/packages/recruiting/www/admin/enable-criteria.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_dml enable_criteria {} Index: openacs-4/packages/recruiting/www/admin/enable-status-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/enable-status-type.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/recruiting/www/admin/enable-status-type.tcl 30 Jul 2002 21:33:38 -0000 1.1 +++ openacs-4/packages/recruiting/www/admin/enable-status-type.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_dml enable_status_type {} Index: openacs-4/packages/recruiting/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/index.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/recruiting/www/admin/index.tcl 21 Aug 2002 19:02:34 -0000 1.6 +++ openacs-4/packages/recruiting/www/admin/index.tcl 1 Mar 2005 00:01:41 -0000 1.7 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row status_types_defined_p {} db_1row criteria_defined_p {} Index: openacs-4/packages/recruiting/www/admin/list-archived-candidates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/list-archived-candidates.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/recruiting/www/admin/list-archived-candidates.tcl 9 Aug 2002 20:30:51 -0000 1.2 +++ openacs-4/packages/recruiting/www/admin/list-archived-candidates.tcl 1 Mar 2005 00:01:41 -0000 1.3 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_title archived "Archived Candidates" ui::table::set_column_headings archived [list "Name" "Location" "Status"] Index: openacs-4/packages/recruiting/www/admin/list-candidates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/list-candidates.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/recruiting/www/admin/list-candidates.tcl 9 Aug 2002 20:30:51 -0000 1.7 +++ openacs-4/packages/recruiting/www/admin/list-candidates.tcl 1 Mar 2005 00:01:41 -0000 1.8 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set referrer [ns_urlencode [ns_conn url]] Index: openacs-4/packages/recruiting/www/admin/list-criteria.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/list-criteria.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/recruiting/www/admin/list-criteria.tcl 9 Aug 2002 20:30:51 -0000 1.4 +++ openacs-4/packages/recruiting/www/admin/list-criteria.tcl 1 Mar 2005 00:01:41 -0000 1.5 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_title enabled "Candidate Criteria" db_foreach get_enabled_criteria_types {} { Index: openacs-4/packages/recruiting/www/admin/list-interviews.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/list-interviews.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/recruiting/www/admin/list-interviews.tcl 9 Aug 2002 20:30:51 -0000 1.2 +++ openacs-4/packages/recruiting/www/admin/list-interviews.tcl 1 Mar 2005 00:01:41 -0000 1.3 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_title interviews "Pending Interviews" ui::table::set_column_headings interviews [list "Candidate" "Interviewer" "Assigned"] Index: openacs-4/packages/recruiting/www/admin/list-status-types.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/list-status-types.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/admin/list-status-types.tcl 9 Aug 2002 20:30:51 -0000 1.3 +++ openacs-4/packages/recruiting/www/admin/list-status-types.tcl 1 Mar 2005 00:01:41 -0000 1.4 @@ -9,7 +9,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_title enabled "Candidate Status Types" db_foreach get_enabled_status_types {} { Index: openacs-4/packages/recruiting/www/admin/new-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/new-candidate.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/recruiting/www/admin/new-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.6 +++ openacs-4/packages/recruiting/www/admin/new-candidate.tcl 1 Mar 2005 00:01:41 -0000 1.7 @@ -8,7 +8,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # check if there are status types defined. if not, # don't let any candidates be created (what would their Index: openacs-4/packages/recruiting/www/admin/new-criteria.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/new-criteria.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/admin/new-criteria.tcl 14 Aug 2002 20:28:28 -0000 1.3 +++ openacs-4/packages/recruiting/www/admin/new-criteria.tcl 1 Mar 2005 00:01:41 -0000 1.4 @@ -8,7 +8,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] form create new_criteria element create new_criteria criteria_name \ Index: openacs-4/packages/recruiting/www/admin/new-status-type.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/new-status-type.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/admin/new-status-type.tcl 14 Aug 2002 20:28:28 -0000 1.3 +++ openacs-4/packages/recruiting/www/admin/new-status-type.tcl 1 Mar 2005 00:01:41 -0000 1.4 @@ -8,7 +8,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] form create new_status_type element create new_status_type short_desc \ Index: openacs-4/packages/recruiting/www/admin/status-help.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/status-help.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/recruiting/www/admin/status-help.tcl 9 Aug 2002 20:30:51 -0000 1.2 +++ openacs-4/packages/recruiting/www/admin/status-help.tcl 1 Mar 2005 00:01:41 -0000 1.3 @@ -8,7 +8,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ui::table::set_column_headings types [list "Choose this..." "When"] db_foreach get_status_types {} { Index: openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.2 +++ openacs-4/packages/recruiting/www/admin/unarchive-candidate.tcl 1 Mar 2005 00:01:41 -0000 1.3 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] recruiting::candidate::unarchive -candidate_id $candidate_id Index: openacs-4/packages/recruiting/www/admin/view-comments.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-comments.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/recruiting/www/admin/view-comments.tcl 14 Aug 2002 20:33:55 -0000 1.3 +++ openacs-4/packages/recruiting/www/admin/view-comments.tcl 1 Mar 2005 00:01:41 -0000 1.4 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] array set candidate_info [recruiting::candidate::get -candidate_id $candidate_id] Index: openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl 14 Aug 2002 20:33:55 -0000 1.9 +++ openacs-4/packages/recruiting/www/admin/view-one-candidate.tcl 1 Mar 2005 00:01:41 -0000 1.10 @@ -11,7 +11,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set referrer [ns_urlencode [ns_conn url]?[export_vars candidate_id]] Index: openacs-4/packages/recruiting-portlet/www/recruiting-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/recruiting-portlet/www/recruiting-portlet.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/recruiting-portlet/www/recruiting-portlet.tcl 21 Aug 2002 19:11:31 -0000 1.1 +++ openacs-4/packages/recruiting-portlet/www/recruiting-portlet.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -23,7 +23,7 @@ return -code error "There should be only one instance of forums for admin purposes" } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set package_id [lindex $list_of_package_ids 0] set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0] Index: openacs-4/packages/ref-us-zipcodes/www/zip-check.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-us-zipcodes/www/zip-check.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/ref-us-zipcodes/www/zip-check.tcl 25 Sep 2003 23:51:05 -0000 1.1 +++ openacs-4/packages/ref-us-zipcodes/www/zip-check.tcl 1 Mar 2005 00:01:41 -0000 1.2 @@ -13,7 +13,7 @@ set package_url [ad_conn package_url] set package_admin_p [ad_permission_p $package_id admin] ad_require_permission $package_id admin -set this_user_id [ad_verify_and_get_user_id] +set this_user_id [ad_conn user_id] set system_name [ad_parameter -package_id [ad_acs_kernel_id] SystemName] 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 -N -r1.7 -r1.8 --- openacs-4/packages/rules/www/add-action.tcl 21 Dec 2004 21:55:14 -0000 1.7 +++ openacs-4/packages/rules/www/add-action.tcl 1 Mar 2005 00:01:41 -0000 1.8 @@ -8,7 +8,7 @@ rule_id:notnull selected_a:optional } -ad_maybe_redirect_for_registration +auth::require_login set default_action 1 # Just while I get the assessment package ready 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 -N -r1.8 -r1.9 --- openacs-4/packages/rules/www/add-rule.tcl 20 Dec 2004 19:38:43 -0000 1.8 +++ openacs-4/packages/rules/www/add-rule.tcl 1 Mar 2005 00:01:41 -0000 1.9 @@ -12,7 +12,7 @@ } # Just while I get the assessment package ready -ad_maybe_redirect_for_registration +auth::require_login set package_id [ad_conn package_id] set context [list "Add rule"] 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 -N -r1.7 -r1.8 --- openacs-4/packages/rules/www/add-trigger.tcl 20 Dec 2004 19:38:43 -0000 1.7 +++ openacs-4/packages/rules/www/add-trigger.tcl 1 Mar 2005 00:01:41 -0000 1.8 @@ -8,7 +8,7 @@ rule_id:notnull selected_qs:optional } -ad_maybe_redirect_for_registration +auth::require_login set qs_sel 0 set context [list [list "one-rule?rule_id=$rule_id" "Rule Properties"] "Add Trigger"] permission::require_permission -object_id $rule_id -privilege "admin" Index: openacs-4/packages/shipping-gateway/www/doc/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-gateway/www/doc/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/shipping-gateway/www/doc/index.tcl 21 May 2002 18:34:38 -0000 1.1 +++ openacs-4/packages/shipping-gateway/www/doc/index.tcl 1 Mar 2005 00:01:42 -0000 1.2 @@ -13,7 +13,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Shipping Service Contract" set title "$package_name Documentation" Index: openacs-4/packages/shipping-gateway/www/doc/license.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/shipping-gateway/www/doc/license.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/shipping-gateway/www/doc/license.tcl 21 May 2002 18:34:38 -0000 1.1 +++ openacs-4/packages/shipping-gateway/www/doc/license.tcl 1 Mar 2005 00:01:42 -0000 1.2 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Shipping Service Contract" set title "$package_name License" Index: openacs-4/packages/simple-survey/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/index.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/simple-survey/www/index.tcl 10 Sep 2002 22:23:23 -0000 1.5 +++ openacs-4/packages/simple-survey/www/index.tcl 1 Mar 2005 00:01:42 -0000 1.6 @@ -17,7 +17,7 @@ set context [list "Surveys"] -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] db_multirow surveys survey_select { select survey_id, name Index: openacs-4/packages/simple-survey/www/one-respondent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one-respondent.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/simple-survey/www/one-respondent.tcl 13 Aug 2003 11:17:42 -0000 1.5 +++ openacs-4/packages/simple-survey/www/one-respondent.tcl 1 Mar 2005 00:01:42 -0000 1.6 @@ -33,7 +33,7 @@ # If group_id is specified, we return all the responses for that group by any user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row survey_info { select name, description from survsimp_surveys Index: openacs-4/packages/simple-survey/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/simple-survey/www/one.tcl 10 Sep 2002 22:23:23 -0000 1.6 +++ openacs-4/packages/simple-survey/www/one.tcl 1 Mar 2005 00:01:42 -0000 1.7 @@ -35,7 +35,7 @@ ad_require_permission $survey_id survsimp_take_survey -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] db_1row survey_info "select name, description, single_response_p, single_editable_p, display_type from survsimp_surveys where survey_id = :survey_id" Index: openacs-4/packages/simple-survey/www/process-response.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/process-response.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/simple-survey/www/process-response.tcl 10 Sep 2002 22:23:23 -0000 1.5 +++ openacs-4/packages/simple-survey/www/process-response.tcl 1 Mar 2005 00:01:42 -0000 1.6 @@ -125,7 +125,7 @@ ad_require_permission $survey_id survsimp_take_survey -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # Do the inserts. Index: openacs-4/packages/site-wide-search/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/search.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/site-wide-search/www/search.tcl 20 Apr 2001 20:51:25 -0000 1.1 +++ openacs-4/packages/site-wide-search/www/search.tcl 1 Mar 2005 00:01:42 -0000 1.2 @@ -15,7 +15,7 @@ final_query_str:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # clean up strings depending on search methods # AND condition Index: openacs-4/packages/sloan-bboard/www/category-subscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/category-subscribe.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/category-subscribe.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/category-subscribe.tcl 1 Mar 2005 00:01:42 -0000 1.3 @@ -35,7 +35,7 @@ catch { bboard_subscribe_category \ - -category_id $category_id -subscriber_id [ad_verify_and_get_user_id] + -category_id $category_id -subscriber_id [ad_conn user_id] } ad_returnredirect "forum-by-category?forum_id=$forum_id&category_id=$category_id" Index: openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl 29 Mar 2002 19:35:47 -0000 1.3 +++ openacs-4/packages/sloan-bboard/www/category-unsubscribe.tcl 1 Mar 2005 00:01:42 -0000 1.4 @@ -34,7 +34,7 @@ catch { bboard_unsubscribe_category \ - -category_id $category_id -subscriber_id [ad_verify_and_get_user_id] + -category_id $category_id -subscriber_id [ad_conn user_id] } if {[empty_string_p $return_url]} { Index: openacs-4/packages/sloan-bboard/www/forum-by-category.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-by-category.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/forum-by-category.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/forum-by-category.tcl 1 Mar 2005 00:01:42 -0000 1.3 @@ -46,7 +46,7 @@ set category_create_p 0 -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set subscribed_p 0 Index: openacs-4/packages/sloan-bboard/www/forum-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-delete-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/forum-delete-2.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/forum-delete-2.tcl 1 Mar 2005 00:01:42 -0000 1.3 @@ -28,7 +28,7 @@ charter:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $forum_id admin Index: openacs-4/packages/sloan-bboard/www/forum-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/forum-delete.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/forum-delete.tcl 1 Mar 2005 00:01:42 -0000 1.3 @@ -31,7 +31,7 @@ set package_id [ad_conn package_id] set context_bar {} -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $forum_id admin Index: openacs-4/packages/sloan-bboard/www/forum-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-new-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/sloan-bboard/www/forum-new-2.tcl 29 Mar 2002 19:35:47 -0000 1.4 +++ openacs-4/packages/sloan-bboard/www/forum-new-2.tcl 1 Mar 2005 00:01:43 -0000 1.5 @@ -48,7 +48,7 @@ bboard_forum_new -forum_id $forum_id -short_name $short_name \ -charter $charter -moderated_p $moderated_p \ -forum_type $forum_type \ - -bboard_id $package_id -creation_user [ad_verify_and_get_user_id] \ + -bboard_id $package_id -creation_user [ad_conn user_id] \ -creation_ip [ad_conn peeraddr] -context_id $package_id } # on error ... Index: openacs-4/packages/sloan-bboard/www/forum-subscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-subscribe.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/forum-subscribe.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/forum-subscribe.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -31,7 +31,7 @@ catch { bboard_subscribe_forum \ - -forum_id $forum_id -subscriber_id [ad_verify_and_get_user_id] + -forum_id $forum_id -subscriber_id [ad_conn user_id] } ad_returnredirect "forum?forum_id=$forum_id" Index: openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl 29 Mar 2002 19:35:47 -0000 1.3 +++ openacs-4/packages/sloan-bboard/www/forum-unsubscribe.tcl 1 Mar 2005 00:01:43 -0000 1.4 @@ -30,7 +30,7 @@ catch { bboard_unsubscribe_forum \ - -forum_id $forum_id -subscriber_id [ad_verify_and_get_user_id] + -forum_id $forum_id -subscriber_id [ad_conn user_id] } if {[empty_string_p $return_url]} { Index: openacs-4/packages/sloan-bboard/www/forum.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/forum.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/sloan-bboard/www/forum.tcl 29 Mar 2002 19:35:47 -0000 1.4 +++ openacs-4/packages/sloan-bboard/www/forum.tcl 1 Mar 2005 00:01:43 -0000 1.5 @@ -41,7 +41,7 @@ uncategorized_count:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set package_id [ad_conn package_id] ad_require_permission $forum_id bboard_read_forum Index: openacs-4/packages/sloan-bboard/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/index.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/sloan-bboard/www/index.tcl 29 Mar 2002 19:35:47 -0000 1.4 +++ openacs-4/packages/sloan-bboard/www/index.tcl 1 Mar 2005 00:01:43 -0000 1.5 @@ -33,7 +33,7 @@ set context_bar [list Bboards] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set admin_p [ad_permission_p $package_id admin] Index: openacs-4/packages/sloan-bboard/www/message-attach-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-attach-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-attach-2.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-attach-2.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -33,7 +33,7 @@ ad_require_permission $message_id bboard_write_message # authenticate the user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # aolserver will give us a guessed mime type for the upload set guessed_file_type [ns_guesstype $upload_file] Index: openacs-4/packages/sloan-bboard/www/message-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-delete-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-delete-2.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-delete-2.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -34,7 +34,7 @@ ad_require_permission $message_id admin } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if [string eq $replies ""] { bboard_message_set_status -message_id $message_id -forum_id $forum_id \ Index: openacs-4/packages/sloan-bboard/www/message-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-edit.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-edit.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-edit.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -77,7 +77,7 @@ [list [list "forum?[export_url_vars forum_id]" $forum_name] \ "Edit a Message"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set category_pulldown_list "" Index: openacs-4/packages/sloan-bboard/www/message-mail-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-mail-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-mail-2.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-mail-2.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -35,7 +35,7 @@ ad_require_permission $forum_id bboard_create_message -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn peeraddr] db_transaction { Index: openacs-4/packages/sloan-bboard/www/message-mail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-mail.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-mail.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-mail.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -45,7 +45,7 @@ where forum_id = :forum_id } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row sender_email { select email as sender_email from parties Index: openacs-4/packages/sloan-bboard/www/message-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-new-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-new-2.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-new-2.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -60,7 +60,7 @@ ns_log Notice "mime_type is $mime_type" set subscribe_p 1 -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ad_require_permission $forum_id bboard_create_message Index: openacs-4/packages/sloan-bboard/www/message-new-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-new-3.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-new-3.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-new-3.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -39,7 +39,7 @@ ad_require_permission $forum_id bboard_create_message -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn peeraddr] db_transaction { Index: openacs-4/packages/sloan-bboard/www/message-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-new.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-new.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-new.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -66,7 +66,7 @@ [list [list "forum?[export_url_vars forum_id]" $forum_name] \ "Post"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set category_pulldown_list "" Index: openacs-4/packages/sloan-bboard/www/message-subscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-subscribe.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-subscribe.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-subscribe.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -32,7 +32,7 @@ catch { bboard_subscribe_thread \ - -thread_id $message_id -subscriber_id [ad_verify_and_get_user_id] + -thread_id $message_id -subscriber_id [ad_conn user_id] } ad_returnredirect "[bboard_message_page]?forum_id=$forum_id&message_id=$message_id" Index: openacs-4/packages/sloan-bboard/www/message-threaded.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-threaded.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/message-threaded.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/message-threaded.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -36,7 +36,7 @@ ad_require_permission $message_id bboard_read_forum -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if [string equal [bboard_message_subscribed_p -direct $user_id $message_id] "t"] { set subscribed_p 1 Index: openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl 29 Mar 2002 19:35:47 -0000 1.3 +++ openacs-4/packages/sloan-bboard/www/message-unsubscribe.tcl 1 Mar 2005 00:01:43 -0000 1.4 @@ -31,7 +31,7 @@ catch { bboard_unsubscribe_thread \ - -thread_id $message_id -subscriber_id [ad_verify_and_get_user_id] + -thread_id $message_id -subscriber_id [ad_conn user_id] } if {[empty_string_p $return_url]} { Index: openacs-4/packages/sloan-bboard/www/message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/message.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/sloan-bboard/www/message.tcl 29 Mar 2002 19:35:47 -0000 1.5 +++ openacs-4/packages/sloan-bboard/www/message.tcl 1 Mar 2005 00:01:43 -0000 1.6 @@ -37,7 +37,7 @@ ad_require_permission $message_id bboard_read_forum -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if [string equal [bboard_message_subscribed_p -direct $user_id $message_id] "t"] { set subscribed_p 1 Index: openacs-4/packages/sloan-bboard/www/messages-by-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/messages-by-user.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/messages-by-user.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/messages-by-user.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -33,7 +33,7 @@ messages:multirow } -set current_user_id [ad_verify_and_get_user_id] +set current_user_id [ad_conn user_id] ad_require_permission $forum_id bboard_read_forum Index: openacs-4/packages/sloan-bboard/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/search.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/sloan-bboard/www/search.tcl 29 Mar 2002 19:35:47 -0000 1.2 +++ openacs-4/packages/sloan-bboard/www/search.tcl 1 Mar 2005 00:01:43 -0000 1.3 @@ -32,7 +32,7 @@ title:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set title "Search Results for \"$query\"" set context_bar [list "Search"] Index: openacs-4/packages/sloan-bboard/www/subscriptions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/sloan-bboard/www/subscriptions.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/sloan-bboard/www/subscriptions.tcl 29 Mar 2002 19:35:47 -0000 1.4 +++ openacs-4/packages/sloan-bboard/www/subscriptions.tcl 1 Mar 2005 00:01:43 -0000 1.5 @@ -27,10 +27,10 @@ thread_subs:multirow } -ad_maybe_redirect_for_registration +auth::require_login set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # three sorts of subscriptions: # forums Index: openacs-4/packages/soap-gateway/www/tests/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/soap-gateway/www/tests/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/soap-gateway/www/tests/index.tcl 17 Oct 2004 05:52:02 -0000 1.1 +++ openacs-4/packages/soap-gateway/www/tests/index.tcl 1 Mar 2005 00:01:44 -0000 1.2 @@ -24,7 +24,7 @@ set caption "tests" # is this connection secure -if [ad_secure_conn_p] { +if [security::secure_conn_p] { # calc http name set http [format "http://%s%s" [ns_info hostname] [file join / [soap::get_base_url] tests]] Index: openacs-4/packages/spam/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/spam/www/index.tcl 5 Sep 2002 22:14:36 -0000 1.2 +++ openacs-4/packages/spam/www/index.tcl 1 Mar 2005 00:01:44 -0000 1.3 @@ -13,7 +13,7 @@ context:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # a message is considered unsent if sent_p is false Index: openacs-4/packages/spam/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/spam/www/admin/index.tcl 5 Sep 2002 22:14:37 -0000 1.2 +++ openacs-4/packages/spam/www/admin/index.tcl 1 Mar 2005 00:01:44 -0000 1.3 @@ -11,7 +11,7 @@ context:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # a message is considered unsent if sent_p is false Index: openacs-4/packages/survey/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/index.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/survey/www/index.tcl 21 Jan 2005 17:24:28 -0000 1.2 +++ openacs-4/packages/survey/www/index.tcl 1 Mar 2005 00:01:44 -0000 1.3 @@ -15,7 +15,7 @@ set package_id [ad_conn package_id] -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set admin_p [ad_permission_p $package_id admin] Index: openacs-4/packages/survey/www/one-respondent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/survey/www/one-respondent.tcl 21 Jan 2005 17:24:28 -0000 1.5 +++ openacs-4/packages/survey/www/one-respondent.tcl 1 Mar 2005 00:01:44 -0000 1.6 @@ -30,7 +30,7 @@ # If group_id is specified, we return all the responses for that group by any user -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] get_survey_info -survey_id $survey_id Index: openacs-4/packages/survey/www/one-survey.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-survey.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/survey/www/one-survey.tcl 21 Jan 2005 17:24:28 -0000 1.2 +++ openacs-4/packages/survey/www/one-survey.tcl 1 Mar 2005 00:01:44 -0000 1.3 @@ -15,7 +15,7 @@ set package_id [ad_conn package_id] -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set take_survey_p [ad_permission_p $survey_id survey_take_survey] Index: openacs-4/packages/survey/www/process-response.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/survey/www/process-response.tcl 21 Jan 2005 17:24:28 -0000 1.13 +++ openacs-4/packages/survey/www/process-response.tcl 1 Mar 2005 00:01:44 -0000 1.14 @@ -131,7 +131,7 @@ ad_require_permission $survey_id survey_take_survey -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] get_survey_info -survey_id $survey_id set type $survey_info(type) Index: openacs-4/packages/survey/www/respond.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/respond.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/survey/www/respond.tcl 21 Jan 2005 17:24:28 -0000 1.7 +++ openacs-4/packages/survey/www/respond.tcl 1 Mar 2005 00:01:44 -0000 1.8 @@ -21,7 +21,7 @@ if ![db_0or1row survey_exists {}] { ad_complain "[_ survey.lt_Survey_survey_id_do_no]" } - set user_id [ad_maybe_redirect_for_registration] + set user_id [auth::require_login] set number_of_responses [db_string count_responses {}] get_survey_info -survey_id $survey_id set single_section_p $survey_info(single_section_p) Index: openacs-4/packages/survey/www/admin/process-response.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/process-response.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/survey/www/admin/process-response.tcl 21 Jan 2005 17:24:28 -0000 1.3 +++ openacs-4/packages/survey/www/admin/process-response.tcl 1 Mar 2005 00:01:44 -0000 1.4 @@ -141,7 +141,7 @@ ad_require_permission $survey_id survey_take_survey -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] get_survey_info -survey_id $survey_id set type $survey_info(type) Index: openacs-4/packages/value-based-shipping/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/index.tcl 12 Sep 2002 19:44:59 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/index.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -15,7 +15,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/admin/index.tcl 12 Sep 2002 19:45:01 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/admin/index.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -13,7 +13,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl 12 Sep 2002 19:45:01 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -10,7 +10,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 12 Sep 2002 20:11:09 -0000 1.5 +++ openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 1 Mar 2005 00:01:45 -0000 1.6 @@ -10,7 +10,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/levels.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/levels.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/admin/levels.tcl 12 Sep 2002 19:45:01 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/admin/levels.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -16,7 +16,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl 12 Sep 2002 19:45:01 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -10,7 +10,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl 12 Sep 2002 20:11:09 -0000 1.4 +++ openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl 1 Mar 2005 00:01:45 -0000 1.5 @@ -10,7 +10,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/admin/rates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/value-based-shipping/www/admin/rates.tcl 12 Sep 2002 19:45:01 -0000 1.4 +++ openacs-4/packages/value-based-shipping/www/admin/rates.tcl 1 Mar 2005 00:01:45 -0000 1.5 @@ -22,7 +22,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Check for admin privileges Index: openacs-4/packages/value-based-shipping/www/doc/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/doc/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/doc/index.tcl 12 Sep 2002 19:45:02 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/doc/index.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Value-based Shipping" set title "$package_name Documentation" Index: openacs-4/packages/value-based-shipping/www/doc/license.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/doc/license.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/value-based-shipping/www/doc/license.tcl 12 Sep 2002 19:45:02 -0000 1.3 +++ openacs-4/packages/value-based-shipping/www/doc/license.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -14,7 +14,7 @@ # Authenticate the user -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set package_name "Value-based Shipping" set title "$package_name License" Index: openacs-4/packages/webmail/tcl/wm-util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/tcl/wm-util-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/tcl/wm-util-procs.tcl 26 Feb 2005 16:00:10 -0000 1.2 +++ openacs-4/packages/webmail/tcl/wm-util-procs.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -239,7 +239,7 @@ set mailbox_list [ad_get_client_property -default "" webmail mailbox_list] if { [empty_string_p $mailbox_list] } { if { [empty_string_p $user_id] } { - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] } set mailbox_list [db_list_of_lists wm_mailbox_name_ids { SELECT mailbox_id, name FROM wm_mailboxes Index: openacs-4/packages/webmail/www/create-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/create-view.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/webmail/www/create-view.tcl 18 Sep 2002 12:17:44 -0000 1.3 +++ openacs-4/packages/webmail/www/create-view.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -46,7 +46,7 @@ } lappend filter_list [list read matches $status] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set edit_filter_p [db_string filter_view_exists { SELECT 1 FROM wm_filter_views WHERE filter_id = :edit_filter_id Index: openacs-4/packages/webmail/www/delete-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/delete-view.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/delete-view.tcl 10 Sep 2002 22:23:29 -0000 1.2 +++ openacs-4/packages/webmail/www/delete-view.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -10,7 +10,7 @@ edit_filter_id:integer,notnull } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_dml delete { DELETE FROM wm_filter_views Index: openacs-4/packages/webmail/www/folder-change-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-change-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/folder-change-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/folder-change-2.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -19,7 +19,7 @@ return } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set folder_name [wm_mailbox_verify_and_get_name $mailbox_id $user_id] if { [string equal $action "Delete"] } { Index: openacs-4/packages/webmail/www/folder-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-change.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/folder-change.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/folder-change.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -22,7 +22,7 @@ } } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set folder_name [wm_mailbox_verify_and_get_name $mailbox_id $user_id] if { [string equal $action Empty] Index: openacs-4/packages/webmail/www/folder-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-create-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/folder-create-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/folder-create-2.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -12,7 +12,7 @@ target:notnull } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] if { [string length $folder_name] > 50 } { wm_return_error "The folder name you entered ($folder_name) was invalid. Please hit back and try again (the length limit is 50 characters)" Index: openacs-4/packages/webmail/www/folder-index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/webmail/www/folder-index.tcl 18 Sep 2002 14:55:05 -0000 1.3 +++ openacs-4/packages/webmail/www/folder-index.tcl 1 Mar 2005 00:01:45 -0000 1.4 @@ -20,7 +20,7 @@ template::multirow create mailboxes mailbox_id name num_msgs total_size reserved -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set context "[ad_context_bar_ws [list "index?[export_url_vars mailbox_id]" "Webmail"] "Manage Folders"]" Index: openacs-4/packages/webmail/www/folder-rename-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/folder-rename-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/folder-rename-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/folder-rename-2.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -23,7 +23,7 @@ ad_script_abort } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set name [wm_mailbox_verify_and_get_name $mailbox_id $user_id] if { [wm_mailbox_name_reserved $name] } { Index: openacs-4/packages/webmail/www/index-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/index-search.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/index-search.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/index-search.tcl 1 Mar 2005 00:01:45 -0000 1.2 @@ -11,7 +11,7 @@ context:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set context "[ad_context_bar_ws [list "index?[export_url_vars mailbox_id]" "Webmail"] "Search"]" Index: openacs-4/packages/webmail/www/index-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/index-view.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/index-view.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/index-view.tcl 1 Mar 2005 00:01:45 -0000 1.2 @@ -26,7 +26,7 @@ n_messages_comma:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # Set the mailbox_id to 0 because we're in a view ad_set_client_property -persistent f "webmail" mailbox_id "" Index: openacs-4/packages/webmail/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/index.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/www/index.tcl 1 Mar 2005 00:01:45 -0000 1.2 @@ -25,7 +25,7 @@ url:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] # CLEARING CACHED MESSAGES IDS: # we clear when either the mailbox_id or the orderby Index: openacs-4/packages/webmail/www/manage-views.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/manage-views.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/manage-views.tcl 10 Sep 2002 22:23:29 -0000 1.2 +++ openacs-4/packages/webmail/www/manage-views.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -17,7 +17,7 @@ template::multirow create filters filter_id name -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set filter_name "" Index: openacs-4/packages/webmail/www/message-printable.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-printable.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-printable.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-printable.tcl 1 Mar 2005 00:01:45 -0000 1.2 @@ -23,7 +23,7 @@ message_headers:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] if { ![wm_msg_permission $msg_id $user_id] } { wm_return_error " Index: openacs-4/packages/webmail/www/message-process.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-process.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/message-process.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/message-process.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -21,7 +21,7 @@ } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { [empty_string_p $mailbox_id] && [string equal $action "Refile"] } { ad_return_complaint 1 "You have to select a folder to which to refile this message." Index: openacs-4/packages/webmail/www/message-remove-attachment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-remove-attachment.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/message-remove-attachment.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/message-remove-attachment.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -11,7 +11,7 @@ { attachments:multiple,integer } } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] foreach sort_order $attachments { if { [empty_string_p $sort_order] } { continue } Index: openacs-4/packages/webmail/www/message-send-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/message-send-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/message-send-2.tcl 1 Mar 2005 00:01:45 -0000 1.3 @@ -40,7 +40,7 @@ ad_script_abort } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_user [db_string creation_user { SELECT user_id Index: openacs-4/packages/webmail/www/message-send-add-attachment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-add-attachment.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/message-send-add-attachment.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/message-send-add-attachment.tcl 1 Mar 2005 00:01:46 -0000 1.3 @@ -12,7 +12,7 @@ } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # Check permissions. set creation_user [db_string message_creation_user "select user_id Index: openacs-4/packages/webmail/www/message-send-attachments.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send-attachments.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-send-attachments.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-send-attachments.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -13,7 +13,7 @@ creation_user:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_user [db_string message_creation_user { Index: openacs-4/packages/webmail/www/message-send.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message-send.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message-send.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message-send.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -39,7 +39,7 @@ set cc "" set bcc "" -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set from [db_string wm_email " SELECT email_user_name Index: openacs-4/packages/webmail/www/message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/message.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/message.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/message.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -31,7 +31,7 @@ message_headers:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set return_url [ad_urlencode "message?[export_url_vars view_id msg_id]"] Index: openacs-4/packages/webmail/www/preferences-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/preferences-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/preferences-2.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/preferences-2.tcl 1 Mar 2005 00:01:46 -0000 1.3 @@ -35,7 +35,7 @@ ad_complain {You did not specify an address to forward your mail to.} } # check for circular forwards... - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] set email_query "SELECT lower(email_user_name || '@' || full_domain_name) AS email_address @@ -72,7 +72,7 @@ } } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set forward_address [string tolower $forward_address] Index: openacs-4/packages/webmail/www/preferences.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/preferences.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/preferences.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/preferences.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -22,7 +22,7 @@ } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set preferences_query "SELECT messages_per_page, signature_p, forward_address, forward_p, auto_save_p, Index: openacs-4/packages/webmail/www/process-selected-messages.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/process-selected-messages.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/process-selected-messages.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/process-selected-messages.tcl 1 Mar 2005 00:01:46 -0000 1.3 @@ -25,7 +25,7 @@ ad_returnredirect "folder-create?target=[ad_urlencode "refile-selected?[export_url_vars return_url]"]" } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] with_catch errmsg { set trash_mailbox_id [db_string trash_mailbox_id " Index: openacs-4/packages/webmail/www/refile-selected.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/refile-selected.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/refile-selected.tcl 18 Sep 2002 12:17:44 -0000 1.2 +++ openacs-4/packages/webmail/www/refile-selected.tcl 1 Mar 2005 00:01:46 -0000 1.3 @@ -11,7 +11,7 @@ { return_url "clear-cache-mailbox" } } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set msg_ids [ad_get_client_property "webmail" "selected_messages"] Index: openacs-4/packages/webmail/www/signature-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/signature-add-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/signature-add-2.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/signature-add-2.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -15,7 +15,7 @@ action:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set signature [ad_decode [string equal $action "Delete"] 1 "" $signature] set html_p [ad_decode [empty_string_p $html] 1 "f" "t"] Index: openacs-4/packages/webmail/www/signature-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/signature-add.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/signature-add.tcl 26 Feb 2005 17:52:23 -0000 1.2 +++ openacs-4/packages/webmail/www/signature-add.tcl 1 Mar 2005 00:01:46 -0000 1.3 @@ -14,7 +14,7 @@ current_signature:onevalue } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set current_signature [wm_get_preference $user_id signature] Index: openacs-4/packages/webmail/www/template-master.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/template-master.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/webmail/www/template-master.tcl 10 Sep 2002 22:23:29 -0000 1.2 +++ openacs-4/packages/webmail/www/template-master.tcl 1 Mar 2005 00:01:46 -0000 1.3 @@ -15,7 +15,7 @@ # parameter received is $context # -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set show_mailbox_info [ad_parameter -package_id [wm_get_webmail_id] ShowMailboxInfo] if { $show_mailbox_info == "f" } { Index: openacs-4/packages/webmail/www/util-pages/constraint-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/www/util-pages/constraint-form.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/www/util-pages/constraint-form.tcl 20 Apr 2001 20:51:24 -0000 1.1 +++ openacs-4/packages/webmail/www/util-pages/constraint-form.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -22,7 +22,7 @@ template::multirow create constr_selected comp_object comp_type comp_string -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { ![exists_and_not_null num_per_line] } { set num_per_line 2 Index: openacs-4/packages/wp-slim/www/add-edit-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-presentation.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/add-edit-presentation.tcl 21 Dec 2004 22:07:50 -0000 1.1 +++ openacs-4/packages/wp-slim/www/add-edit-presentation.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -12,7 +12,7 @@ } set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn peeraddr] set audience [_ wp-slim.Audience] set background [_ wp-slim.Background] Index: openacs-4/packages/wp-slim/www/add-edit-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/add-edit-slide.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/add-edit-slide.tcl 21 Dec 2004 22:07:50 -0000 1.1 +++ openacs-4/packages/wp-slim/www/add-edit-slide.tcl 1 Mar 2005 00:01:46 -0000 1.2 @@ -26,7 +26,7 @@ set bullet_num "" -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn peeraddr] set package_id [ad_conn package_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation Index: openacs-4/packages/wp-slim/www/attach-del.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-del.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/attach-del.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/attach-del.tcl 1 Mar 2005 00:01:46 -0000 1.7 @@ -14,7 +14,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation Index: openacs-4/packages/wp-slim/www/attach-detail.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/wp-slim/www/attach-detail.tcl 21 Dec 2004 22:06:47 -0000 1.7 +++ openacs-4/packages/wp-slim/www/attach-detail.tcl 1 Mar 2005 00:01:46 -0000 1.8 @@ -31,7 +31,7 @@ }] #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation set edit-slide 1 Index: openacs-4/packages/wp-slim/www/attach-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/attach-list.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/attach-list.tcl 1 Mar 2005 00:01:46 -0000 1.7 @@ -18,7 +18,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation Index: openacs-4/packages/wp-slim/www/attach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/wp-slim/www/attach.tcl 21 Dec 2004 22:06:47 -0000 1.10 +++ openacs-4/packages/wp-slim/www/attach.tcl 1 Mar 2005 00:01:46 -0000 1.11 @@ -15,7 +15,7 @@ } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set creation_ip [ad_conn peeraddr] set tmp_filename [ns_queryget attachment.tmpfile] Index: openacs-4/packages/wp-slim/www/delete-presentation-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/delete-presentation-2.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/delete-presentation-2.tcl 1 Mar 2005 00:01:46 -0000 1.7 @@ -14,7 +14,7 @@ ad_require_permission $pres_item_id wp_delete_presentation -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] if { [ad_check_password $user_id $password] } { db_exec_plsql delete_presentation { Index: openacs-4/packages/wp-slim/www/delete-slide-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/delete-slide-2.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/delete-slide-2.tcl 1 Mar 2005 00:01:46 -0000 1.7 @@ -13,7 +13,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation Index: openacs-4/packages/wp-slim/www/delete-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/delete-slide.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/delete-slide.tcl 1 Mar 2005 00:01:46 -0000 1.7 @@ -15,7 +15,7 @@ #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation set context [list "[_ wp-slim.Delete_a_Slide]"] Index: openacs-4/packages/wp-slim/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/wp-slim/www/index.tcl 21 Dec 2004 22:06:47 -0000 1.8 +++ openacs-4/packages/wp-slim/www/index.tcl 1 Mar 2005 00:01:46 -0000 1.9 @@ -18,7 +18,7 @@ set context [list] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set show_user_value "show_user=$show_user" set show_age_value "show_age=$show_age" Index: openacs-4/packages/wp-slim/www/invite-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/invite-2.tcl 21 Dec 2004 22:06:47 -0000 1.4 +++ openacs-4/packages/wp-slim/www/invite-2.tcl 1 Mar 2005 00:01:46 -0000 1.5 @@ -24,7 +24,7 @@ set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "[_ wp-slim.Authorization]"] [list "invite?[export_url_vars pres_item_id role title]" "[_ wp-slim.Invite_User]"] "[_ wp-slim.Email_Sent]"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_1row user_info_get { select persons.first_names || ' ' || persons.last_name as user_name, Index: openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl 21 Dec 2004 22:06:47 -0000 1.4 +++ openacs-4/packages/wp-slim/www/presentation-acl-add-3.tcl 1 Mar 2005 00:01:46 -0000 1.5 @@ -21,7 +21,7 @@ ad_require_permission $pres_item_id wp_admin_presentation if {![empty_string_p $email]} { - set user_id [ad_verify_and_get_user_id] + set user_id [ad_conn user_id] db_1row email_get { select email as sender_email from parties Index: openacs-4/packages/wp-slim/www/presentation-acl.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/presentation-acl.tcl 21 Dec 2004 22:06:47 -0000 1.5 +++ openacs-4/packages/wp-slim/www/presentation-acl.tcl 1 Mar 2005 00:01:46 -0000 1.6 @@ -16,7 +16,7 @@ pres_item_id } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_admin_presentation Index: openacs-4/packages/wp-slim/www/presentation-print-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/presentation-print-view.tcl 22 Sep 2003 18:41:27 -0000 1.3 +++ openacs-4/packages/wp-slim/www/presentation-print-view.tcl 1 Mar 2005 00:01:46 -0000 1.4 @@ -21,7 +21,7 @@ } set context [list "[_ wp-slim.Print_View]"] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] ## permission checking roc@ permission::require_permission -party_id $user_id -object_id $item_id -privilege wp_view_presentation Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/wp-slim/www/presentation-revisions.tcl 21 Dec 2004 22:06:47 -0000 1.7 +++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl 1 Mar 2005 00:01:46 -0000 1.8 @@ -15,7 +15,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation Index: openacs-4/packages/wp-slim/www/presentation-top.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/wp-slim/www/presentation-top.tcl 21 Dec 2004 22:06:47 -0000 1.7 +++ openacs-4/packages/wp-slim/www/presentation-top.tcl 1 Mar 2005 00:01:46 -0000 1.8 @@ -23,7 +23,7 @@ #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl 21 Dec 2004 22:06:47 -0000 1.7 +++ openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl 1 Mar 2005 00:01:46 -0000 1.8 @@ -26,7 +26,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation set subsite_name [ad_conn package_url] Index: openacs-4/packages/wp-slim/www/serve-presentation.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/serve-presentation.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/serve-presentation.tcl 1 Mar 2005 00:01:46 -0000 1.7 @@ -25,7 +25,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation set subsite_name [ad_conn package_url] Index: openacs-4/packages/wp-slim/www/serve-slide-revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/serve-slide-revision.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/serve-slide-revision.tcl 1 Mar 2005 00:01:47 -0000 1.7 @@ -32,7 +32,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation set subsite_name [ad_conn package_url] Index: openacs-4/packages/wp-slim/www/serve-slide.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/wp-slim/www/serve-slide.tcl 21 Dec 2004 22:06:47 -0000 1.9 +++ openacs-4/packages/wp-slim/www/serve-slide.tcl 1 Mar 2005 00:01:47 -0000 1.10 @@ -30,7 +30,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation set edit_p 0 Index: openacs-4/packages/wp-slim/www/slide-publish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-publish.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/slide-publish.tcl 21 Dec 2004 22:06:47 -0000 1.4 +++ openacs-4/packages/wp-slim/www/slide-publish.tcl 1 Mar 2005 00:01:47 -0000 1.5 @@ -14,7 +14,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation db_exec_plsql live_revision_set { Index: openacs-4/packages/wp-slim/www/slide-revisions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/wp-slim/www/slide-revisions.tcl 21 Dec 2004 22:06:47 -0000 1.6 +++ openacs-4/packages/wp-slim/www/slide-revisions.tcl 1 Mar 2005 00:01:47 -0000 1.7 @@ -17,7 +17,7 @@ } #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation Index: openacs-4/packages/wp-slim/www/slides-reorder-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder-2.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/wp-slim/www/slides-reorder-2.tcl 21 Dec 2004 22:06:47 -0000 1.5 +++ openacs-4/packages/wp-slim/www/slides-reorder-2.tcl 1 Mar 2005 00:01:47 -0000 1.6 @@ -13,7 +13,7 @@ #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation # Just iterate over the values for slide_id in order and set their respective Index: openacs-4/packages/wp-slim/www/slides-reorder.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/wp-slim/www/slides-reorder.tcl 21 Dec 2004 22:06:47 -0000 1.8 +++ openacs-4/packages/wp-slim/www/slides-reorder.tcl 1 Mar 2005 00:01:47 -0000 1.9 @@ -15,7 +15,7 @@ #added permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation set header [ad_header "[_ wp-slim.Reorder_Slides]"] Index: openacs-4/packages/wp-slim/www/style-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-delete-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/style-delete-2.tcl 28 Aug 2003 09:42:00 -0000 1.2 +++ openacs-4/packages/wp-slim/www/style-delete-2.tcl 1 Mar 2005 00:01:47 -0000 1.3 @@ -11,7 +11,7 @@ style_id:naturalnum,notnull } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] wp_check_style_authorization $style_id $user_id Index: openacs-4/packages/wp-slim/www/style-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-delete.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/style-delete.tcl 22 Sep 2003 18:41:27 -0000 1.3 +++ openacs-4/packages/wp-slim/www/style-delete.tcl 1 Mar 2005 00:01:47 -0000 1.4 @@ -13,7 +13,7 @@ } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] wp_check_style_authorization $style_id $user_id Index: openacs-4/packages/wp-slim/www/style-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit-2.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/style-edit-2.tcl 22 Sep 2003 18:41:27 -0000 1.3 +++ openacs-4/packages/wp-slim/www/style-edit-2.tcl 1 Mar 2005 00:01:47 -0000 1.4 @@ -46,7 +46,7 @@ return } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] # We're OK to insert or update. Index: openacs-4/packages/wp-slim/www/style-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/style-edit.tcl 22 Sep 2003 18:41:27 -0000 1.3 +++ openacs-4/packages/wp-slim/www/style-edit.tcl 1 Mar 2005 00:01:47 -0000 1.4 @@ -11,7 +11,7 @@ presentation_id:naturalnum,optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set context {} Index: openacs-4/packages/wp-slim/www/style-image-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-image-add.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/style-image-add.tcl 22 Sep 2003 18:41:27 -0000 1.3 +++ openacs-4/packages/wp-slim/www/style-image-add.tcl 1 Mar 2005 00:01:47 -0000 1.4 @@ -14,7 +14,7 @@ image.tmpfile:tmpfile,notnull } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::require_login] set tmp_filename ${image.tmpfile} Index: openacs-4/packages/wp-slim/www/style-image-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-image-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/style-image-delete.tcl 28 Aug 2003 09:42:00 -0000 1.2 +++ openacs-4/packages/wp-slim/www/style-image-delete.tcl 1 Mar 2005 00:01:47 -0000 1.3 @@ -14,7 +14,7 @@ revision_id:notnull } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] #?? #wp_check_style_authorization $style_id $user_id Index: openacs-4/packages/wp-slim/www/style-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-list.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/wp-slim/www/style-list.tcl 29 Sep 2003 02:41:33 -0000 1.4 +++ openacs-4/packages/wp-slim/www/style-list.tcl 1 Mar 2005 00:01:47 -0000 1.5 @@ -8,7 +8,7 @@ } { } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set context "[_ wp-slim.Your_Styles]" Index: openacs-4/packages/wp-slim/www/style-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-view.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/style-view.tcl 22 Sep 2003 18:41:27 -0000 1.3 +++ openacs-4/packages/wp-slim/www/style-view.tcl 1 Mar 2005 00:01:47 -0000 1.4 @@ -11,7 +11,7 @@ presentation_id:naturalnum,optional } -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] wp_check_style_authorization $style_id $user_id Index: openacs-4/packages/wp-slim/www/toggle-comments-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/toggle-comments-view.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/toggle-comments-view.tcl 28 Aug 2003 09:42:00 -0000 1.2 +++ openacs-4/packages/wp-slim/www/toggle-comments-view.tcl 1 Mar 2005 00:01:47 -0000 1.3 @@ -13,7 +13,7 @@ } #permission checking roc@ -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_admin_presentation db_dml toggle_comments { *SQL* } Index: openacs-4/packages/wps-portlet/www/wps-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wps-portlet/www/wps-admin-portlet.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/wps-portlet/www/wps-admin-portlet.tcl 24 Feb 2005 13:33:30 -0000 1.2 +++ openacs-4/packages/wps-portlet/www/wps-admin-portlet.tcl 1 Mar 2005 00:01:47 -0000 1.3 @@ -20,7 +20,7 @@ set package_id [lindex $list_of_package_ids 0] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] db_multirow presentations select_presentations { Index: openacs-4/packages/wps-portlet/www/wps-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wps-portlet/www/wps-portlet.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/wps-portlet/www/wps-portlet.tcl 24 Feb 2005 13:33:30 -0000 1.2 +++ openacs-4/packages/wps-portlet/www/wps-portlet.tcl 1 Mar 2005 00:01:47 -0000 1.3 @@ -12,7 +12,7 @@ set list_of_package_ids $config(package_id) set package_id [lindex $list_of_package_ids 0] set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set counter 0 db_multirow presentations select_presentations { *SQL* } {