Changeset 1397

Timestamp:

12/06/07 18:34:45 (1 year ago)

Author:

rho

Message:

improved "manage users" options to manage every user type registered.
Also fixes #173 allowing to access community profile as administrator
and delete them

Signed-off: Rolando Espinoza La fuente <rho@prosoftpeople.com>

Files:

• devel/mod/admin/lib.php (modified) (2 diffs)
• devel/mod/admin/lib/admin_users.php (modified) (3 diffs)
• devel/mod/admin/lib/admin_users_panel.php (modified) (1 diff)
• devel/mod/community/lib.php (modified) (1 diff)
• devel/mod/community/lib/userdetails_edit.php (modified) (1 diff)
• devel/mod/users/lib.php (modified) (1 diff)

devel/mod/admin/lib.php

@@ -131 +131 @@
-                $url .= '?do=users';
-                break;
+            case 'admin::userdetails':
+                $url = $CFG->wwwroot . 'mod/users/?context=admin&profile_id='.$oid;
+                break;
-            case 'admin::main':
-            default:
@@ -139 +142 @@
-    return $url;
-}
+
+function get_url_query($object_id, $object_type, $query) {
+    $url = get_url($object_id, $object_type);
+
+    if (strpos($url, '?') === 'false') {
+        $sep = '?';
+    } else {
+        $sep = '&';
+    }
+
+    return $url . $sep . $query;
+}
+
+/**
+ * Register user types
+ */
+function register_user_type($type) {
+    global $CFG;
+    if (!isset($CFG->user_types)) {
+        $CFG->user_types = array();
+    }
+
+    $CFG->user_types[] = $type;
+    return true;
+}
+
+function get_user_types() {
+    global $CFG;
+    if (!isset($CFG->user_types)) {
+        $CFG->user_types = array();
+    }
+
+    return $CFG->user_types;
+}
+
-?>

devel/mod/admin/lib/admin_users.php

@@ -10 +10 @@
-    $run_result .= "<p>" . __gettext("The following is a list of all the users in the system, 50 users at a time. You can click each one to edit their user details as if you were logged in as them, as well as set user flags (including 'ban user' and 'set user as administrator').") . "</p>";
-    $run_result .= "<p>" . __gettext("If you know the username of the user you would like to edit, you can also enter it below.") . "</p>";
+
+    $current_type = optional_param('user_type', 'person');
+    $user_types = get_user_types();
+    if (!empty($user_types)) {
+        $run_result .= '<p>' . __gettext('Filter user type');
+        foreach ($user_types as $user_type) {
+            $run_result .= ' | ';
+            if ($user_type == $current_type) {
+                $run_result .= $user_type;
+            } else {
+                $run_result .= '<a href="'.get_url_query(1,'admin::users','user_type='.$user_type) . '">' . $user_type . '</a>';
+            }
+        }
+    }
-    
-    $run_result .= "<form action=\"". url . "_userdetails/\" method=\"get\">";
@@ -21 +35 @@
-    $run_result .= "</form>";
-    
-'person'
+$current_type
-    
-
-
-
-
-
-
-
-
-
-
-
+
-        if ($maxusers > ($offset + 50)) {
-url . "mod/admin/users.php?offset=" . ($offset + 50
+get_url_query(null, 'admin::users', "user_type=$current_type&offset=" . ($offset + 50)
-        } else {
-            $next = "";
@@ -44 +48 @@
-        }
-        if ($prevoffset != $offset) {
-url . "mod/admin/users.php?offset=" . ($prevoffset
+get_url(null, 'admin::users', "user_type=$current_type&offset=" . ($prevoffset)
-        } else {
-            $prev = "";
-        }
-        
-run_result .
+nav 
-                                            'context' => 'adminTable',
-"&nbsp;"
+__gettext('Total users') . ":&nbsp;" . $maxusers
-                                            'column1' => $prev . "&nbsp;" . $next,
-                                            'column2' => "&nbsp;"
-                                            )
-                                      );
+
+        $run_result .= $nav;
-        
+        $run_result .= templates_draw(array(
+                                            'context' => 'adminTable',
+                                            'name' => "<h3>" . __gettext("Full name") . "</h3>",
+                                            'column1' => "<h3>" . __gettext("Username") . "</h3>",
+                                            'column2' => "<h3>" . __gettext("Extra info") . "</h3>"
+                                            )
+                                      );
+
+        foreach($users as $user) {
+            $run_result .= run("admin:users:panel",$user);
+        }
+
+        $run_result .= $nav;
+
-    }
-}

devel/mod/admin/lib/admin_users_panel.php

@@ -6 +6 @@
-    
-    if (isset($parameter)) {
-
+
+
-        $run_result .= templates_draw(array(
-                        'context' => 'adminTable',
-p>" . $parameter->username . "</p
-a href=\"" . url . "_userdetails/?profile_id=" .$parameter->ident . "&amp;context=admin\" >" . stripslashes($parameter->name) . "</a> [<a href=\"".url . $parameter->username ."/\">" . __gettext("Profile") . "</a>]
+a href=\"" . url . "profile/index.php?profile_id=" .$parameter->ident . "\" >" . stripslashes($parameter->name) . "</a
+p><strong>" . $parameter->username . '</strong>'. $profile_link . "</p>
-                        'column2' => "<a href=\"mailto:" . $parameter->email. "\" >" . $parameter->email . "</a>"
-                    )

devel/mod/community/lib.php

@@ -219 +219 @@
-                river_register_friendlyname_hook('community::community', 'community_get_friendly_name');
-        }
+
+        register_user_type('community');
-}
-

devel/mod/community/lib/userdetails_edit.php

@@ -103 +103 @@
-END;
-
+    if (context == "admin") {
+        
+        $blurb = __gettext("Deleting this account is permanent and absolutely cannot be undone. Only click this button if you're really sure!");
+        $deleteaccount = __gettext("Delete community account");
+        $body .= templates_draw(array(
+            'context' => 'databox',
+            'name' => $blurb,
+            'column1' => "<a href=\"index.php?action=user:delete&profile_id=$page_owner\">{$deleteaccount}</a>",
+            ));
+
+    }
+
+
+
-    $run_result .= $body;
-    }

devel/mod/users/lib.php

@@ -68 +68 @@
-        $function['users:flags:unset'][] = dirname(__FILE__) . "/lib/flag_unset.php"; // DEPRECATED - use user_flag_unset($flag_name, $user_id)
-
+    register_user_type('person');
-}
-?>