- changes at Opus5

- Fixed a lot with Forums
- Added Hours Matrix and fixed < > in Timehseet

sql/oracle/intranet-core-create.sql

@@ -310,7 +310,8 @@ BEGIN
     v_max := 1000;
 
     FOR v_i IN 0..v_max-1 LOOP
-	-- for convenience, select out the next start block to insert into a variable
+	-- for convenience, select out the next start block to 
+	-- insert into a variable
 	select to_date('1996-01-07','YYYY-MM-DD') + v_i*7 
 	into v_next_start_week 
 	from dual;

www/users/index.tcl

@@ -109,9 +109,7 @@ if {$user_group_id > 0} {
 
     # The user requests to see all groups.
     # The most critical groups are customer contacts...
-    set customer_group_id [db_string user_group_id "select group_id from groups where group_name like :user_group_name" -default 0]
-
-    set sql "select acs_permission.permission_p(:customer_group_id, :user_id, 'read') from dual"
+    set sql "select acs_permission.permission_p([im_customer_group_id], :user_id, 'read') from dual"
     set read [db_string user_can_read_user_group_p $sql]
     if {![string equal "t" $read]} {
 	ad_return_complaint 1 "You don't have permissions to view this page"

www/users/view.tcl

@@ -56,6 +56,8 @@ if {0 == $user_id} {
 }
 
 set current_user_id [ad_maybe_redirect_for_registration]
+set current_user_is_admin_p [im_is_user_site_wide_or_intranet_admin $user_id]
+
 set subsite_id [ad_conn subsite_id]
 
 # Check the permissions 
@@ -354,13 +356,28 @@ set change_pwd_url "/intranet/users/password-update?[export_url_vars user_id ret
 
 # Return a pretty member state (no normal user understands "banned"...)
 case $member_state {
-	"banned" { set user_state "deleted" }
+	"banned" { set user_state "inactive" }
 	"approved" { set user_state "active" }
 	default { set user_state $member_state }
 }
 
 append admin_links "
-          <li>Member state: $user_state (<a href=/acs-admin/users/member-state-change?member_state=approved&[export_url_vars user_id return_url]>activate</a>, <a href=/acs-admin/users/member-state-change?member_state=banned&[export_url_vars user_id return_url]>delete</a>)
+          <li>Member state: $user_state "
+
+
+if {$current_user_is_admin_p} {
+    case $member_state {
+	"banned" { 
+	    append admin_links "(<a href=/acs-admin/users/member-state-change?member_state=approved&[export_url_vars user_id return_url]>activate</a>)"
+	}
+	"approved" { 
+	    append admin_links "(<a href=/acs-admin/users/member-state-change?member_state=banned&[export_url_vars user_id return_url]>deactivate</a>)"
+	}
+	default { set user_state $member_state }
+    }
+}
+
+append admin_links "
           <li><a href=$change_pwd_url>Update this user's password</a>
           <li><a href=become?user_id=$user_id_from_search>Become this user!</a>
 <!--