Index: openacs-4/packages/acs-api-browser/www/procs-file-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/procs-file-view.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-api-browser/www/procs-file-view.tcl	1 Jul 2015 08:56:57 -0000	1.8
+++ openacs-4/packages/acs-api-browser/www/procs-file-view.tcl	7 Aug 2017 23:47:46 -0000	1.9
@@ -3,10 +3,10 @@
 
     @cvs-id $Id$
 } {
-    version_id:naturalnum,optional
+    version_id:naturalnum,optional,notnull
     { public_p:boolean "" }
-    path:token,trim
-    source_p:boolean,optional,trim
+    path:path,trim
+    source_p:boolean,optional,trim,notnull
 } -properties {
     title:onevalue
     context:onevalue
@@ -18,12 +18,14 @@
 
 set url_vars [export_vars {path version_id}]
 set return_url [ns_urlencode [ad_conn url]?][ns_urlencode $url_vars]
+
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
 if { ![info exists source_p] } {
     set source_p $default_source_p
+    if {$source_p eq ""} {set source_p 0}
 }
-if { ![info exists version_id] && 
-     [regexp {^packages/([^ /]+)/} $path "" package_key] } {
+if { ![info exists version_id]
+     && [regexp {^packages/([^ /]+)/} $path "" package_key] } {
     db_0or1row version_id_from_package_key {
         select version_id 
 	from apm_enabled_package_versions 
@@ -32,13 +34,13 @@
 }
 
 set path [apidoc::sanitize_path $path]
-if {![file readable $::acs::rootdir/$path] || [file isdirectory $::acs::rootdir/$path]} {
+if {![file readable ${::acs::rootdir}$path] || [file isdirectory ${::acs::rootdir}$path]} {
     if {[info exists version_id]} {
 	set kind procs
 	set href [export_vars -base [ad_conn package_url]/package-view {version_id {kind procs}}]
-	set link [subst {<p>Go back to <a href="[ns_quotehrml $href]">Package Documentation</a>.}]
+	set link [subst {<p>Go back to <a href="[ns_quotehtml $href]">Package Documentation</a>.}]
     } else {
-	set link [subst {<p>Go back to <a href="[ns_quotehrml [ad_conn package_url]]">API Browser</a>.}]
+	set link [subst {<p>Go back to <a href="[ns_quotehtml [ad_conn package_url]]">API Browser</a>.}]
     }
     ad_return_warning "No such library file" [subst {
 	The file '$path' was not found. Maybe the url contains a typo.
@@ -76,6 +78,7 @@
 
 }
 
+set path [string trimleft $path /]
 lappend context [file tail $path]
 
 set title [file tail $path]
@@ -90,7 +93,7 @@
     foreach proc [lsort [nsv_get api_proc_doc_scripts $path]] {
         if { $public_p } {
             array set doc_elements [nsv_get api_proc_doc $proc]
-            if { !$doc_elements(public_p) } {
+            if { $doc_elements(protection) ne "public"} {
                 continue
             }
         }
@@ -99,7 +102,7 @@
     foreach proc [lsort [nsv_get api_proc_doc_scripts $path]] {
         if { $public_p } {
             array set doc_elements [nsv_get api_proc_doc $proc]
-            if { !$doc_elements(public_p) } {
+            if { $doc_elements(protection) ne "public"} {
                 continue
             }
         }
@@ -111,3 +114,9 @@
    set file_contents [template::util::read_file $::acs::rootdir/$path]
    set file_contents [apidoc::tclcode_to_html $file_contents]
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: