Index: openacs-4/packages/acs-core-docs/www/release-notes.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/release-notes.adp,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-core-docs/www/release-notes.adp 27 Mar 2018 12:22:17 -0000 1.5 +++ openacs-4/packages/acs-core-docs/www/release-notes.adp 18 Apr 2018 09:09:12 -0000 1.6 @@ -481,7 +481,7 @@ theme-able.

  • Dimensional slider reform (ad_dimensional): Removed hard-coded table layout from dimensional slider. Add backwards compatible templates Move hard-coded styles into theme styling

  • Notification chunks are now theme-able as well (using -ad_include_contrat)

  • Complete template variable suffixes (adding noi18n, addressing +ad_include_contract)

  • Complete template variable suffixes (adding noi18n, addressing bug #2692, full list is now: noquote, noi18n, literal)

  • Added timeout and configurable secrets for signed url parameters to export_vars/page_contracts. This can be used to secure sensitive operations such as granting permissions since a link can be set to Index: openacs-4/packages/acs-core-docs/www/release-notes.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/release-notes.html,v diff -u -N -r1.59 -r1.60 --- openacs-4/packages/acs-core-docs/www/release-notes.html 27 Mar 2018 12:22:17 -0000 1.59 +++ openacs-4/packages/acs-core-docs/www/release-notes.html 18 Apr 2018 09:09:12 -0000 1.60 @@ -818,7 +818,7 @@ Removed hard-coded table layout from dimensional slider. Add backwards compatible templates Move hard-coded styles into theme styling

  • - Notification chunks are now theme-able as well (using ad_include_contrat) + Notification chunks are now theme-able as well (using ad_include_contract)

  • Complete template variable suffixes (adding noi18n, addressing bug #2692, full list is now: noquote, noi18n, literal) Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v diff -u -N -r1.33 -r1.34 --- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 27 Mar 2018 12:22:17 -0000 1.33 +++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 18 Apr 2018 09:09:12 -0000 1.34 @@ -1253,7 +1253,7 @@ theme styling - Notification chunks are now theme-able as well (using ad_include_contrat) + Notification chunks are now theme-able as well (using ad_include_contract) Index: openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql 2 Apr 2018 17:40:16 -0000 1.8 +++ openacs-4/packages/acs-events/sql/postgresql/timespan-create.sql 18 Apr 2018 09:09:12 -0000 1.9 @@ -556,7 +556,7 @@ -- -- -- Creates a new copy of a time interval. - -- JS: Overloaded versaion of above, no offset + -- JS: Overloaded version of above, no offset -- -- @param interval_id Interval to copy -- Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -N -r1.114 -r1.115 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 27 Mar 2018 12:22:17 -0000 1.114 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 18 Apr 2018 09:09:12 -0000 1.115 @@ -848,17 +848,17 @@ } # Source Tcl procs and queries to be able - # to invoke any Tcl callbacks after mounting and instantiation. Note that this reloading + # to invoke any Tcl callbacks after mounting and instantiation. Note that this reloading # is only done in the Tcl interpreter of this particular request. - # Note that acs-tcl is a special case as its procs are always sourced on startup from boostrap.tcl + # Note that acs-tcl is a special case as its procs are always sourced on startup from bootstrap.tcl if { 1 || $package_key ne "acs-tcl" } { apm_load_libraries -procs -force_reload -packages $package_key apm_load_queries -packages $package_key } - # Get the callbacks in an array, since we can't rely on the + # Get the callbacks in an array, since we can't rely on the # before-upgrade being in the db (since it might have changed) - # and the before-install definitely won't be there since + # and the before-install definitely won't be there since # it's not added until later here. array set callbacks $version(callbacks) Index: openacs-4/packages/acs-templating/www/doc/timing.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/timing.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/timing.adp 7 Aug 2017 23:48:02 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/timing.adp 18 Apr 2018 09:09:13 -0000 1.4 @@ -165,7 +165,7 @@ The difference of 65ms is a large percentage of a total serving time of 155ms; when other parts of the system (e.g., the request processor) were slower, this wasn't that noticeable.

    For ACS 3.4, Tcl-only chain-frac-0 pages take 115ms, where the -templated versisons are much slower, 320ms for chain-frac-1 and 340 +templated versions are much slower, 320ms for chain-frac-1 and 340 for -2.

    VI. Further Work

    Tune templating in ACS 4.0.

    Christian Brechbühler
    Last modified: Tue Oct 17 20:11:49 EDT 2000 Index: openacs-4/packages/acs-templating/www/doc/timing.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/timing.html,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/timing.html 7 Aug 2017 23:48:02 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/timing.html 18 Apr 2018 09:09:13 -0000 1.4 @@ -245,7 +245,7 @@

    For ACS 3.4, Tcl-only chain-frac-0 pages take 115ms, where the - templated versisons are much slower, 320ms for chain-frac-1 and + templated versions are much slower, 320ms for chain-frac-1 and 340 for -2.

    VI. Further Work

    Index: openacs-4/packages/assessment/tcl/as-action-proc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-action-proc.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-action-proc.tcl 7 Aug 2017 23:48:03 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-action-proc.tcl 18 Apr 2018 09:09:13 -0000 1.3 @@ -2,33 +2,33 @@ Assessment action procs @author vivian@viaro.net Viaro Networks (www.viaro.net) @creation-date 2005-01-13 - + } namespace eval as::action_p {} ad_proc -public as::action_p::action_exec { {-inter_item_check_id} {-session_id} - - -} { + + +} { Execute the action created on the tcl_code } { db_foreach get_check_params { select * from as_param_map where inter_item_check_id = :inter_item_check_id } { - set parameter_name [db_1row select_name "select varname from as_action_params where parameter_id = :parameter_id"] - if {![exixts_and_not_null value]} { - set $varname [db_string get_item_choice {select idc.choice_id from as_item_data_choices idc,as_item_data id where id.as_item_id=$item_id and id.item_data_id=idc.item_data_id and id.session_id=:session_id}] - - }else { - - set $varname $value - } + set parameter_name [db_1row select_name "select varname from as_action_params where parameter_id = :parameter_id"] + if {![exists_and_not_null value]} { + set $varname [db_string get_item_choice {select idc.choice_id from as_item_data_choices idc,as_item_data id where id.as_item_id=$item_id and id.item_data_id=idc.item_data_id and id.session_id=:session_id}] + + }else { + + set $varname $value } + } set tcl_code [db_1row select_tcl "select a.tcl_code from as_actions a,as_actions_map am where am.action_id = a.action_id and inter_item_check_id = :inter_item_check_id"] eval $tcl_code return - + } # Local variables: Index: openacs-4/packages/assessment/tcl/as-actions-proc.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-actions-proc.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/assessment/tcl/as-actions-proc.tcl 7 Aug 2017 23:48:03 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-actions-proc.tcl 18 Apr 2018 09:09:13 -0000 1.3 @@ -2,35 +2,35 @@ Assessment action procs @author vivian@viaro.net Viaro Networks (www.viaro.net) @creation-date 2005-01-13 - + } namespace eval as::action {} ad_proc -public as::action::action_exec { {-inter_item_check_id} {-session_id} -} { - } { + +} { db_foreach get_check_params { select * from as_param_map where inter_item_check_id = :inter_item_check_id } { - - set parameter_name [db_1row select_name "select varname from as_action_params where parameter_id = :parameter_id"] - - if {![exixts_and_not_null value]} { - - set $varname [db_string get_item_choice {select idc.choice_id from as_item_data_choices idc,as_item_data id where id.as_item_id=$item_id and id.item_data_id=idc.item_data_id and id.session_id=:session_id}] - - } else { - - set $varname $value - } - - set tcl_code [db_1row select_tcl "select a.tcl_code from as_actions a,as_actions_map am where am.action_id = a.action_id and inter_item_check_id = :inter_item_check_id"] - eval $tcl_code - return + + set parameter_name [db_1row select_name "select varname from as_action_params where parameter_id = :parameter_id"] + + if {![exists_and_not_null value]} { + + set $varname [db_string get_item_choice {select idc.choice_id from as_item_data_choices idc,as_item_data id where id.as_item_id=$item_id and id.item_data_id=idc.item_data_id and id.session_id=:session_id}] + + } else { + + set $varname $value } - + + set tcl_code [db_1row select_tcl "select a.tcl_code from as_actions a,as_actions_map am where am.action_id = a.action_id and inter_item_check_id = :inter_item_check_id"] + eval $tcl_code + return + } + } # Local variables: Index: openacs-4/packages/contacts/tcl/oo-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/oo-procs.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/contacts/tcl/oo-procs.tcl 5 Apr 2018 14:44:09 -0000 1.11 +++ openacs-4/packages/contacts/tcl/oo-procs.tcl 18 Apr 2018 09:09:13 -0000 1.12 @@ -2,7 +2,7 @@ Support procs for the contacts package with regards to OpenOffice - Before you can make use of these functions, OpenOffice 2.0 needs to be installed in your system. + Before you can make use of these functions, OpenOffice 2.0 needs to be installed in your system. Additionally you need ghostscript and the msttftcorefonts (so your users wont complain about wrong verdana fonts) Not to forget "vncserver" and "x11fonts". @@ -12,9 +12,9 @@ Once spadmin has started, choose to create a PDF Konverter and make use of the Adobe Distiller and choose the following command: /usr/bin/gs -q -dNOPAUSE -sDEVICE=pdfwrite -sOutputFile="(OUTFILE)" - - + and the target directory /tmp/. Call the printer "pdfconv". Once done, click on fonts, choose "Add fonts" - and search in /usr/share. Add all fonts you find there. + and search in /usr/share. Add all fonts you find there. Last but not least make sure that you have the "vncserver" running for your user and that ../bin/convert.sh reflects your environment @@ -29,7 +29,7 @@ {-content} } { Returns a string which we can insert into the content.xml file - + This is a replacement procedure which should hopefully deal with at least the breaks links and paragraphs. } { @@ -41,7 +41,7 @@ regsub -all -nocase "/a" $content "/text:a" content return [string trim $content] } - + #---------------------------------------------------------------------- # ????/??/?? Developed/Created by ... # 2006/11/06 Renamed from contact::oo::import_oo_pdf @@ -754,7 +754,7 @@ if {[exists_and_not_null title]} { append command_parameter " -title \"$title\"" } - if {[exists_and_nut_null item_id]} { + if {[exists_and_not_null item_id]} { append command_parameter " -item_id \"$item_id\"" } if {[exists_and_not_null parent_id]} { @@ -1044,7 +1044,7 @@ if {[exists_and_not_null title]} { append command_parameter " -title \"$title\"" } - if {[exists_and_nut_null item_id]} { + if {[exists_and_not_null item_id]} { append command_parameter " -item_id \"$item_id\"" } if {[exists_and_not_null parent_id]} { Index: openacs-4/packages/ecommerce/lib/subcategory-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/subcategory-list.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/ecommerce/lib/subcategory-list.tcl 12 Aug 2008 12:10:12 -0000 1.2 +++ openacs-4/packages/ecommerce/lib/subcategory-list.tcl 18 Apr 2018 09:09:13 -0000 1.3 @@ -13,14 +13,14 @@ if { ![info exists columns_count] } { if { ![info exists max_per_col] } { set max_per_col 35 - } + } set columns_count [expr { floor( $subcategory_list_count / $max_per_col ) + 1 } ] } else { set max_per_col [expr { floor( $subcategory_list_count / $columns_count ) + 1 } ] } if { ![info exists col_width] } { set col_width 40 -} +} set current_row 1 set current_col 1 @@ -31,9 +31,8 @@ set subcategory_name [ecds_abbreviate [lindex $subcategory 0] $col_width] set subcategory_id [lindex $subcategory 1] - append category_list_box "
  • ${subcategory_name}
    • \n" + append category_list_box "
  • ${subcategory_name}
    • \n" - if { $current_row >= $max_per_col } { set current_row 1 incr current_col Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/xowiki/tcl/tree-procs.tcl 10 Apr 2018 06:52:09 -0000 1.20 +++ openacs-4/packages/xowiki/tcl/tree-procs.tcl 18 Apr 2018 09:09:13 -0000 1.21 @@ -174,7 +174,7 @@ # # In particular, the TreeRenders are defined to work with xowiki's # page fragment caching. Via page fragment caching, the result of - # the rendering of includedlets is cached. However, the renderer + # the rendering of includelets is cached. However, the renderer # might require additional CSS or JavaScript code, which has to be # included for the cached HTML fragment as well. Therefore, the # method "include_head_entries" is provided, which is called