aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/admin/user/makeadmin.php4
-rw-r--r--actions/admin/user/removeadmin.php37
-rw-r--r--languages/en.php4
-rw-r--r--mod/profile/views/default/profile/menu/adminlinks.php8
4 files changed, 50 insertions, 3 deletions
diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
index 6466966c9..a4f202cb5 100644
--- a/actions/admin/user/makeadmin.php
+++ b/actions/admin/user/makeadmin.php
@@ -23,8 +23,8 @@
if ( ($obj instanceof ElggUser) && ($obj->canEdit()))
{
- $result = $obj->admin = 'yes';
- if ($result)
+ $obj->admin = 'yes';
+ if ($obj->admin)
system_message(elgg_echo('admin:user:makeadmin:yes'));
else
register_error(elgg_echo('admin:user:makeadmin:no'));
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
new file mode 100644
index 000000000..16293bb74
--- /dev/null
+++ b/actions/admin/user/removeadmin.php
@@ -0,0 +1,37 @@
+<?php
+ /**
+ * Make another user an admin.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.org/
+ */
+
+ require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+ global $CONFIG;
+
+ // block non-admin users
+ admin_gatekeeper();
+ action_gatekeeper();
+
+ // Get the user
+ $guid = get_input('guid');
+ $obj = get_entity($guid);
+
+ if ( ($obj instanceof ElggUser) && ($obj->canEdit()))
+ {
+ $obj->admin = '';
+ if (!$obj->admin)
+ system_message(elgg_echo('admin:user:removeadmin:yes'));
+ else
+ register_error(elgg_echo('admin:user:removeadmin:no'));
+ }
+ else
+ register_error(elgg_echo('admin:user:removeadmin:no'));
+
+ forward($_SERVER['HTTP_REFERER']);
+
+?> \ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index feb882f28..e08c07ece 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -543,6 +543,9 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'admin:user:makeadmin:yes' => "User is now an admin.",
'admin:user:makeadmin:no' => "We could not make this user an admin.",
+
+ 'admin:user:removeadmin:yes' => "User is no longer an admin.",
+ 'admin:user:removeadmin:no' => "We could not remove administrator privileges from this user.",
/**
* User settings
@@ -603,6 +606,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'resetpassword' => "Reset password",
'makeadmin' => "Make admin",
+ 'removeadmin' => "Remove admin",
'option:yes' => "Yes",
'option:no' => "No",
diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
index efd6201ed..70176b814 100644
--- a/mod/profile/views/default/profile/menu/adminlinks.php
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -28,7 +28,13 @@
}
?><a href="<?php echo $vars['url']; ?>actions/admin/user/delete?guid=<?php echo $vars['entity']->guid; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("delete"); ?></a>
<a href="<?php echo $vars['url']; ?>actions/admin/user/resetpassword?guid=<?php echo $vars['entity']->guid; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("resetpassword"); ?></a>
- <?php if (!$vars['entity']->admin) { ?><a href="<?php echo $vars['url']; ?>actions/admin/user/makeadmin?guid=<?php echo $vars['entity']->guid; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("makeadmin"); ?></a> <?php } ?>
+ <?php
+ if (!$vars['entity']->admin) {
+ ?>
+ <a href="<?php echo $vars['url']; ?>actions/admin/user/makeadmin?guid=<?php echo $vars['entity']->guid; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("makeadmin"); ?></a>
+ <?php } else { ?>
+ <a href="<?php echo $vars['url']; ?>actions/admin/user/removeadmin?guid=<?php echo $vars['entity']->guid; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("removeadmin"); ?></a>
+ <?php } ?>
<?php
}