Index: openacs-4/packages/acs-tcl/acs-tcl.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v diff -u -r1.50 -r1.51 --- openacs-4/packages/acs-tcl/acs-tcl.info 14 May 2007 20:30:25 -0000 1.50 +++ openacs-4/packages/acs-tcl/acs-tcl.info 29 Aug 2007 13:53:39 -0000 1.51 @@ -7,23 +7,25 @@ t t - + OpenACS The Kernel Tcl API library. 2007-04-22 - 3 - GPL version 2 OpenACS Contains all the core Tcl API, including the request processor, security and session management, permissions, site-nodes, package management infrastructure, etc. + GPL version 2 + 3 - + - + + + Index: openacs-4/packages/acs-tcl/lib/ad-return-error.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/ad-return-error.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-tcl/lib/ad-return-error.adp 30 Dec 2003 22:11:51 -0000 1.1 +++ openacs-4/packages/acs-tcl/lib/ad-return-error.adp 29 Aug 2007 13:53:39 -0000 1.2 @@ -1,6 +1,8 @@ - - @title;noquote@ - -

- @explanation;noquote@ -

+ + @title;noquote@ + +
+
    +
  • @explanation;noquote@
    • +
+
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.xql,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-tcl/tcl/apm-procs.xql 24 Feb 2005 13:33:02 -0000 1.22 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.xql 29 Aug 2007 13:53:40 -0000 1.23 @@ -24,6 +24,7 @@ select distinct package_key from apm_package_versions where enabled_p='t' + order by package_key Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/base64-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v diff -u -r1.55 -r1.56 --- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 15 Jan 2007 06:56:11 -0000 1.55 +++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl 29 Aug 2007 13:53:40 -0000 1.56 @@ -392,10 +392,12 @@ @param exception_text HTML chunk to go inside an UL tag with the error messages. } { + set complaint_template [parameter::get_from_package_key -package_key "acs-tcl" -parameter "ReturnComplaint" -default "/packages/acs-tcl/lib/ad-return-complaint"] ns_return 200 text/html [ad_parse_template \ -params [list [list exception_count $exception_count] \ [list exception_text $exception_text]] \ - "/packages/acs-tcl/lib/ad-return-complaint"] + $complaint_template] + # raise abortion flag, e.g., for templating global request_aborted @@ -416,7 +418,8 @@ @param title Title to be used for the error (will be shown to user) @param explanation Explanation for the exception. } { - set page [ad_parse_template -params [list [list title $title] [list explanation $explanation]] "/packages/acs-tcl/lib/ad-return-error"] + set error_template [parameter::get_from_package_key -package_key "acs-tcl" -parameter "ReturnError" -default "/packages/acs-tcl/lib/ad-return-error"] + set page [ad_parse_template -params [list [list title $title] [list explanation $explanation]] $error_template] if {$status > 399 && [string match {*; MSIE *} [ns_set iget [ad_conn headers] User-Agent]] && [string length $page] < 512 } { Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/mime-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 10 Jan 2007 21:22:12 -0000 1.22 +++ openacs-4/packages/acs-tcl/tcl/tcl-documentation-procs.tcl 29 Aug 2007 13:53:40 -0000 1.23 @@ -1853,6 +1853,33 @@ return 1 } +ad_page_contract_filter negative_float { name value } { + Same as float but allows negative numbers too + + @author Brian Fenton + @creation-date 1 December 2004 +} { + # remove the first decimal point, the theory being that + # at this point a valid float will pass an integer test + regsub {\.} $value "" value2 + # remove the first minus sign, the theory being that + # at this point a valid float will pass an integer test + regsub {\-} $value2 "" value_to_be_tested + + if { ![regexp {^[0-9]+$} $value_to_be_tested] } { + ad_complain "Value is not an decimal number." + return 0 + } + # trim leading zeros, so as not to confuse Tcl + set value [string trimleft $value "0"] + if { [empty_string_p $value] } { + # but not all of the zeros + set value "0" + } + return 1 +} + + ad_page_contract_filter phone { name value } { Checks whether the value is more or less a valid phone number with Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl 14 May 2007 20:30:26 -0000 1.9 +++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl 29 Aug 2007 13:53:40 -0000 1.10 @@ -156,7 +156,7 @@ # take care of cases like 09 for month regsub "^0" $month "" month for {set i 0} {$i < 12} {incr i} { - if { $i == [expr {$month - 1}] } { + if { $month ne "" && $i == [expr {$month - 1}] } { append output "\n" } else { append output "\n"