diff options
| author | ivan <ivan> | 2003-08-05 20:12:28 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-08-05 20:12:28 +0000 |
| commit | 6c6c206041f01df39d1fcb3aee5c9e1dfac24d41 (patch) | |
| tree | e57995002ba6ddb1f86a6ba88bf706e771242933 | |
| parent | 791463c5192d40eb7fc9683402c3e3d0a883878b (diff) | |
fix for "Variable "%num_active_cust_pkg" will not stay shared" error
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | htetc/handler.pl | 2 | ||||
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 8 |
3 files changed, 10 insertions, 11 deletions
@@ -6,15 +6,16 @@ DATASOURCE = DBI:Pg:dbname=freeside DB_USER = freeside DB_PASSWORD= -TEMPLATE = asp -#TEMPLATE = mason +#TEMPLATE = asp +TEMPLATE = mason ASP_GLOBAL = /usr/local/etc/freeside/asp-global MASON_HANDLER = /usr/local/etc/freeside/handler.pl MASONDATA = /usr/local/etc/freeside/masondata #deb, others? -FREESIDE_DOCUMENT_ROOT = /var/www/freeside +#FREESIDE_DOCUMENT_ROOT = /var/www/freeside +FREESIDE_DOCUMENT_ROOT = /var/www/masonside #freebsd #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside @@ -58,8 +59,8 @@ SELFSERVICE_MACHINE = localhost #not changable yet FREESIDE_CONF = /usr/local/etc/freeside -VERSION=1.4.1rc5 -TAG=freeside_1_4_1rc5 +VERSION=1.4.1rc6 +TAG=freeside_1_4_1rc6 help: @echo "supported targets: aspdocs masondocs alldocs docs install-docs" diff --git a/htetc/handler.pl b/htetc/handler.pl index 976787a55..3e37b7ef6 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -38,7 +38,7 @@ use strict; my $ah = new HTML::Mason::ApacheHandler ( #interp => $interp, #auto_send_headers => 0, - comp_root=>'/var/www/freeside', + comp_root=>'/var/www/masonside', data_dir=>'/usr/local/etc/freeside/masondata', #out_mode=>'stream', ); diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 7b9436cee..4b9197e0e 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -24,7 +24,9 @@ if ( $cgi->param('active') ) { $num_active_cust_pkg{$part_pkg->pkgpart} = $active_sth->fetchrow_arrayref->[0]; } - $sortby = \*active_cust_pkg_sort; + $sortby = sub { + $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart}; + }; } else { $sortby = \*pkgpart_sort; } @@ -137,8 +139,4 @@ sub pkgpart_sort { $a->pkgpart <=> $b->pkgpart; } -sub active_cust_pkg_sort { - $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart}; -} - %> |