- V4.0.3.0.0:

  Updated to OpenACS 5.7

acs-admin.info

@@ -7,11 +7,11 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.6.0" url="http://openacs.org/repository/download/apm/acs-admin-5.6.0.apm">
+    <version name="5.7.0" url="http://openacs.org/repository/download/apm/acs-admin-5.7.0.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
         <maturity>3</maturity>
-        <release-date>2010-06-17</release-date>
+        <release-date>2011-06-12</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 	<license url="http://www.gnu.org/copyleft/gpl.html">GPL</license>
 	<maturity>3</maturity>
@@ -19,9 +19,9 @@
           (including package installation, cache, authentication, and user accounts) for an OpenACS system.
         </description>
 
-        <provides url="acs-admin" version="5.6.0"/>
-        <requires url="acs-kernel" version="5.6.0"/>
-        <requires url="acs-mail-lite" version="5.6.0"/>
+        <provides url="acs-admin" version="5.7.0"/>
+        <requires url="acs-kernel" version="5.7.0"/>
+        <requires url="acs-mail-lite" version="5.7.0"/>
 
         <callbacks>
         </callbacks>

www/apm/package-add.tcl

@@ -236,8 +236,9 @@ for URLs, in which case you should precede them with <tt>mailto:</tt> (e.g.,
   <td></td>
   <td>
     <table><tr valign=baseline><td><input type=checkbox name=install_p value=1 checked></td><td>
-Write a package specification file for this package.
-(You almost certainly want to leave this checked.)</td></tr></table>
+Write a package specification file for this package by executing <a href=\"/api-doc/proc-view?proc=apm_package_install_spec\" target=\"_blank\">apm_package_install_spec</a> (opens in new window). 
+(You almost certainly want to leave this checked.) 
+</td></tr></table>
   </td>
 </tr>
 

www/apm/parameter-add.tcl

@@ -11,11 +11,7 @@ ad_page_contract {
 set user_id [ad_get_user_id]
 
 set parameter_id [db_nextval acs_object_id_seq]
-db_1row apm_get_name { 
-  select package_key, pretty_name, version_name
-  from apm_package_version_info
-  where version_id = :version_id
-}
+db_1row apm_get_name {}
 db_release_unused_handles
 
 set page_title "Add Parameter"

www/apm/parameter-add.xql

@@ -4,7 +4,7 @@
 <fullquery name="apm_get_name">      
       <querytext>
        
-    select package_key, pretty_name, version_name, acs_object_id_seq.nextval as parameter_id
+    select package_key, pretty_name, version_name
       from apm_package_version_info
      where version_id = :version_id
 

www/auth/batch-job-run.tcl

@@ -91,4 +91,48 @@ db_dml insert_batch_results "
 
 # Fraber 110913:
 # set job_id [auth::authority::batch_sync -authority_id $authority_id]
-set job_url [export_vars -base batch-job { job_id }]
+# set job_url [export_vars -base batch-job { job_id }]
+ 
+set job_url ""
+
+
+# --------------------------------------------------------------
+# Get the paremeters for the autority
+# --------------------------------------------------------------
+
+auth::authority::get -authority_id $authority_id -array authority
+
+# Get the implementation id and implementation pretty name
+array set parameters [list]
+array set parameter_values [list]
+
+# Each element is a list of impl_ids which have this parameter
+array set param_impls [list]
+
+foreach element_name [auth::authority::get_sc_impl_columns] {
+    set name_column $element_name
+    regsub {^.*(_id)$} $element_name {_name} name_column
+    
+    set impl_params [auth::driver::get_parameters -impl_id $authority($element_name)]
+    
+    foreach { param_name dummy } $impl_params {
+        lappend param_impls($param_name) $authority($element_name)
+    }
+    
+    array set parameters $impl_params
+    
+    array set parameter_values [auth::driver::get_parameter_values \
+                                    -authority_id $authority_id \
+				    -impl_id $authority($element_name)]
+    
+}
+
+# --------------------------------------------------------------
+# Import users 
+# --------------------------------------------------------------
+
+set result [auth::ldap::batch_import::import_users [array get parameter_values] $authority_id]
+
+# set job_id [auth::authority::batch_sync -authority_id $authority_id]
+
+# set job_url [export_vars -base batch-job { job_id }]

www/users/member-state-change-oracle.xql

@@ -9,8 +9,7 @@
                    member_state as member_state_old,
                    first_names || ' ' || last_name as name,
                    email,
-                   rel_id,
-                   rownum as row_id
+                   rel_id
             from cc_users
             where user_id = :user_id
         </querytext>

www/users/member-state-change-postgresql.xql

@@ -8,7 +8,7 @@
       select u.email_verified_p as email_verified_p_old,
           mr.member_state as member_state_old,
           per.first_names || ' ' || per.last_name as name,
-          part.email, mr.rel_id, u.oid as row_id
+          part.email, mr.rel_id
       from users u
       JOIN parties part on (part.party_id = u.user_id)
         JOIN persons per on (per.person_id = u.user_id)

www/users/member-state-change.tcl

@@ -18,16 +18,7 @@ ad_page_contract {
     return_url:onevalue
 }
 
-if {![db_0or1row get_states {
-    select email_verified_p as email_verified_p_old,
-           member_state as member_state_old,
-           first_names || ' ' || last_name as name,
-           email,
-           rel_id,
-           row_id
-    from cc_users
-    where user_id = :user_id
-}]} {
+if {![db_0or1row get_states {}]} {
     # The user is not in there
     ad_return_complaint 1 "Invalid User: the user is not in the system"
     return
@@ -65,7 +56,7 @@ switch $email_verified_p {
     }
     "f" {
 	set action "Require Email from $name"
-	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm?[export_url_vars row_id]"
+	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm"
     }
 }