Index: openacs-4/packages/bookmarks/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/bookmarks/www/index.adp 23 Jun 2015 16:24:15 -0000 1.16 +++ openacs-4/packages/bookmarks/www/index.adp 27 Jun 2015 12:32:47 -0000 1.17 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ - @@ -53,7 +53,7 @@ if {@bookmark.folder_p@ == "t"} { append decoration_open "" append decoration_close "" - } + } regsub -all {'|"} @bookmark.bookmark_title;noquote@ {} javascript_title @@ -63,14 +63,14 @@ lappend action_bar "$edit_anchor" } if { "@bookmark.delete_p@" ne "0" } { - lappend action_bar "$delete_anchor" + lappend action_bar "$delete_anchor" } if {@bookmark.folder_p@ == "f"} { set url "bookmark-access?bookmark_id=@bookmark.bookmark_id@&url=[ad_urlencode @bookmark.complete_url;noquote@]" set bgcolor $bookmark_bgcolor set image_url "pics/ftv2doc.gif" - lappend action_bar "Details" + lappend action_bar "Details" } else { set bgcolor $folder_bgcolor set url "toggle-open-close?bookmark_id=@bookmark.bookmark_id@&viewed_user_id=@viewed_user_id@&sort_by=@sort_by@&browsing_user_id=@browsing_user_id@" @@ -83,16 +83,16 @@ } } - set action_bar [ad_decode $action_bar "" "" " \[[join $action_bar " | "]\] ] + set action_bar [ad_decode $action_bar "" "" "spacer \[[join $action_bar " | "]\] ] - set private_text [ad_decode @bookmark.private_p@ "t" "private" ""] + set private_text [ad_decode @bookmark.private_p@ "t" "private" ""] %> - + Index: openacs-4/packages/bookmarks/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/bookmarks/www/index.tcl 7 Aug 2014 07:36:55 -0000 1.13 +++ openacs-4/packages/bookmarks/www/index.tcl 27 Jun 2015 12:32:47 -0000 1.14 @@ -18,7 +18,9 @@ } -validate { valid_user_id -requires {viewed_user_id:integerl} { - if { [db_string user_exists "select 1 from parties where party_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""] eq "" } { + if { [db_string user_exists {select 1 from parties where party_id = :viewed_user_id} \ + -bind "viewed_user_id $viewed_user_id" \ + -default ""] eq "" } { ad_complain "The user_id in the url is invalid" } } @@ -68,9 +70,10 @@ # will be the page that the user is browsing. set return_url_urlenc [ad_urlencode [ad_conn url]?[export_vars -url {viewed_user_id}]] -set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""] +set user_name [db_string user_name {select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id} \ + -bind "viewed_user_id $viewed_user_id" -default ""] -set page_title [db_string bookmark_system_name "select acs_object.name(:package_id) from dual"] +set page_title [db_string bookmark_system_name {select acs_object.name(:package_id) from dual}] set context [bm_context_bar_args "" $viewed_user_id]
height=1>spacer height="1"> @decoration_open;noquote@@bookmark.bookmark_title;noquote@@decoration_close;noquote@ @action_bar;noquote@ @private_text;noquote@