- Fixed display of users with missing member_state

lib/user-admin-info.tcl

@@ -29,6 +29,7 @@ if {!$read} {
 set date_format "YYYY-MM-DD"
 
 set result [db_0or1row users_info_query {}]
+if {"" eq $member_state} { set member_state "undefined" }
 
 if { $result > 1 } {
     ad_return_complaint "[_ intranet-core.Bad_User]" "
@@ -57,12 +58,16 @@ case $member_state {
 set activate_delete_link ""
 if {$admin} {
     append activate_delete_link "("
-    if { "approved" != $member_state } {
-	append activate_delete_link "<a href=/acs-admin/users/member-state-change?member_state=approved&[export_vars {user_id return_url}]>[_ intranet-core.activate]</a>"
+
+    switch $member_state {
+	"approved" {
+	    append activate_delete_link "<a href=/intranet/users/member-state-change?member_state=banned&[export_vars {user_id return_url}]>[_ intranet-core.delete]</a>"	
+	}
+	"banned" {
+	    append activate_delete_link "<a href=/acs-admin/users/member-state-change?member_state=approved&[export_vars {user_id return_url}]>[_ intranet-core.activate]</a>&nbsp;"
+	} 
     }
-    if { "banned" != $member_state } {
-	append activate_delete_link "<a href=/intranet/users/member-state-change?member_state=banned&[export_vars {user_id return_url}]>[_ intranet-core.delete]</a>"	
-    } 
+
     append activate_delete_link ")"
 }
 

lib/user-admin-info.xql

@@ -9,27 +9,34 @@
   </rdbms>
   <fullquery name="users_info_query">
     <querytext>
-select 
-	u.first_names, 
-	u.last_name, 
+
+select
+	pe.first_names, 
+	pe.last_name, 
         im_name_from_user_id(u.user_id) as name,
-	u.email,
-        u.url,
-	u.creation_date as registration_date, 
-	u.creation_ip as registration_ip,
+	pa.email,
+        pa.url,
+	o.creation_date as registration_date, 
+	o.creation_ip as registration_ip,
 	to_char(u.last_visit, :date_format) as last_visit,
 	u.screen_name,
 	u.username,
-	u.member_state,
-	coalesce(u.creation_user, 0) as creation_user_id,
-	coalesce(im_name_from_user_id(u.creation_user), 'system') as creation_user_name,
+	(select member_state from membership_rels where rel_id in (
+		select rel_id from acs_rels where object_id_two = u.user_id and object_id_one = -2
+	)) as member_state,
+	o.creation_user as creation_user_id,
+	im_name_from_user_id(o.creation_user) as creation_user_name,
 	auth.short_name as authority_short_name,
 	auth.pretty_name as authority_pretty_name
-from
-	cc_users u
+from	acs_objects o,
+	persons pe,
+	parties pa,
+	users u
 	LEFT OUTER JOIN auth_authorities auth ON (u.authority_id = auth.authority_id)
-where
-	u.user_id = :user_id_from_search
+where	u.user_id = :user_id_from_search and
+	u.user_id = pe.person_id and
+	u.user_id = pa.party_id and
+	u.user_id = o.object_id
 
     </querytext>
   </fullquery>

lib/user-basic-info.tcl

@@ -56,6 +56,7 @@ if {!$read} {
 # ---------------------------------------------------------------
 
 set result [db_0or1row users_info_query {}]
+if {"" eq $member_state} { set member_state "undefined" }
 
 if { $result > 1 } {
     ad_return_complaint "[_ intranet-core.Bad_User]" "

lib/user-basic-info.xql

@@ -9,27 +9,33 @@
   </rdbms>
   <fullquery name="users_info_query">
     <querytext>
-select 
-	u.first_names, 
-	u.last_name, 
+select
+	pe.first_names, 
+	pe.last_name, 
         im_name_from_user_id(u.user_id) as name,
-	u.email,
-        u.url,
-	u.creation_date as registration_date, 
-	u.creation_ip as registration_ip,
+	pa.email,
+        pa.url,
+	o.creation_date as registration_date, 
+	o.creation_ip as registration_ip,
 	to_char(u.last_visit, :date_format) as last_visit,
 	u.screen_name,
 	u.username,
-	u.member_state,
-	u.creation_user as creation_user_id,
-	im_name_from_user_id(u.creation_user) as creation_user_name,
+	(select member_state from membership_rels where rel_id in (
+		select rel_id from acs_rels where object_id_two = u.user_id and object_id_one = -2
+	)) as member_state,
+	o.creation_user as creation_user_id,
+	im_name_from_user_id(o.creation_user) as creation_user_name,
 	auth.short_name as authority_short_name,
 	auth.pretty_name as authority_pretty_name
-from
-	cc_users u
+from	acs_objects o,
+	persons pe,
+	parties pa,
+	users u
 	LEFT OUTER JOIN auth_authorities auth ON (u.authority_id = auth.authority_id)
-where
-	u.user_id = :user_id_from_search
+where	u.user_id = :user_id_from_search and
+	u.user_id = pe.person_id and
+	u.user_id = pa.party_id and
+	u.user_id = o.object_id
 
     </querytext>
   </fullquery>
@@ -94,4 +100,4 @@ where
   </fullquery>
 
 
-</queryset>
+</queryset>
\ No newline at end of file

www/member-notify.tcl

@@ -56,6 +56,13 @@ if { "" != $cancel } {
     ad_script_abort
 }
 
+# Should we wait a second after sending out an email?
+# This is necessary for 1and1 because of a limit of 
+# max 5000 emails per hour
+set throttle_seconds [parameter::get_from_package_key -package_key "intranet-core" -parameter ThrottleEmailSendingSeconds -default 0.8]
+
+set error_list []
+
 # ---------------------------------------------------------------
 # ---------------------------------------------------------------
 
@@ -284,6 +291,11 @@ foreach email $email_list {
 	set message_subst [lang::message::format $message $substitution_list]
     }
 
+    # Remember the date of the last email
+    if {[im_column_exists persons last_email_sent]} {
+	db_dml update_last_email "update persons set last_email_sent = now() where person_id = :user_id"
+    }
+
     if {[catch {
 	acs_mail_lite::send \
 	    -send_immediately \
@@ -294,9 +306,13 @@ foreach email $email_list {
 	    -file_ids $attachment_ci_id
     } errmsg]} {
         ns_log Error "member-notify: Error sending to \"$email\": $errmsg"
-	ad_return_error $subject "<p>Error sending out mail:</p><div><code>[ns_quotehtml $errmsg]</code></div>"
-	ad_script_abort
+	lappend error_list "<p>Error sending out mail to: $email</p><div><code>[ns_quotehtml $errmsg]</code></div>"
+    }
+
+    if {$throttle_seconds > 0} {
+	im_exec sleep $throttle_seconds
     }
+
 }
 
 
@@ -312,5 +328,11 @@ if {$process_mail_queue_now_p} {
 # This page has not confirmation screen but just returns
 # ---------------------------------------------------------------
 
+
+if {"" ne $error_list} {
+    ad_return_complaint 1 "<ul><li>[join $error_list "\n<li>"]</ul>"
+}
+
+
 ad_returnredirect $return_url
 

www/users/view.tcl

@@ -80,35 +80,41 @@ if {!$read} {
 
 set result [db_0or1row users_info_query "
 select 
-	u.first_names, 
-	u.last_name, 
+	pe.first_names, 
+	pe.last_name, 
         im_name_from_user_id(u.user_id) as name,
-	u.email,
-        u.url,
-	u.creation_date as registration_date, 
-	u.creation_ip as registration_ip,
+	pa.email,
+        pa.url,
+	o.creation_date as registration_date, 
+	o.creation_ip as registration_ip,
 	to_char(u.last_visit, :date_format) as last_visit,
 	u.screen_name,
 	u.username,
-	u.member_state,
-	u.creation_user as creation_user_id,
-	im_name_from_user_id(u.creation_user) as creation_user_name,
+	(select member_state from membership_rels where rel_id in (
+		select rel_id from acs_rels where object_id_two = u.user_id and object_id_one = -2
+	)) as member_state,
+	o.creation_user as creation_user_id,
+	im_name_from_user_id(o.creation_user) as creation_user_name,
 	auth.short_name as authority_short_name,
 	auth.pretty_name as authority_pretty_name
-from
-	cc_users u
+from	acs_objects o,
+	persons pe,
+	parties pa,
+	users u
 	LEFT OUTER JOIN auth_authorities auth ON (u.authority_id = auth.authority_id)
-where
-	u.user_id = :user_id_from_search
+where	u.user_id = :user_id_from_search and
+	u.user_id = pe.person_id and
+	u.user_id = pa.party_id and
+	u.user_id = o.object_id
 "]
 
-if { $result > 1 } {
+if {$result > 1} {
     ad_return_complaint 1 "<b>[_ intranet-core.Bad_User]</b>:<br>
     <li>There is more then one user with the ID $user_id_from_search"
     ad_script_abort
 }
 
-if { $result == 0 } {
+if {$result == 0} {
     set party_id [db_string party "select party_id from parties where party_id=:user_id_from_search" -default 0]
     set person_id [db_string person "select person_id from persons where person_id=:user_id_from_search" -default 0]
     set user_id [db_string user "select user_id from users where user_id=:user_id_from_search" -default 0]