Index: openacs-4/packages/acs-admin/www/apm/cvs-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/cvs-status.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/apm/cvs-status.tcl	7 Aug 2017 23:47:45 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/cvs-status.tcl	1 Dec 2017 17:26:17 -0000	1.6
@@ -6,7 +6,7 @@
 } {
 }
 
-db_1row email_by_user_id {}
+set email [party::email -party_id [ad_conn user_id]]
 
 doc_body_append "[apm_header "Your Non-Up-To-Date Files"]"
 
@@ -17,13 +17,14 @@
 set all_files_to_add [list]
 set all_files_to_commit [list]
 
-db_foreach all_packages_owned_by_email "
+db_foreach all_packages_owned_by_email {
     select v.package_key, v.version_id, v.package_name, v.version_name
     from   apm_package_version_info v, apm_package_owners o
     where  o.owner_url = :email
     and    v.version_id = o.version_id
     and    v.installed_p = 't'
-    order by upper(package_name)" {
+    order by upper(package_name)
+} {
     
 	set files_to_add [list]
 	set files_to_commit [list]
@@ -32,7 +33,7 @@
 	set counter 0
 	db_foreach apm_file_path {
 	    select path from apm_package_files where version_id = :version_id
-	}{
+	} {
 	    vc_parse_cvs_status [apm_fetch_cached_vc_status "packages/$package_key/$path"]
 	    global vc_file_props
 	    if { [regexp {[a-zA-Z]} $vc_file_props(status)] } {
Index: openacs-4/packages/acs-admin/www/apm/cvs-status.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/cvs-status.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/cvs-status.xql	24 Sep 2003 18:23:36 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/cvs-status.xql	1 Dec 2017 17:26:17 -0000	1.3
@@ -1,26 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="email_by_user_id">      
-      <querytext>
-      select email from parties where party_id = [ad_get_user_id]
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="all_packages_owned_by_email">      
-      <querytext>
-      
-    select v.package_key, v.version_id, v.package_name, v.version_name
-    from   apm_package_version_info v, apm_package_owners o
-    where  o.owner_url = :email
-    and    v.version_id = o.version_id
-    and    v.installed_p = 't'
-    order by upper(package_name)
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="apm_file_path">      
       <querytext>