Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp 6 Sep 2001 16:29:39 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp 8 Feb 2002 06:35:44 -0000 1.3
@@ -14,8 +14,8 @@
The ACS Workflow package is not mounted.
-
- The SystemUrl
parameter under acs-kernel/system-information still has its default value, which is @dubious_url@
+
+ The SystemUrl
parameter under acs-kernel/system-information still has its default value, which is @default_url@
The NotificationSender
parameter under ticket-tracker does not have an email associated with it. This parameter is a party_id
and must have a valid email address because this email address will sign all alerts that the ticket-tracker sends out.
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.tcl 6 Sep 2001 16:29:39 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.tcl 8 Feb 2002 06:35:44 -0000 1.3
@@ -38,33 +38,30 @@
and sn.object_id = ap.package_id
}
-# check to see if SystemUrl still has its default value
-if { ![db_0or1row dubious_sys_url {
- select apv.attr_value as dubious_url
- from apm_parameter_values apv,
- apm_parameters ap
- where ap.package_key = 'acs-kernel'
- and ap.parameter_name = 'SystemURL'
- and ap.parameter_id = apv.parameter_id
- and ap.default_value = apv.attr_value
-}] } {
- set dubious_url ""
+# check to see if the SystemURL param has been set
+set current_url [ad_parameter -package_id [apm_package_id_from_key "acs-kernel"] "SystemURL"]
+set default_url [db_string default_url {
+ select default_value from apm_parameters
+ where package_key = 'acs-kernel' and parameter_name='SystemURL'
+}]
+
+if {[string equal $current_url $default_url]} {
+ set url_is_good_p 0
+} else {
+ set url_is_good_p 1
}
# check to see if NotificationSender has an email address
+set notification_sender [ad_parameter "NotificationSender"]
+
if { ![db_0or1row check_sender "
select email as good_email from parties
- where party_id = (select apv.attr_value
- from apm_parameter_values apv,
- apm_parameters ap
- where ap.package_key = :package_key
- and ap.parameter_name = 'NotificationSender'
- and ap.parameter_id = apv.parameter_id)
-" ] } {
+ where party_id = :notification_sender"
+] } {
set good_email ""
}
-if { !$gc_mounted_p || !$workflow_mounted_p || ![empty_string_p $dubious_url] || [empty_string_p $good_email] } {
+if { !$gc_mounted_p || !$workflow_mounted_p || !$url_is_good_p || [empty_string_p $good_email] } {
set has_error_p 1
} else {
set has_error_p 0
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.xql 6 Sep 2001 16:29:39 -0000 1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.xql 8 Feb 2002 06:35:44 -0000 1.3
@@ -27,16 +27,12 @@
-
+
- select apv.attr_value as dubious_url
- from apm_parameter_values apv,
- apm_parameters ap
- where ap.package_key = 'acs-kernel'
- and ap.parameter_name = 'SystemURL'
- and ap.parameter_id = apv.parameter_id
- and ap.default_value = apv.attr_value
+ select default_value from apm_parameters
+ where package_key = 'acs-kernel' and
+ parameter_name='SystemURL'